Module src/nongnu/cashews/xml/

back to main page

Summary Period: 2005-04-09 to 2005-05-11

Modules

[root]/src/nongnu/cashews/xml
     schema (2 files, 118 lines)
         datatypes (4 files, 210 lines)

Lines of Code

Total Lines Of Code: 1086 (2005-05-13 02:48)

Authors

Most Recent Commits

u1ah3 2005-05-11 00:43

2005-05-09 Andrew John Hughes <gnu_andrew@member.fsf.org>

* lib/.cvsignore:
Ignore soap.jar and wsdl.jar.
* lib/Makefile.am:
Added wsdl.jar.
* src/nongnu/cashews/wsdl/WsdlHandler.java:
New class.
(WSDL_NAMESPACE): New field.
(operations): New field.
(wsdlLogger): New field.
(WsdlHandler(java.util.logging.Logger)): New constructor.
(startDocument()): New method.
(startElement(String,String,String,org.xml.sax.Attributes)):
Likewise.
(characters(char[],int,int)): Likewise.
(endElement(String,String,String)): Likewise.
(getOperations()): Likewise.
* src/nongnu/cashews/wsdl/WsdlParser.java:
(WsdlParser(java.util.logging.Handler)): New constructor.
(getWsdlHandler()): New method.
(main(String[])): New method.

2 lines of code changed in:

• src/nongnu/cashews/xml: Parser.java (+2)

u1ah3 2005-05-09 03:43

2005-05-09 Andrew John Hughes <gnu_andrew@member.fsf.org>

* .cvsignore
Add plugin.xml
* configure.ac:
Added creation of Configuration.java from Configuration.java.in
* lib/Makefile.am:
Added soap.jar
* src/nongnu/cashews/commons/.cvsignore:
Added Configuration.java
* src/nongnu/cashews/commons/Configuration.java.in:
New class, which is pre-processed by configure.
(CASHEWS_VERSION): New field.
* src/nongnu/cashews/language/grounding/MessagePart.java:
(getName()): New method.
* src/nongnu/cashews/language/grounding/SoapMessage.java:
(getParts()): New method.
* src/nongnu/cashews/language/grounding/SoapOperation.java:
(getEndpoint()): New method.
(getInputMessage()): New method.
* src/nongnu/cashews/services/Processes.java:
New class.
(TEST_COMPOSITE_SEQUENCE): New static field.
(static): Initialise the static field.
(Processes()): New private constructor.
* src/nongnu/cashews/soap/SoapClient.java:
New class.
(call(nongnu.cashews.language.grounding.SoapOperation, Object...)):
New method.
(serializeOperation(nongnu.cashews.language.grounding.SoapOperation,
Object...)): New method.
(main(String[])): New method.
* src/nongnu/cashews/xml/Serializer.java:
(serialize(java.io.Serializable, org.w3c.dom.Element,
org.w3c.dom.Document,boolean)): Moved field generation to new method.
(finalizeXmlDocument(org.w3c.dom.Document, org.w3c.dom.Element,
javax.xml.namespace.QName[])): New method.
(getXmlDocument()): New method.
(serializeToStream(org.w3c.dom.Document, java.io.OutputStream)):
New method.
(serializeValue(String,Object,nongnu.cashews.xml.schema.TypeMapper,
org.w3c.dom.Document, org.w3c.dom.Element)): New method.
(serializeValue(String,Object,boolean,boolean,
nongnu.cashews.xml.schema.TypeMapper,
org.w3c.dom.Document, org.w3c.dom.Element)): New method.
(main(String[])): Process creation moved to Processes.

126 lines of code changed in:

• src/nongnu/cashews/xml: CustomXmlizable.java (del), Serializer.java (+126 -92)

u1ah3 2005-05-08 13:04

2005-05-08 Andrew John Hughes <gnu_andrew@member.fsf.org>

