[txw2] 01/02: Merge branch 'upstream'

Timo Aaltonen tjaalton-guest at moszumanska.debian.org
Mon Dec 16 15:54:31 UTC 2013


This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository txw2.

commit 4112d51c22c6f91caef76189f0a2ace40c52c899
Merge: 2b0afd9 c918647
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Dec 16 15:26:07 2013 +0200

    Merge branch 'upstream'

 build.xml                                          | 186 ----------
 compiler/pom.xml                                   |  93 +++++
 .../java/com/sun/tools/txw2/AntErrorListener.java  |  84 +++++
 .../com/sun/tools/txw2/ConsoleErrorReporter.java   |  85 +++++
 .../java/com/sun/tools/txw2/ErrorListener.java     |  56 +++
 .../src/main/java}/com/sun/tools/txw2/Main.java    |  54 ++-
 .../main/java}/com/sun/tools/txw2/NameUtil.java    |  54 ++-
 .../java/com/sun/tools/txw2/RELAXNGLoader.java     | 262 ++++++++++++++
 .../java/com/sun/tools/txw2/SchemaBuilder.java     |  54 +++
 .../main/java/com/sun/tools/txw2/TxwOptions.java   |  91 +++++
 .../src/main/java}/com/sun/tools/txw2/TxwTask.java |  62 +++-
 .../java/com/sun/tools/txw2/XmlSchemaLoader.java   |  64 ++++
 .../txw2/builder/relaxng/AnnotationsImpl.java      |  63 ++++
 .../txw2/builder/relaxng/CommentListImpl.java      |  50 +++
 .../builder/relaxng/DataPatternBuilderImpl.java    |  75 ++++
 .../txw2/builder/relaxng/DatatypeFactory.java      |  87 +++++
 .../sun/tools/txw2/builder/relaxng/DivImpl.java    |  63 ++++
 .../relaxng/ElementAnnotationBuilderImpl.java      |  71 ++++
 .../tools/txw2/builder/relaxng/GrammarImpl.java    |  72 ++++
 .../txw2/builder/relaxng/GrammarSectionImpl.java   |  95 +++++
 .../txw2/builder/relaxng/SchemaBuilderImpl.java    |  54 ++-
 .../sun/tools/txw2/builder/relaxng/package.html    |  45 +++
 .../tools/txw2/builder/xsd/XmlSchemaBuilder.java   |  54 ++-
 .../com/sun/tools/txw2/builder/xsd/package.html    |  45 +++
 .../java/com/sun/tools/txw2/model/Attribute.java   | 108 ++++++
 .../com/sun/tools/txw2/model/CycleIterator.java    |  75 ++++
 .../main/java/com/sun/tools/txw2/model/Data.java   |  71 ++++
 .../main/java/com/sun/tools/txw2/model/Define.java | 114 ++++++
 .../java}/com/sun/tools/txw2/model/Element.java    |  54 ++-
 .../main/java/com/sun/tools/txw2/model/Empty.java  |  60 ++++
 .../java/com/sun/tools/txw2/model/Grammar.java     |  79 +++++
 .../main/java}/com/sun/tools/txw2/model/Leaf.java  |  54 ++-
 .../main/java/com/sun/tools/txw2/model/List.java   |  71 ++++
 .../main/java/com/sun/tools/txw2/model/Node.java   |  90 +++++
 .../java}/com/sun/tools/txw2/model/NodeSet.java    |  54 ++-
 .../main/java/com/sun/tools/txw2/model/Ref.java    |  74 ++++
 .../main/java/com/sun/tools/txw2/model/Text.java   |  55 +++
 .../main/java/com/sun/tools/txw2/model/Value.java  |  80 +++++
 .../java/com/sun/tools/txw2/model/WriterNode.java  |  80 +++++
 .../java/com/sun/tools/txw2/model/XmlNode.java     |  90 +++++
 .../sun/tools/txw2/model/prop/AttributeProp.java   |  54 +++
 .../com/sun/tools/txw2/model/prop/ElementProp.java |  56 +++
 .../sun/tools/txw2/model/prop/LeafElementProp.java |  54 +++
 .../java/com/sun/tools/txw2/model/prop/Prop.java   |  55 +++
 .../com/sun/tools/txw2/model/prop/ValueProp.java   |  66 ++++
 .../com/sun/tools/txw2/model/prop/XmlItemProp.java |  73 ++++
 doc/license.txt                                    | 384 ---------------------
 doc/readme.txt                                     |   1 -
 lib/compiler/args4j-1.0-RC.license.txt             |  32 --
 license.txt                                        | 274 +++++++++++++++
 nbproject/project.xml                              |  82 -----
 pom.xml                                            | 129 +++++++
 runtime/pom.xml                                    |  68 ++++
 .../src/main/java/com/sun/xml/txw2/Attribute.java  |  70 ++++
 runtime/src/main/java/com/sun/xml/txw2/Cdata.java  |  56 +++
 .../src/main/java/com/sun/xml/txw2/Comment.java    |  65 ++++
 .../java}/com/sun/xml/txw2/ContainerElement.java   |  54 ++-
 .../src/main/java/com/sun/xml/txw2/Content.java    |  95 +++++
 .../main/java/com/sun/xml/txw2/ContentVisitor.java |  62 ++++
 .../main/java/com/sun/xml/txw2/DatatypeWriter.java | 130 +++++++
 .../src/main/java}/com/sun/xml/txw2/Document.java  |  56 ++-
 .../main/java/com/sun/xml/txw2/EndDocument.java    |  54 +++
 runtime/src/main/java/com/sun/xml/txw2/EndTag.java |  54 +++
 .../sun/xml/txw2/IllegalAnnotationException.java   |  62 ++++
 .../sun/xml/txw2/IllegalSignatureException.java    |  62 ++++
 .../main/java/com/sun/xml/txw2/NamespaceDecl.java  |  83 +++++
 .../java/com/sun/xml/txw2/NamespaceResolver.java   |  60 ++++
 .../java}/com/sun/xml/txw2/NamespaceSupport.java   |  70 ++--
 runtime/src/main/java/com/sun/xml/txw2/Pcdata.java |  56 +++
 .../main/java/com/sun/xml/txw2/StartDocument.java  |  54 +++
 .../src/main/java}/com/sun/xml/txw2/StartTag.java  |  54 ++-
 .../src/main/java}/com/sun/xml/txw2/TXW.java       |  64 +++-
 runtime/src/main/java/com/sun/xml/txw2/Text.java   |  61 ++++
 .../main/java/com/sun/xml/txw2/TxwException.java   |  60 ++++
 .../java}/com/sun/xml/txw2/TypedXmlWriter.java     |  54 ++-
 .../com/sun/xml/txw2/annotation/XmlAttribute.java  |  88 +++++
 .../java/com/sun/xml/txw2/annotation/XmlCDATA.java |  58 ++++
 .../com/sun/xml/txw2/annotation/XmlElement.java    |  54 ++-
 .../com/sun/xml/txw2/annotation/XmlNamespace.java  |  68 ++++
 .../java/com/sun/xml/txw2/annotation/XmlValue.java |  72 ++++
 .../java/com/sun/xml/txw2/annotation/package.html  |  66 ++++
 .../xml/txw2/output/CharacterEscapeHandler.java    |  64 ++++
 .../java}/com/sun/xml/txw2/output/DataWriter.java  |  54 ++-
 .../xml/txw2/output/DelegatingXMLStreamWriter.java |  40 +++
 .../com/sun/xml/txw2/output/DomSerializer.java     |  54 ++-
 .../com/sun/xml/txw2/output/DumbEscapeHandler.java |  94 +++++
 .../com/sun/xml/txw2/output/DumpSerializer.java    | 106 ++++++
 .../sun/xml/txw2/output/IndentingXMLFilter.java    |  40 +++
 .../xml/txw2/output/IndentingXMLStreamWriter.java  |  40 +++
 .../com/sun/xml/txw2/output/ResultFactory.java     |  82 +++++
 .../com/sun/xml/txw2/output/SaxSerializer.java     |  54 ++-
 .../com/sun/xml/txw2/output/StaxSerializer.java    |  54 ++-
 .../com/sun/xml/txw2/output/StreamSerializer.java  |  54 ++-
 .../java/com/sun/xml/txw2/output/TXWResult.java    |  81 +++++
 .../com/sun/xml/txw2/output/TXWSerializer.java     | 102 ++++++
 .../java}/com/sun/xml/txw2/output/XMLWriter.java   |  54 ++-
 .../com/sun/xml/txw2/output/XmlSerializer.java     |  54 ++-
 .../main/java/com/sun/xml/txw2/output/package.html |  49 +++
 .../src/main/java/com/sun/xml/txw2/package.html    |  49 +++
 runtime/src/test/java/t1/Foo.java                  |  55 +++
 runtime/src/test/java/t1/Main.java                 |  60 ++++
 runtime/src/test/java/t1/package-info.java         |  45 +++
 .../com/sun/tools/txw2/AntErrorListener.java       |  62 ----
 .../com/sun/tools/txw2/ConsoleErrorReporter.java   |  65 ----
 src/compiler/com/sun/tools/txw2/ErrorListener.java |  36 --
 src/compiler/com/sun/tools/txw2/RELAXNGLoader.java |  52 ---
 src/compiler/com/sun/tools/txw2/SchemaBuilder.java |  34 --
 src/compiler/com/sun/tools/txw2/TxwOptions.java    |  71 ----
 .../com/sun/tools/txw2/XmlSchemaLoader.java        |  44 ---
 .../txw2/builder/relaxng/AnnotationsImpl.java      |  43 ---
 .../txw2/builder/relaxng/CommentListImpl.java      |  30 --
 .../builder/relaxng/DataPatternBuilderImpl.java    |  55 ---
 .../txw2/builder/relaxng/DatatypeFactory.java      |  67 ----
 .../sun/tools/txw2/builder/relaxng/DivImpl.java    |  43 ---
 .../relaxng/ElementAnnotationBuilderImpl.java      |  51 ---
 .../tools/txw2/builder/relaxng/GrammarImpl.java    |  52 ---
 .../txw2/builder/relaxng/GrammarSectionImpl.java   |  75 ----
 .../sun/tools/txw2/builder/relaxng/package.html    |   3 -
 .../com/sun/tools/txw2/builder/xsd/package.html    |   3 -
 .../com/sun/tools/txw2/model/Attribute.java        |  88 -----
 .../com/sun/tools/txw2/model/CycleIterator.java    |  55 ---
 src/compiler/com/sun/tools/txw2/model/Data.java    |  51 ---
 src/compiler/com/sun/tools/txw2/model/Define.java  |  94 -----
 src/compiler/com/sun/tools/txw2/model/Empty.java   |  40 ---
 src/compiler/com/sun/tools/txw2/model/Grammar.java |  59 ----
 src/compiler/com/sun/tools/txw2/model/List.java    |  51 ---
 src/compiler/com/sun/tools/txw2/model/Node.java    |  70 ----
 src/compiler/com/sun/tools/txw2/model/Ref.java     |  54 ---
 src/compiler/com/sun/tools/txw2/model/Text.java    |  35 --
 src/compiler/com/sun/tools/txw2/model/Value.java   |  60 ----
 .../com/sun/tools/txw2/model/WriterNode.java       |  60 ----
 src/compiler/com/sun/tools/txw2/model/XmlNode.java |  70 ----
 .../sun/tools/txw2/model/prop/AttributeProp.java   |  34 --
 .../com/sun/tools/txw2/model/prop/ElementProp.java |  36 --
 .../sun/tools/txw2/model/prop/LeafElementProp.java |  34 --
 .../com/sun/tools/txw2/model/prop/Prop.java        |  35 --
 .../com/sun/tools/txw2/model/prop/ValueProp.java   |  46 ---
 .../com/sun/tools/txw2/model/prop/XmlItemProp.java |  53 ---
 src/runtime/com/sun/xml/txw2/Attribute.java        |  50 ---
 src/runtime/com/sun/xml/txw2/Cdata.java            |  36 --
 src/runtime/com/sun/xml/txw2/Comment.java          |  45 ---
 src/runtime/com/sun/xml/txw2/Content.java          |  75 ----
 src/runtime/com/sun/xml/txw2/ContentVisitor.java   |  42 ---
 src/runtime/com/sun/xml/txw2/DatatypeWriter.java   |  97 ------
 src/runtime/com/sun/xml/txw2/EndDocument.java      |  34 --
 src/runtime/com/sun/xml/txw2/EndTag.java           |  34 --
 .../sun/xml/txw2/IllegalAnnotationException.java   |  42 ---
 .../sun/xml/txw2/IllegalSignatureException.java    |  42 ---
 src/runtime/com/sun/xml/txw2/NamespaceDecl.java    |  63 ----
 .../com/sun/xml/txw2/NamespaceResolver.java        |  40 ---
 src/runtime/com/sun/xml/txw2/Pcdata.java           |  36 --
 src/runtime/com/sun/xml/txw2/StartDocument.java    |  34 --
 src/runtime/com/sun/xml/txw2/Text.java             |  41 ---
 src/runtime/com/sun/xml/txw2/TxwException.java     |  40 ---
 .../com/sun/xml/txw2/annotation/XmlAttribute.java  |  68 ----
 .../com/sun/xml/txw2/annotation/XmlCDATA.java      |  38 --
 .../com/sun/xml/txw2/annotation/XmlNamespace.java  |  48 ---
 .../com/sun/xml/txw2/annotation/XmlValue.java      |  56 ---
 .../com/sun/xml/txw2/annotation/package.html       |  24 --
 .../xml/txw2/output/CharacterEscapeHandler.java    |  63 ----
 .../com/sun/xml/txw2/output/DumbEscapeHandler.java |  93 -----
 .../com/sun/xml/txw2/output/DumpSerializer.java    |  86 -----
 .../com/sun/xml/txw2/output/ResultFactory.java     |  60 ----
 src/runtime/com/sun/xml/txw2/output/package.html   |   7 -
 src/runtime/com/sun/xml/txw2/package.html          |   7 -
 src/test/IndentingXMLStreamWriterTest.java         |  25 --
 src/test/Main.java                                 |  43 ---
 src/test/NameCard.java                             |  43 ---
 src/test/NameCards.java                            |  31 --
 src/test/test/t1/Foo.java                          |  35 --
 src/test/test/t1/Main.java                         |  40 ---
 src/test/test/t1/package-info.java                 |  25 --
 txw2.iml                                           |   3 +-
 txw2.ipr                                           | 108 ++++--
 wsdl11/build.xml                                   |  42 +++
 wsdl11/httpBindings.rnc                            |  41 ++-
 wsdl11/mimeBindings.rnc                            |  41 ++-
 wsdl11/soapBindings.rnc                            |  41 ++-
 wsdl11/src/WsdlTest.java                           |  39 +++
 wsdl11/wsdl.rnc                                    |  41 ++-
 wsdl11/wsdl11.iml                                  |   3 +-
 xmlschema/build.xml                                |  42 +++
 xmlschema/src/XsdTest.java                         |  39 +++
 xmlschema/xmlschema-for-jaxb.rng                   |  44 ++-
 xmlschema/xmlschema.iml                            |   3 +-
 xmlschema/xmlschema.rng                            |  44 ++-
 186 files changed, 7007 insertions(+), 4461 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/txw2.git



More information about the pkg-java-commits mailing list