Repository: incubator-netbeans Updated Branches: refs/heads/master 9a152a75f -> bd9aece9f
[NETBEANS-54] Module Review db.mysql - no external library - checked Rat report; unrecognized license headers manually changed, ignored manifest.mf and *.form (see central problems) - skimmed through the module, did not notice additional problems Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/01991399 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/01991399 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/01991399 Branch: refs/heads/master Commit: 0199139931801366af250027f54cdda209ae106d Parents: 64a43c0 Author: Matthias Bläsing <[email protected]> Authored: Fri Sep 29 21:14:59 2017 +0200 Committer: Emilian Bold <[email protected]> Committed: Tue Oct 3 15:10:27 2017 +0300 ---------------------------------------------------------------------- .../db/mysql/resources/create-sample.sql | 57 ++++++-------------- .../db/mysql/resources/create-travel.sql | 56 ++++++------------- .../modules/db/mysql/resources/create-vir.sql | 56 ++++++------------- 3 files changed, 46 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/01991399/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql ---------------------------------------------------------------------- diff --git a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql index ddf7cda..e78b2c0 100644 --- a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql +++ b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql @@ -1,45 +1,20 @@ - --- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - --- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF 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 -- --- Oracle and Java are registered trademarks of Oracle and/or its affiliates. --- Other names may be trademarks of their respective owners. - --- The contents of this file are subject to the terms of either the GNU --- General Public License Version 2 only ("GPL") or the Common --- Development and Distribution License("CDDL") (collectively, the --- "License"). You may not use this file except in compliance with the --- License. You can obtain a copy of the License at --- http://www.netbeans.org/cddl-gplv2.html --- or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the --- specific language governing permissions and limitations under the --- License. When distributing the software, include this License Header --- Notice in each file and include the License file at --- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this --- particular file as subject to the "Classpath" exception as provided --- by Oracle in the GPL Version 2 section of the License file that --- accompanied this code. If applicable, add the following below the --- License Header, with the fields enclosed by brackets [] replaced by --- your own identifying information: --- "Portions Copyrighted [year] [name of copyright owner]" - --- Contributor(s): - --- The Original Software is NetBeans. The Initial Developer of the Original --- Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun --- Microsystems, Inc. All Rights Reserved. - --- If you wish your version of this file to be governed by only the CDDL --- or only the GPL Version 2, indicate your decision by adding --- "[Contributor] elects to include this software in this distribution --- under the [CDDL or GPL Version 2] license." If you do not indicate a --- single choice of license, a recipient has the option to distribute --- your version of this file under either the CDDL, the GPL Version 2 or --- to extend the choice of license to its licensees as provided above. --- However, if you add GPL Version 2 code and therefore, elected the GPL --- Version 2 license, then the option applies only if the new code is --- made subject to such option by the copyright holder. +-- 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. + CREATE TABLE customer ( customer_id INTEGER PRIMARY KEY NOT NULL, discount_code CHARACTER(1) NOT NULL, http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/01991399/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql ---------------------------------------------------------------------- diff --git a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql index f0663cf..2eaf303 100644 --- a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql +++ b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql @@ -1,45 +1,19 @@ - --- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - --- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF 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 -- --- Oracle and Java are registered trademarks of Oracle and/or its affiliates. --- Other names may be trademarks of their respective owners. - --- The contents of this file are subject to the terms of either the GNU --- General Public License Version 2 only ("GPL") or the Common --- Development and Distribution License("CDDL") (collectively, the --- "License"). You may not use this file except in compliance with the --- License. You can obtain a copy of the License at --- http://www.netbeans.org/cddl-gplv2.html --- or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the --- specific language governing permissions and limitations under the --- License. When distributing the software, include this License Header --- Notice in each file and include the License file at --- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this --- particular file as subject to the "Classpath" exception as provided --- by Oracle in the GPL Version 2 section of the License file that --- accompanied this code. If applicable, add the following below the --- License Header, with the fields enclosed by brackets [] replaced by --- your own identifying information: --- "Portions Copyrighted [year] [name of copyright owner]" - --- Contributor(s): - --- The Original Software is NetBeans. The Initial Developer of the Original --- Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun --- Microsystems, Inc. All Rights Reserved. - --- If you wish your version of this file to be governed by only the CDDL --- or only the GPL Version 2, indicate your decision by adding --- "[Contributor] elects to include this software in this distribution --- under the [CDDL or GPL Version 2] license." If you do not indicate a --- single choice of license, a recipient has the option to distribute --- your version of this file under either the CDDL, the GPL Version 2 or --- to extend the choice of license to its licensees as provided above. --- However, if you add GPL Version 2 code and therefore, elected the GPL --- Version 2 license, then the option applies only if the new code is --- made subject to such option by the copyright holder. +-- 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. create table travel.triptype ( triptypeid INTEGER NOT NULL, http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/01991399/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql ---------------------------------------------------------------------- diff --git a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql index 343b8f8..f5bd1ca 100644 --- a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql +++ b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql @@ -1,45 +1,19 @@ - --- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - --- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF 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 -- --- Oracle and Java are registered trademarks of Oracle and/or its affiliates. --- Other names may be trademarks of their respective owners. - --- The contents of this file are subject to the terms of either the GNU --- General Public License Version 2 only ("GPL") or the Common --- Development and Distribution License("CDDL") (collectively, the --- "License"). You may not use this file except in compliance with the --- License. You can obtain a copy of the License at --- http://www.netbeans.org/cddl-gplv2.html --- or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the --- specific language governing permissions and limitations under the --- License. When distributing the software, include this License Header --- Notice in each file and include the License file at --- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this --- particular file as subject to the "Classpath" exception as provided --- by Oracle in the GPL Version 2 section of the License file that --- accompanied this code. If applicable, add the following below the --- License Header, with the fields enclosed by brackets [] replaced by --- your own identifying information: --- "Portions Copyrighted [year] [name of copyright owner]" - --- Contributor(s): - --- The Original Software is NetBeans. The Initial Developer of the Original --- Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun --- Microsystems, Inc. All Rights Reserved. - --- If you wish your version of this file to be governed by only the CDDL --- or only the GPL Version 2, indicate your decision by adding --- "[Contributor] elects to include this software in this distribution --- under the [CDDL or GPL Version 2] license." If you do not indicate a --- single choice of license, a recipient has the option to distribute --- your version of this file under either the CDDL, the GPL Version 2 or --- to extend the choice of license to its licensees as provided above. --- However, if you add GPL Version 2 code and therefore, elected the GPL --- Version 2 license, then the option applies only if the new code is --- made subject to such option by the copyright holder. +-- 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. -- Create validation table CREATE TABLE vir.validation (