* src/nongnu/cashews/commons/PairList.java:
New class.
(PairList()): New constructor.
(PairList(PairList<A,B>)): New constructor.
(contains(A,B)): New method.
(add(A,B)): New method.
(add(int,A,B)): New method.
(addFirst(A,B)): New method.
(addLast(A,B)): New method.
(indexOf(A,B)): New method.
(lastIndexOf(A,B)): New method.
(offer(A,B)): New method.
(remove(A,B)): New method.
(set(int,A,B)): New method.
* src/nongnu/cashews/language/grounding/SoapOperation.java:
(serialPersistentFields): New field.
* src/nongnu/cashews/language/process/AtomicProcess.java:
(serialPersistentFields): New field.
* src/nongnu/cashews/services/TypeChecker.java:
Reformatted.
* src/nongnu/cashews/xml/Serializer.java:
(serialize(java.io.Serializable, org.w3c.dom.Element,
org.w3c.dom.Document)): New method which calls the one below.
(serialize(java.io.Serializable, org.w3c.dom.Element,
org.w3c.dom.Document,boolean)): Changed from original
serialize method. Uses a PairList and observes serialPersistentFields.
* src/nongnu/cashews/xml/XmlField.java,
New class.
(fieldElement): New field.
(classElement); New field.
(XmlField(String,Class<?>)): New constructor.
(XmlField(String,Class<?>,boolean)): New constructor.
(XmlField(String,Class<?>,boolean,boolean,boolean)): New constructor.
(XmlField(java.io.ObjectStreamField)): New constructor.
(setFieldElement(boolean)): New method.
(setClassElement(boolean)): New method.
(isFieldNameSerialized()): New method.
(isClassNameSerialized()): New method.
(toString()): New method.

294 lines of code changed in:

• src/nongnu/cashews/xml: Serializer.java (+105 -14), XmlField.java (new 189)

u1ah3 2005-05-07 22:14

2005-05-07 Andrew John Hughes <gnu_andrew@member.fsf.org>

