From a0dd7e7490bf8e68f767495e310caf2dfb2a77e6 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 22 Jul 2011 20:03:36 +0000 Subject: [PATCH] Changed license headers to reference Cloudera instead of the ASF. Adds NOTICE.txt file From: Aaron Kimball git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149868 13f79535-47bb-0310-9956-ffa450edef68 --- .gitignore | 14 +++++++ LICENSE.txt | 42 ------------------- NOTICE.txt | 3 ++ build.xml | 4 +- conf/sqoop-default.xml | 4 +- ivy.xml | 4 +- ivy/ivysettings.xml | 4 +- ivy/libraries.properties | 4 +- src/docs/.gitignore | 4 +- src/docs/Makefile | 4 +- src/docs/Sqoop-manpage.txt | 4 +- src/docs/SqoopUserGuide.txt | 4 +- src/docs/api-reference.txt | 4 +- src/docs/classnames.txt | 4 +- src/docs/connecting.txt | 4 +- src/docs/controlling-input-format.txt | 4 +- src/docs/controlling-output-format.txt | 4 +- src/docs/direct.txt | 4 +- src/docs/export.txt | 4 +- src/docs/full-db-import.txt | 4 +- src/docs/hive.txt | 4 +- src/docs/input-formatting-args.txt | 4 +- src/docs/input-formatting.txt | 4 +- src/docs/intro.txt | 4 +- src/docs/listing-dbs.txt | 4 +- src/docs/listing-tables.txt | 4 +- src/docs/misc-args.txt | 4 +- src/docs/output-formatting-args.txt | 4 +- src/docs/output-formatting.txt | 4 +- src/docs/supported-dbs.txt | 4 +- src/docs/table-import.txt | 4 +- .../org/apache/hadoop/sqoop/ConnFactory.java | 4 +- src/java/org/apache/hadoop/sqoop/Sqoop.java | 4 +- .../org/apache/hadoop/sqoop/SqoopOptions.java | 4 +- .../apache/hadoop/sqoop/hive/HiveImport.java | 4 +- .../apache/hadoop/sqoop/hive/HiveTypes.java | 4 +- .../hadoop/sqoop/hive/TableDefWriter.java | 4 +- .../hadoop/sqoop/io/CountingOutputStream.java | 4 +- .../sqoop/io/HdfsSplitOutputStream.java | 4 +- .../sqoop/io/SplittableBufferedWriter.java | 4 +- .../sqoop/io/SplittingOutputStream.java | 4 +- .../sqoop/lib/BigDecimalSerializer.java | 4 +- .../org/apache/hadoop/sqoop/lib/BlobRef.java | 4 +- .../org/apache/hadoop/sqoop/lib/ClobRef.java | 4 +- .../hadoop/sqoop/lib/FieldFormatter.java | 4 +- .../hadoop/sqoop/lib/JdbcWritableBridge.java | 4 +- .../hadoop/sqoop/lib/LargeObjectLoader.java | 4 +- .../hadoop/sqoop/lib/LobSerializer.java | 4 +- .../apache/hadoop/sqoop/lib/RecordParser.java | 4 +- .../apache/hadoop/sqoop/lib/SqoopRecord.java | 4 +- .../hadoop/sqoop/manager/ConnManager.java | 4 +- .../sqoop/manager/DefaultManagerFactory.java | 4 +- .../sqoop/manager/DirectMySQLManager.java | 4 +- .../manager/DirectPostgresqlManager.java | 4 +- .../sqoop/manager/ExportJobContext.java | 4 +- .../sqoop/manager/GenericJdbcManager.java | 4 +- .../hadoop/sqoop/manager/HsqldbManager.java | 4 +- .../sqoop/manager/ImportJobContext.java | 4 +- .../hadoop/sqoop/manager/ManagerFactory.java | 4 +- .../hadoop/sqoop/manager/MySQLManager.java | 4 +- .../hadoop/sqoop/manager/OracleManager.java | 4 +- .../sqoop/manager/PostgresqlManager.java | 4 +- .../hadoop/sqoop/manager/SqlManager.java | 4 +- .../sqoop/mapreduce/AutoProgressMapper.java | 4 +- .../sqoop/mapreduce/DataDrivenImportJob.java | 4 +- .../hadoop/sqoop/mapreduce/ExportJob.java | 4 +- .../hadoop/sqoop/mapreduce/ImportJobBase.java | 4 +- .../sqoop/mapreduce/MySQLDumpImportJob.java | 4 +- .../sqoop/mapreduce/MySQLDumpInputFormat.java | 4 +- .../sqoop/mapreduce/MySQLDumpMapper.java | 4 +- .../mapreduce/RawKeyTextOutputFormat.java | 4 +- .../mapreduce/SequenceFileExportMapper.java | 4 +- .../mapreduce/SequenceFileImportMapper.java | 4 +- .../sqoop/mapreduce/TextExportMapper.java | 4 +- .../sqoop/mapreduce/TextImportMapper.java | 4 +- .../apache/hadoop/sqoop/orm/ClassWriter.java | 4 +- .../hadoop/sqoop/orm/CompilationManager.java | 4 +- .../hadoop/sqoop/orm/TableClassName.java | 4 +- .../apache/hadoop/sqoop/util/AsyncSink.java | 4 +- .../hadoop/sqoop/util/ClassLoaderStack.java | 4 +- .../hadoop/sqoop/util/DirectImportUtils.java | 4 +- .../hadoop/sqoop/util/ErrorableAsyncSink.java | 4 +- .../hadoop/sqoop/util/ErrorableThread.java | 4 +- .../apache/hadoop/sqoop/util/Executor.java | 4 +- .../hadoop/sqoop/util/ExportException.java | 4 +- .../apache/hadoop/sqoop/util/FileListing.java | 4 +- .../hadoop/sqoop/util/ImportException.java | 4 +- .../org/apache/hadoop/sqoop/util/JdbcUrl.java | 4 +- .../hadoop/sqoop/util/LoggingAsyncSink.java | 4 +- .../hadoop/sqoop/util/NullAsyncSink.java | 4 +- .../hadoop/sqoop/util/PerfCounters.java | 4 +- .../hadoop/sqoop/util/ResultSetPrinter.java | 4 +- .../org/apache/hadoop/sqoop/AllTests.java | 4 +- .../org/apache/hadoop/sqoop/SmokeTests.java | 4 +- .../apache/hadoop/sqoop/TestAllTables.java | 4 +- .../apache/hadoop/sqoop/TestColumnTypes.java | 4 +- .../apache/hadoop/sqoop/TestConnFactory.java | 4 +- .../org/apache/hadoop/sqoop/TestExport.java | 4 +- .../apache/hadoop/sqoop/TestMultiCols.java | 4 +- .../apache/hadoop/sqoop/TestMultiMaps.java | 4 +- .../org/apache/hadoop/sqoop/TestSplitBy.java | 4 +- .../apache/hadoop/sqoop/TestSqoopOptions.java | 4 +- .../org/apache/hadoop/sqoop/TestWhere.java | 4 +- .../apache/hadoop/sqoop/ThirdPartyTests.java | 4 +- .../hadoop/sqoop/hive/TestHiveImport.java | 4 +- .../hadoop/sqoop/hive/TestTableDefWriter.java | 4 +- .../io/TestSplittableBufferedWriter.java | 4 +- .../apache/hadoop/sqoop/lib/TestBlobRef.java | 4 +- .../apache/hadoop/sqoop/lib/TestClobRef.java | 4 +- .../hadoop/sqoop/lib/TestFieldFormatter.java | 4 +- .../sqoop/lib/TestLargeObjectLoader.java | 4 +- .../hadoop/sqoop/lib/TestRecordParser.java | 4 +- .../hadoop/sqoop/manager/DirectMySQLTest.java | 4 +- .../hadoop/sqoop/manager/MySQLAuthTest.java | 4 +- .../hadoop/sqoop/manager/MySQLCompatTest.java | 4 +- .../hadoop/sqoop/manager/MySQLUtils.java | 4 +- .../sqoop/manager/OracleCompatTest.java | 4 +- .../sqoop/manager/OracleManagerTest.java | 4 +- .../hadoop/sqoop/manager/OracleUtils.java | 4 +- .../hadoop/sqoop/manager/PostgresqlTest.java | 4 +- .../sqoop/manager/TestHsqldbManager.java | 4 +- .../hadoop/sqoop/manager/TestSqlManager.java | 4 +- .../sqoop/mapreduce/MapreduceTests.java | 4 +- .../hadoop/sqoop/mapreduce/TestImportJob.java | 4 +- .../sqoop/mapreduce/TestTextImportMapper.java | 4 +- .../hadoop/sqoop/orm/TestClassWriter.java | 4 +- .../hadoop/sqoop/orm/TestParseMethods.java | 4 +- .../sqoop/testutil/BaseSqoopTestCase.java | 4 +- .../hadoop/sqoop/testutil/CommonArgs.java | 4 +- .../apache/hadoop/sqoop/testutil/DirUtil.java | 4 +- .../sqoop/testutil/ExportJobTestCase.java | 4 +- .../sqoop/testutil/HsqldbTestServer.java | 4 +- .../sqoop/testutil/ImportJobTestCase.java | 4 +- .../sqoop/testutil/InjectableConnManager.java | 4 +- .../testutil/InjectableManagerFactory.java | 4 +- .../sqoop/testutil/ManagerCompatTestCase.java | 4 +- .../hadoop/sqoop/testutil/MockResultSet.java | 4 +- .../hadoop/sqoop/testutil/ReparseMapper.java | 4 +- .../hadoop/sqoop/testutil/SeqFileReader.java | 4 +- testdata/hive/bin/hive | 4 +- 140 files changed, 291 insertions(+), 316 deletions(-) create mode 100644 NOTICE.txt diff --git a/.gitignore b/.gitignore index f11dbc29..620997a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,17 @@ +# Licensed to Cloudera, Inc. under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# Cloudera, Inc. licenses this file to You 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. /build *~ .classpath diff --git a/LICENSE.txt b/LICENSE.txt index 59bcdbc9..d6456956 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -200,45 +200,3 @@ 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. - - -APACHE HADOOP SUBCOMPONENTS: - -The Apache Hadoop project contains subcomponents with separate copyright -notices and license terms. Your use of the source code for the these -subcomponents is subject to the terms and conditions of the following -licenses. - -For the org.apache.hadoop.util.bloom.* classes: - -/** - * - * Copyright (c) 2005, European Commission project OneLab under contract - * 034819 (http://www.one-lab.org) - * All rights reserved. - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - Neither the name of the University Catholique de Louvain - UCL - * nor the names of its contributors may be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 00000000..df69c43d --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,3 @@ +This product includes software developed by Cloudera, Inc. +(http://www.cloudera.com/). + diff --git a/build.xml b/build.xml index f85f657b..7ed8050d 100644 --- a/build.xml +++ b/build.xml @@ -1,10 +1,10 @@