Permalink
Browse files

update license to ASL 2.0

  • Loading branch information...
1 parent b306b01 commit 8e99049a6133d5d60d4416735cbf74a5ffe6306c @cwensel cwensel committed May 2, 2012
Showing with 441 additions and 322 deletions.
  1. +0 −30 LICENSE.txt
  2. +202 −0 apl.txt
  3. +12 −15 build.xml
  4. +2 −30 src/java/multitool/Main.java
  5. +10 −11 src/java/multitool/factory/ConcatFactory.java
  6. +10 −11 src/java/multitool/factory/CountFactory.java
  7. +10 −11 src/java/multitool/factory/CutFactory.java
  8. +10 −11 src/java/multitool/factory/DebugFactory.java
  9. +1 −1 src/java/multitool/factory/DiscardFactory.java
  10. +10 −11 src/java/multitool/factory/ExpressionFactory.java
  11. +13 −14 src/java/multitool/factory/Factory.java
  12. +10 −11 src/java/multitool/factory/FileNameFactory.java
  13. +10 −11 src/java/multitool/factory/GenFactory.java
  14. +10 −11 src/java/multitool/factory/GroupByFactory.java
  15. +10 −11 src/java/multitool/factory/ParserFactory.java
  16. +10 −11 src/java/multitool/factory/ParserGenFactory.java
  17. +10 −11 src/java/multitool/factory/PipeFactory.java
  18. +10 −11 src/java/multitool/factory/RejectFactory.java
  19. +10 −11 src/java/multitool/factory/ReplaceFactory.java
  20. +1 −1 src/java/multitool/factory/RetainFactory.java
  21. +10 −11 src/java/multitool/factory/SelectExpressionFactory.java
  22. +10 −11 src/java/multitool/factory/SelectFactory.java
  23. +10 −11 src/java/multitool/factory/SinkFactory.java
  24. +10 −11 src/java/multitool/factory/SourceFactory.java
  25. +10 −11 src/java/multitool/factory/SumFactory.java
  26. +10 −11 src/java/multitool/factory/TapFactory.java
  27. +10 −11 src/java/multitool/factory/UniqueFactory.java
  28. +10 −11 src/test/multitool/ParamsTest.java
View
@@ -1,30 +0,0 @@
-Binary License: GNU General Public License
-
- Copyright (c) 2007-2010 Concurrent, Inc. All Rights Reserved. (http://concurrentinc.com)
-
- Multitool is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Multitool is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Multitool. If not, see <http://www.gnu.org/licenses/>.
-
-Source License: Public Domain License
-
- This work has been released into the public domain
- by the copyright holder. This applies worldwide.
-
- In case this is not legally possible:
- The copyright holder grants any entity the right
- to use this work for any purpose, without any
- conditions, unless such conditions are required by law.
-
-Third-party Licenses:
-
- All third-party licenses are included in the 'lib' folder and subfolders.
View
202 apl.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
View
@@ -1,24 +1,23 @@
<?xml version="1.0"?>
<!--
- ~ Copyright (c) 2007-2011 Concurrent, Inc. All Rights Reserved.
+ ~ Copyright (c) 2007-2012 Concurrent, Inc. All Rights Reserved.
~
~ Project and contact information: http://www.cascading.org/
~
~ This file is part of the Cascading project.
~
- ~ Cascading is free software: you can redistribute it and/or modify
- ~ it under the terms of the GNU General Public License as published by
- ~ the Free Software Foundation, either version 3 of the License, or
- ~ (at your option) any later version.
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
~
- ~ Cascading is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ~ GNU General Public License for more details.
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
- ~ You should have received a copy of the GNU General Public License
- ~ along with Cascading. If not, see <http://www.gnu.org/licenses/>.
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
-->
<project name="multitool" default="retrieve" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -29,7 +28,7 @@
<property file="../build.properties"/>
<property file="./build.properties"/>
- <property name="src.license" location="${multitool.basedir}/LICENSE.txt"/>
+ <property name="src.license" location="${multitool.basedir}/apl.txt"/>
<property name="src.dir" location="${multitool.basedir}/src/java"/>
<property name="src.test" location="${multitool.basedir}/src/test"/>
@@ -89,8 +88,6 @@
</fileset>
</copy>
- <copy file="${src.license}" tofile="${build.classes}/MULTITOOL-LICENSE.txt"/>
-
</target>
<target name="compile-test">
@@ -188,7 +185,7 @@
</fileset>
</copy>
- <copy file="${src.license}" tofile="${dist}/LICENSE.txt"/>
+ <copy file="${src.license}" tofile="${dist}/"/>
<chmod perm="u+x">
<fileset dir="${dist}/bin">
@@ -20,11 +20,8 @@
package multitool;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.String;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -202,7 +199,7 @@ private static void printCascadingVersion()
String releaseMajor = versionProperties.getProperty( "cascading.release.major" );
String releaseMinor = versionProperties.getProperty( "cascading.release.minor", null );
- String releaseBuild = versionProperties.getProperty( "build.number", null );
+ String releaseBuild = versionProperties.getProperty( "cascading.build.number", null );
String releaseFull = null;
if( releaseMinor == null )
@@ -223,32 +220,7 @@ else if( releaseBuild == null )
private static void printLicense()
{
- try
- {
- InputStream stream = Main.class.getResourceAsStream( "/LICENSE.txt" );
- BufferedReader reader = new BufferedReader( new InputStreamReader( stream ) );
-
- System.out.print( "This release is licensed under the " );
-
- String line = reader.readLine();
-
- while( line != null )
- {
- if( line.matches( "^Binary License:.*$" ) )
- {
- System.out.println( line.substring( 15 ).trim() );
- break;
- }
-
- line = reader.readLine();
- }
-
- reader.close();
- }
- catch( IOException exception )
- {
- System.out.println( "Unspecified License" );
- }
+ System.out.print( "This release is licensed under the Apache Software License 2.0." );
}
private static void printFactoryUsage( Factory[] factories )
@@ -1,22 +1,21 @@
/*
- * Copyright (c) 2009-2011 Concurrent, Inc. All Rights Reserved.
+ * Copyright (c) 2007-2012 Concurrent, Inc. All Rights Reserved.
*
* Project and contact information: http://www.cascading.org/
*
* This file is part of the Cascading project.
*
- * Cascading is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Cascading is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with Cascading. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package multitool.factory;
Oops, something went wrong.

0 comments on commit 8e99049

Please sign in to comment.