* src/nongnu/cashews/language/grounding/MessagePart.java:
(MessagePart(String)): New constructor.
(MessagePart(java.net.URI)): New constructor.
(setURI(String)): New method.
(setURI(java.net.URI)): New method.
(setName(String,String)): New method.
(setName(String,String,String)): New method.
(setName(javax.xml.namespace.QName)): New method.
(setType(String,String)): New method.
(setType(String,String,String)): New method.
(setType(javax.xml.namespace.QName)): New method.
(toString()): New method.
(getElementName()): New method.
(getDeclaredNamespaces()): New method.
* src/nongnu/cashews/language/grounding/SoapMessage.java:
(SoapMessage()): New constructor (private).
(SoapMessage(String,String)): New constructor.
(SoapMessage(String,String,String)): New constructor.
(SoapMessage(javax.xml.namespace.QName)): New constructor.
(setName(String,String)): New method.
(setName(String,String,String)): New method.
(setName(javax.xml.namespace.QName)): New method.
(addPart(nongnu.cashews.language.grounding.MessagePart)): New method.
(getName()): New method.
(toString()); New method.
* src/nongnu/cashews/language/grounding/SoapOperation.java:
(SoapOperation(String)): New constructor.
(SoapOperation(String,String)): New constructor.
(setEndpoint(String)): New method.
(setEndpoint(java.net.URI)): New method.
(setNamespace(String)): New method.
(setNamespace(java.net.URI)): New method.
(setInputMessage(nongnu.cashews.language.grounding.SoapMessage)):
New method.
(setOutputMessage(nongnu.cashews.language.grounding.SoapMessage)):
New method.
(toString()): New method.
(getElementName()): New method.
(getDeclaredNamespaces()): New method.
* src/nongnu/cashews/language/process/CProcess.java:
Extends java.io.Serializable.
* src/nongnu/cashews/language/process/CompositeProcess.java:
(addConsumer(nongnu.cashews.language.process.Consume)): New method.
(addProducer(nongnu.cashews.language.process.Produce)): New method.
* src/nongnu/cashews/language/process/Consume.java:
(Consume(String,String,String,int)): New constructor.
(Consume(URI,URI,URI,int)): New constructor.
(setFromInput(String)): New method.
(setFromInput(java.net.URI)): New method.
(setToPerformance(String)): New method.
(setToPerformance(java.net.URI)): New method.
(setToInput(String)): New method.
(setToInput(java.net.URI)): New method.
(setToIndex(int)): New method.
(toString()): New method.
* src/nongnu/cashews/language/process/MultiPerform.java:
Removed implementation of Xmlizable (interface now extends
Serializable)
* src/nongnu/cashews/language/process/Performance.java:
(getDeclaredNamespaces()): New method.
* src/nongnu/cashews/language/process/Process.java:
Xmlizable changed to Serializable.
* src/nongnu/cashews/language/process/Produce.java:
(Produce(String,String,String)): New constructor.
(Produce(URI,URI,URI)): New constructor.
(setFromPerformance(String)): New method.
(setFromPerformance(java.net.URI)): New method.
(setToOutput(String)): New method.
(setToOutput(java.net.URI)): New method.
(setFromOutput(String)): New method.
(setFromOutput(java.net.URI)): New method.
(toString()): New method. #
* src/nongnu/cashews/xml/CustomXmlizable.java:
Renamed to Xmlizable.
* src/nongnu/cashews/xml/Serializer.java:
(DECLARED_NAMESPACES): New constant.
(serialize(Xmlizable, org.w3c.dom.Node, org.w3c.dom.Document)):
Added namespaces and moved schema typing in from separate method.
(addNamespaceDeclarations(javax.xml.namespace.QName[],
org.w3c.dom.Element): New method.
(main(String[])): Example completed.
* src/nongnu/cashews/xml/Xmlizable.java:
(getElementName()): Moved from CustomXmlizable.
(getDeclaredNamespaces()): New method.
* src/nongnu/cashews/xml/schema/TypeMapper.java:
Added support for xsd:int and xsd:QName.
* src/nongnu/cashews/xml/schema/datatypes/Int.java:
New class.
(translateValue(org.w3c.dom.Document, Integer): New method.
* src/nongnu/cashews/xml/schema/datatypes/XsdQName.java:
New class.
(translateValue(org.w3c.dom.Document, javax.xml.namespace.QName):
New method.

125 lines of code changed in:

• src/nongnu/cashews/xml: Serializer.java (+95 -39), Xmlizable.java (+30 -2)

u1ah3 2005-05-06 11:28

2005-05-05 Andrew John Hughes <gnu_andrew@member.fsf.org>

* src/nongnu/cashews/language/process/AtomicProcess.java:
(setGrounding(nongnu.cashews.language.grounding.Grounding)):
New method.
* src/nongnu/cashews/language/process/CompositeProcess.java:
Removed Xmlizable implementation.
* src/nongnu/cashews/language/process/MultiPerform.java:
(MultiPerform()): New constructor.
(add(nongnu.cashews.language.process.MultiPerformElement)):
New method.
(toString()): New method.
* src/nongnu/cashews/language/process/Performance.java:
(Performance()): New private constructor.
(setProcess(nongnu.cashews.language.process.Process)): New method.
(addValueData(nongnu.cashews.language.process.ValueData)): New method.
(addValueCollector(nongnu.cashews.language.process.ValueCollector)):
New method.
(getProcess()): New method.
(getValueDatas()): Creates a clone.
(getValueCollectors()): Likewise.
(toString()): New method.
(getElementName()): New method.
* src/nongnu/cashews/language/process/Process.java:
(clone()): New method.
* src/nongnu/cashews/xml/CustomXmlizable.java:
New interface for custom serialization to XML.
(getElementName()): New method.
* src/nongnu/cashews/xml/Serializer.java:
(serialize(Xmlizable, org.w3c.dom.Node, org.w3c.dom.Document)):
Added custom serialization.
(main(String[])): Added more of the example process.
* src/nongnu/cashews/xml/Xmlizable.java:
Change comments to represent new role.

23 lines of code changed in:

• src/nongnu/cashews/xml: CustomXmlizable.java (new), Serializer.java (+21 -2), Xmlizable.java (+2 -4)

u1ah3 2005-05-04 23:17

2005-05-04 Andrew John Hughes <gnu_andrew@member.fsf.org>

* src/nongnu/cashews/language/process/AtomicProcess.java:
(AtomicProcess(String)): New constructor.
(AtomicProcess(java.net.URI)): New constructor.
* src/nongnu/cashews/language/process/CProcess.java:
New interface.
* src/nongnu/cashews/language/process/CompositeProcess.java:
(controlStructure): New field.
(CompositeProcess(String)): New constructor.
(CompositeProcess(java.net.URI)): New constructor.
(setControlStructure(CProcess)): New method.
(toString()): New method.
* src/nongnu/cashews/language/process/IfThenElse.java:
Implements CProcess instead of extending CompositeProcess.
* src/nongnu/cashews/language/process/Loop.java:
Implements CProcess instead of extending CompositeProcess.
* src/nongnu/cashews/language/process/MultiPerform.java:
Implements CProcess instead of extending CompositeProcess.
* src/nongnu/cashews/language/process/Process.java:
(Process(String)): New constructor.
(Process(java.net.URI)): New constructor.
(setName(String)): New method.
(setName(java.net.URI)): New method.
(toString()): New method.
* src/nongnu/cashews/language/process/ValueCollector.java:
(width): Name changed from collectorWidth.
* src/nongnu/cashews/xml/Serializer.java:
New class which serializes instances to XML.
(initializeImpl()): New method.
(serialize(Xmlizable, org.w3c.dom.Node, org.w3c.dom.Document)):
New method.
(convertDocumentToString(org.w3c.dom.Document)): New method.
(serializeValue(org.w3c.dom.Document, org.w3c.dom.Element, Object)):
New method.
(createElement(org.w3c.dom.Document, String)): New method.
(main(String[])): New method.
* src/nongnu/cashews/xml/Xmlizable.java:
New interface for XMLizable classes.
* src/nongnu/cashews/xml/schema/TypeMapper.java:
New class for mapping Java to XML data types.
(builtinTypes): New field, a map of XML built-in types.
(map(java.lang.reflect.Type)): New method.
* src/nongnu/cashews/xml/schema/XsdType.java:
New interface.
(translateValue(org.w3c.dom.Document, T)): New method.
* src/nongnu/cashews/xml/schema/datatypes/AnyUri.java:
Implementation for xsd:anyURI.
(translateValue(org.w3c.dom.Document, java.net.URI)): New method.

246 lines of code changed in:

• src/nongnu/cashews/xml: Serializer.java (new 212), Xmlizable.java (new 34)

u1ah3 2005-04-18 01:57

2005-04-18 Andrew John Hughes <gnu_andrew@member.fsf.org>

* docs/api/.cvsignore:
Ignore html directory and create_html marker.
* lib/.cvsignore:
Ignore new jar files.
* src/nongnu/cashews/commons/Pair.java:
(hashCode()): Removed dumb use of superclass hashCode as this
is java.lang.Object.
* src/nongnu/cashews/commons/PairStack.java:
Stack class to handle maps containing pairs.
(PairStack()): New constructor.
(peek()): New method.
(pop()): New method.
(push(A,B)): New method.
(search(A,B)): New method.
* src/nongnu/cashews/rdf/RDFHandler.java:
(subjectURI): New field.
(PairStack<Subject,Predicate>): New field.
(Set<String>): New field.
(RDFHandler(java.util.logging.Handler)): Initialize new variables.
(startElement(String,String,String,org.xml.sax.Attributes)):
Handle maintaining subjectURI and nested subjects.
(handleAttributes(PairMap<String,String,String>)):
Remove attributes from set when parsed, generate blank node ids
when not present, and add triples for property attributes.
(setSubjectType(String)): Documented.
(generateBlankID()): New method to generate a blank node ID.
(endSubject()): Handle the end of a subject node, including
nested nodes.
* src/nongnu/cashews/rdf/XMLParser.java:
(main(String[])): Expect URIs rather than files at command line.
* src/nongnu/cashews/rdf/Parser.java:
(man(String[])): Likewise.

2 lines of code changed in:

• src/nongnu/cashews/xml: Parser.java (+2 -3)

u1ah3 2005-04-17 19:37

2005-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org>

* src/nongnu/cashews/commons/Pair.java:
Now serializable, along with some doc. fixes.
(serialVersionUID): Added.
(toString()): New method.
* src/nongnu/cashews/commons/PairMap.java:
New class to handle maps with a Pair as the key.
(serialVersionUID): For serialization.
(PairMap()): New constructor.
(PairMap(int)): Likewise.
(PairMap(int,float)): Likewise.
(PairMap(PairMap<A,B,? extends V>)): Likewise.
(containsKey(A,B)): Shortcut for pair handling.
(get(A,B)): Likewise.
(put(A,B,V)): Likewise.
(remove(A,B)): Likewise.
* src/nongnu/cashews/commons/PairSet.java:
New class to handle sets of Pairs.
(serialVersionUID): For serialization.
(PairSet()): New constructor.
(PairSet(int)): Likewise.
(PairSet(int,float)): Likewise.
(PairSet(PairSet<A,B)): Likewise.
(contains(A,B)): Shortcut for pair handling.
(add(A,B)): Likewise.
(remove(A,B)): Likewise.
* src/nongnu/cashews/rdf/Blank.java:
Now properly extends Node.
(toString()): Modified for subclass status.
(clone()): Likewise.
* src/nongnu/cashews/rdf/Node.java:
Turned into a class which implements Subject and RDFObject.
(type): New field holding the type of the node.
(clone()): New method.
(setType(URI)): New method.
(getType()): New method.
(toString()): New method.
(setType(String)): New method.
* src/nongnu/cashews/rdf/RDFHandler.java:
Moved from XMLParser to a separate class.
(RDF_NAMESPACE): Moved from XMLParser.
(graph): Moved from XMLParser.
(getGraph()): New accessor.
(parseAttributes(org.xml.sax.Attributes)): Convert attributes
to a PairMap.
(handleAttributes(PairMap<String,String,String>): Handle RDF attribs
in a central location.
(setSubjectType(String)): Central place for setting node type.
* src/nongnu/cashews/rdf/RDFObject.java:
Now a implemented interface of Node.
* src/nongnu/cashews/rdf/RDFURI.java:
(toString()): Modified for subclass status.
(clone()): Likewise.
* src/nongnu/cashews/rdf/XMLParser.java:
Now a small subclass to Parser.
(RDF_NAMESPACE): Moved to RDFHandler.
(reader): Moved to Parser.
(graph): Moved to RDFHandler.
(rdfHandler): Generic version in Parser.
(XMLParser(java.util.logging.Handler)): Shortcut for an RDF parse.
(parse(String)): Moved to Parser.
(parse(org.xml.sax.InputSource)): Moved to Parser.
(parse(java.io.File)): Moved to Parser.
(RDFHandler): Moved to its own class.
* src/nongnu/cashews/xml/Parser.java:
New class for a basic XML parser.
(reader): Field from rdf.XMLParser.
(xmlHandler): New field.
(Parser(java.util.logging.Handler)): Shortcut for a basic parse.
(Parser(java.util.logging.Handler,nongnu.cashews.xml.XmlBaseHandler)):
Central constructor.
(parse(String)): Moved from rdf.XMLParser.
(parse(org.xml.sax.InputSource)): Moved from rdf.XMLParser.
(parse(java.io.File)): Moved from rdf.XMLParser.
(getHandler()): New accessor.
(main(String[])): Test harness.

162 lines of code changed in:

• src/nongnu/cashews/xml: Parser.java (new 162)

u1ah3 2005-04-09 02:36

2005-04-09 Andrew John Hughes <gnu_andrew@member.fsf.org>

* lib/Makefile.am:
Added creation of xml.jar.
* src/nongnu/cashews/commons/Pair.java:
Free heterogenous pair type at no extra cost...
(left): New field.
(right): New field.
(Pair(A,B)): New constructor.
(setLeft(A)): New method.
(setRight(B)): New method.
(getLeft()): New method.
(getRight()): New method.
* src/nongnu/cashews/rdf/XMLParser.java:
(rdfHandler): New field.
(XMLParser(java.util.logging.Handler)):
Retain a reference to the handler.
(parse(String)): Links to parse(org.xml.sax.InputSource).
(parse(org.xml.sax.InputSource): Set the base URI from the system ID.
(RDFHandler): Use XmlBaseHandler as superclass.
(RDFHandler.rdfLogger): Renamed from logger.
(RDFHandler.RDFHandler(java.util.logging.Handler)): Call superclass.
(RDFHandler.startDocument()): Likewise.
(RDFHandler.startElement(String,String,String,org.xml.sax.Attributes)):
Likewise.
(RDFHandler.characters(char[],int,int)): Likewise.
(RDFHandler.endElement(String,String,String)): Likewise.
* src/nongnu/cashews/xml/XmlBaseHandler.java:
New class.
(XML_NAMESPACE): New constant.
(uris): New field.
(xmlBaseLogger): New field.
(level): New field.
(lastElement): New field.
(lastLevel): New field.
(XmlBaseHandler(java.util.logging.Handler)): New method.
(setBaseURI(String)): New method.
(startDocument()): New method.
(startElement(String,String,String,org.xml.sax.Attributes)):
New method.
(endElement(String,String,String)): New method.
(pushURI(String)): New method.
(popURI()): New method.
(getBaseURI()): New method.
(getHierarchicalLevel()): New method.
(logAttributes(org.xml.sax.Attributes)): New method.

262 lines of code changed in:

• src/nongnu/cashews/xml: XmlBaseHandler.java (new 262)