From 19a3ec0f46ded480aaaa305547b80ee668c3f34f Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 7 Aug 2020 23:22:31 +0200 Subject: [PATCH] Cleaned up license --- LICENSE | 34 +++-- LICENSE.CC0 | 121 ++++++++++++++++++ LICENSE.blob | Bin 2430 -> 0 bytes test/dorkbox/{executor => }/ReadmeExamples.kt | 3 +- .../{test => }/CallerLoggerUtilTest.kt | 2 +- .../executor/{test => }/EmptyArgTest.kt | 7 +- .../executor/{test => }/InputRedirectTest.kt | 7 +- .../{test => }/InputStreamPumperTest.kt | 7 +- .../{test => }/LogOutputStreamTest.kt | 2 +- .../ProcessExecutorArgsWithExtraSpaceTest.kt | 7 +- .../ProcessExecutorBigOutputTest.kt | 7 +- .../ProcessExecutorCancelJavaTest.kt | 7 +- .../{test => }/ProcessExecutorCancelTest.kt | 7 +- .../ProcessExecutorCommandLineTest.kt | 7 +- .../ProcessExecutorExitValueTest.kt | 7 +- .../ProcessExecutorHelloWorldTest.kt | 7 +- .../ProcessExecutorInputStreamTest.kt | 9 +- .../{test => }/ProcessExecutorLoggerTest.kt | 3 +- .../{test => }/ProcessExecutorMainTest.kt | 7 +- .../ProcessExecutorStreamCloseTest.kt | 7 +- .../{test => }/ProcessExecutorTimeoutTest.kt | 7 +- .../{test => }/ProcessInitExceptionTest.kt | 2 +- .../{test => }/ProcessListenerSuccessTest.kt | 3 +- .../{test => }/ProcessListenerThrowTest.kt | 5 +- .../executor/{test => }/ProcessOutputTest.kt | 2 +- .../executor/{test => }/ProcessSshTest.kt | 3 +- .../{test => }/RememberCloseOutputStream.kt | 2 +- test/dorkbox/executor/TestShell.kt | 26 ++++ .../{test => }/samples/ArgumentsAsList.java | 2 +- .../{test => }/samples/BigOutput.java | 2 +- .../{test => }/samples/ExitLikeABoss.java | 2 +- .../{test => }/samples/HelloWorld.java | 2 +- .../executor/{test => }/samples/Loop.java | 2 +- .../{test => }/samples/PrintArguments.java | 2 +- .../samples/PrintInputToOutput.java | 2 +- .../executor/{test => }/samples/TestSetup.kt | 2 +- .../executor/{test => }/samples/true.exe | Bin .../ProcessExecutorShutdownHookTest.kt | 2 +- .../{test => }/shutdown/WriterLoop.java | 2 +- .../shutdown/WriterLoopStarterAfterExit.kt | 4 +- .../shutdown/WriterLoopStarterBeforeExit.kt | 4 +- .../{test => }/stream/TeeOutputStreamTest.kt | 5 +- 42 files changed, 239 insertions(+), 102 deletions(-) create mode 100644 LICENSE.CC0 delete mode 100644 LICENSE.blob rename test/dorkbox/{executor => }/ReadmeExamples.kt (99%) rename test/dorkbox/executor/{test => }/CallerLoggerUtilTest.kt (98%) rename test/dorkbox/executor/{test => }/EmptyArgTest.kt (90%) rename test/dorkbox/executor/{test => }/InputRedirectTest.kt (97%) rename test/dorkbox/executor/{test => }/InputStreamPumperTest.kt (93%) rename test/dorkbox/executor/{test => }/LogOutputStreamTest.kt (99%) rename test/dorkbox/executor/{test => }/ProcessExecutorArgsWithExtraSpaceTest.kt (90%) rename test/dorkbox/executor/{test => }/ProcessExecutorBigOutputTest.kt (95%) rename test/dorkbox/executor/{test => }/ProcessExecutorCancelJavaTest.kt (93%) rename test/dorkbox/executor/{test => }/ProcessExecutorCancelTest.kt (96%) rename test/dorkbox/executor/{test => }/ProcessExecutorCommandLineTest.kt (94%) rename test/dorkbox/executor/{test => }/ProcessExecutorExitValueTest.kt (93%) rename test/dorkbox/executor/{test => }/ProcessExecutorHelloWorldTest.kt (97%) rename test/dorkbox/executor/{test => }/ProcessExecutorInputStreamTest.kt (93%) rename test/dorkbox/executor/{test => }/ProcessExecutorLoggerTest.kt (97%) rename test/dorkbox/executor/{test => }/ProcessExecutorMainTest.kt (98%) rename test/dorkbox/executor/{test => }/ProcessExecutorStreamCloseTest.kt (92%) rename test/dorkbox/executor/{test => }/ProcessExecutorTimeoutTest.kt (96%) rename test/dorkbox/executor/{test => }/ProcessInitExceptionTest.kt (98%) rename test/dorkbox/executor/{test => }/ProcessListenerSuccessTest.kt (97%) rename test/dorkbox/executor/{test => }/ProcessListenerThrowTest.kt (93%) rename test/dorkbox/executor/{test => }/ProcessOutputTest.kt (98%) rename test/dorkbox/executor/{test => }/ProcessSshTest.kt (94%) rename test/dorkbox/executor/{test => }/RememberCloseOutputStream.kt (97%) create mode 100644 test/dorkbox/executor/TestShell.kt rename test/dorkbox/executor/{test => }/samples/ArgumentsAsList.java (96%) rename test/dorkbox/executor/{test => }/samples/BigOutput.java (96%) rename test/dorkbox/executor/{test => }/samples/ExitLikeABoss.java (96%) rename test/dorkbox/executor/{test => }/samples/HelloWorld.java (95%) rename test/dorkbox/executor/{test => }/samples/Loop.java (96%) rename test/dorkbox/executor/{test => }/samples/PrintArguments.java (95%) rename test/dorkbox/executor/{test => }/samples/PrintInputToOutput.java (96%) rename test/dorkbox/executor/{test => }/samples/TestSetup.kt (96%) rename test/dorkbox/executor/{test => }/samples/true.exe (100%) rename test/dorkbox/executor/{test => }/shutdown/ProcessExecutorShutdownHookTest.kt (98%) rename test/dorkbox/executor/{test => }/shutdown/WriterLoop.java (97%) rename test/dorkbox/executor/{test => }/shutdown/WriterLoopStarterAfterExit.kt (94%) rename test/dorkbox/executor/{test => }/shutdown/WriterLoopStarterBeforeExit.kt (94%) rename test/dorkbox/executor/{test => }/stream/TeeOutputStreamTest.kt (95%) diff --git a/LICENSE b/LICENSE index 1a77371..ddaf6be 100644 --- a/LICENSE +++ b/LICENSE @@ -1,70 +1,78 @@ - Executor - Shell, JVM, and SSH command execution on Linux, MacOS, or Windows for Java 11+ + [The Apache Software License, Version 2.0] https://git.dorkbox.com/dorkbox/Executor - Copyright 2020 - The Apache Software License, Version 2.0 + Copyright 2020 Dorkbox LLC Extra license information - ZT Process Executor - + [The Apache Software License, Version 2.0] https://github.com/zeroturnaround/zt-exec - Copyright 2014 - The Apache Software License, Version 2.0 + Copyright 2014 ZeroTurnaround LLC - Apache Commons Exec - + [The Apache Software License, Version 2.0] https://commons.apache.org/proper/commons-exec/ - Copyright 2014 - The Apache Software License, Version 2.0 + Copyright 2014 The Apache Software Foundation - Kotlin - + [The Apache Software License, Version 2.0] https://github.com/JetBrains/kotlin - Copyright 2000-2020 - The Apache Software License, Version 2.0 + Copyright 2020 JetBrains s.r.o. and Kotlin Programming Language contributors Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply See: https://github.com/JetBrains/kotlin/blob/master/license/README.md - kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support + [The Apache Software License, Version 2.0] https://github.com/Kotlin/kotlinx.coroutines - Copyright 2000-2020 - The Apache Software License, Version 2.0 + Copyright 2020 JetBrains s.r.o. - kotlin-logging - Lightweight logging framework for Kotlin + [The Apache Software License, Version 2.0] https://github.com/MicroUtils/kotlin-logging - Copyright 2016-2020 - The Apache Software License, Version 2.0 + Copyright 2020 Ohad Shai - SLF4J - Simple facade or abstraction for various logging frameworks + [MIT License] http://www.slf4j.org - Copyright 2004-2019 - MIT License + Copyright 2019 QOS.ch - SSHJ - SSHv2 library for Java + [The Apache Software License, Version 2.0] https://github.com/hierynomus/sshj - Copyright 2009-2020 - The Apache Software License, Version 2.0 + Copyright 2020 Jeroen van Erp SSHJ Contributors Extra license information - Apache MINA - + [The Apache Software License, Version 2.0] https://mina.apache.org/sshd-project/ - Copyright 2003-2017 - The Apache Software License, Version 2.0 The Apache Software Foundation - Apache Commons-Net - + [The Apache Software License, Version 2.0] https://commons.apache.org/proper/commons-net/ - Copyright 2001-2017 - The Apache Software License, Version 2.0 The Apache Software Foundation - JZlib - + [The Apache Software License, Version 2.0] http://www.jcraft.com/jzlib - Copyright 2002-2008 - The Apache Software License, Version 2.0 Atsuhiko Yamanaka JCraft, Inc. - Bouncy Castle Crypto - + [The Apache Software License, Version 2.0] http://www.bouncycastle.org - Copyright 2000-2006 - The Apache Software License, Version 2.0 The Legion of the Bouncy Castle Inc - ed25519-java - + [Public Domain, per Creative Commons CC0] https://github.com/str4d/ed25519-java - Copyright 2020 - Public Domain, per Creative Commons CC0 https://github.com/str4d diff --git a/LICENSE.CC0 b/LICENSE.CC0 new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE.CC0 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/LICENSE.blob b/LICENSE.blob deleted file mode 100644 index c3029482f92357bfdff1a101d5e2bdf4d97fa6e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2430 zcmb_eYj4{&6s6Oq>Cm8S(ry?qU?5fu=uk&mg7m{W44CUAXgoXVW^cptWuPV6q9cg{ zNyTw~(|*j}???9dy8p04N_OQe=o++wt|5z;_Z}YJd#KOo}D zA`RtO(*d4a?1<6z^}99^t{S-$8I$SzzCRSk3#B^j%VQ65{qotLVVTajwpDo1cDspp zOXTK3k3Lc|;9Ap}_haNm97`~MLs}WJ-~Qx zHeTi>`T~Ju&-g?z`lij2m2oO1MElGPq3e1zrcQl zfvlz9VW+S^V1L5?g8hwrHFA5p7;M^<#1=OX6cefT4+}7aERd4|n58HaF;{ikMFHJd;|W^d=~-)F2);kx=1U#+0$|LSCmv(s3k$h=yV?;EJb) z#vu5AJ3`^Akr(zO z24Rbsa4#0S?VZgQxzyS1k$1Wx$zo0iEMOtGs>b@-C>Gcrbf}I{%QDyh#ca3#22eg@ z>jB>_y91EQ@p$a%c(6IL>fxYT^jALE?|MPx{$GYVw<@f@jQ>X)=n~s_RyfMX#CS_IW1yX2>k|Q3Ni)rray!x;0adQUt3Sd76?FD>q3jhBPkCb0< z9gD34l*Jr$h(PTS;Bi0U+yJguD+M_U6dM?Ko{mmz#Nt{YD-EObNE}M~DZ|$SJ7i?J z)wIrax|;@`^Sku`Ct5I}O{g&1tf?lMk#nF5JWn{!&fw|0fPsrQ*C)5_f!gLn_qj5_ z@xtkRa)5G}mU*~w@80^`Ya@KLkW0