[javabeans-activation-framework] 02/02: Merge tag 'upstream/1.2.0'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository javabeans-activation-framework.

commit 81cce9ceb5ee8e40953c87a49c41b453d835d670
Merge: 5d765ef d8e73c9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 30 12:42:17 2017 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .gitignore                                         |     5 +
 CONTRIBUTING.md                                    |    30 +
 LICENSE.txt                                        |   759 +
 README.md                                          |    12 +
 activation/pom.xml                                 |   211 +
 .../com/sun/activation/registries/LogSupport.java  |    85 +
 .../com/sun/activation/registries/MailcapFile.java |   578 +
 .../registries/MailcapParseException.java          |    55 +
 .../activation/registries/MailcapTokenizer.java    |   337 +
 .../sun/activation/registries/MimeTypeEntry.java   |    65 +
 .../sun/activation/registries/MimeTypeFile.java    |   332 +
 .../com/sun/activation/viewers/ImageViewer.java    |   138 +
 .../sun/activation/viewers/ImageViewerCanvas.java  |    95 +
 .../com/sun/activation/viewers/TextEditor.java     |   203 +
 .../com/sun/activation/viewers/TextViewer.java     |   118 +
 .../src/main/java/doc-files/speclicense.html       |   213 +
 .../javax/activation/ActivationDataFlavor.java     |   263 +
 .../main/java/javax/activation/CommandInfo.java    |   245 +
 .../src/main/java/javax/activation/CommandMap.java |   249 +
 .../main/java/javax/activation/CommandObject.java  |    68 +
 .../java/javax/activation/DataContentHandler.java  |   114 +
 .../activation/DataContentHandlerFactory.java      |    61 +
 .../main/java/javax/activation/DataHandler.java    |   912 ++
 .../src/main/java/javax/activation/DataSource.java |   101 +
 .../main/java/javax/activation/FileDataSource.java |   171 +
 .../main/java/javax/activation/FileTypeMap.java    |   145 +
 .../java/javax/activation/MailcapCommandMap.java   |   737 +
 .../src/main/java/javax/activation/MimeType.java   |   359 +
 .../javax/activation/MimeTypeParameterList.java    |   354 +
 .../javax/activation/MimeTypeParseException.java   |    63 +
 .../javax/activation/MimetypesFileTypeMap.java     |   373 +
 .../java/javax/activation/SecuritySupport.java     |   144 +
 .../main/java/javax/activation/URLDataSource.java  |   150 +
 .../activation/UnsupportedDataTypeException.java   |    70 +
 .../src/main/java/javax/activation/package.html    |    53 +
 activation/src/main/resources/META-INF/LICENSE.txt |   759 +
 .../src/main/resources/META-INF/mailcap.default    |     7 +
 .../src/main/resources/META-INF/mimetypes.default  |    25 +
 activationapi/pom.xml                              |   146 +
 copyright-exclude                                  |     8 +
 demo/pom.xml                                       |    80 +
 demo/src/main/java/CompViewer.java                 |   142 +
 demo/src/main/java/DCHTest.java                    |   106 +
 demo/src/main/java/DCHTest2.java                   |   114 +
 demo/src/main/java/DHURL.java                      |    85 +
 demo/src/main/java/FileView.java                   |    68 +
 demo/src/main/java/JAFApp.java                     |   412 +
 demo/src/main/java/MCDump.java                     |   106 +
 demo/src/main/java/MCTest.java                     |    77 +
 demo/src/main/java/ODCHTest.java                   |    97 +
 demo/src/main/java/PlainDCH.java                   |   148 +
 demo/src/main/java/PrefTest.java                   |    78 +
 demo/src/main/java/SimpleDCF.java                  |   115 +
 demo/src/main/java/TextInternalizer.java           |   111 +
 doc/release/LICENSE.txt                            |   759 +
 doc/release/README.txt                             |    21 +
 doc/release/RELNOTES.txt                           |    62 +
 doc/spec/JAF-1.0.doc                               |   Bin 0 -> 148480 bytes
 doc/spec/JAF-1.0.pdf                               |   Bin 0 -> 213431 bytes
 doc/spec/JAF-1.0.ps                                | 12926 +++++++++++++++++
 doc/spec/JAF-1.1-changes.txt                       |   197 +
 doc/spec/JAF-1.1.doc                               |   Bin 0 -> 113664 bytes
 doc/spec/JAF-1.1.pdf                               |   Bin 0 -> 168182 bytes
 doc/spec/JAF-1.1.ps                                | 14155 +++++++++++++++++++
 doc/spec/JAF-1.2-changes.txt                       |    94 +
 doc/spec/JAF-1.2.doc                               |   Bin 0 -> 208896 bytes
 doc/spec/JAF-1.2.pdf                               |   Bin 0 -> 258606 bytes
 pom.xml                                            |   642 +
 68 files changed, 39408 insertions(+)

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