Skip to content

Commit

Permalink
TEIID-4906 updating licensing and copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
shawkins committed May 12, 2017
1 parent fb18e92 commit 985b0fb
Show file tree
Hide file tree
Showing 50 changed files with 1,056 additions and 1,413 deletions.
5 changes: 3 additions & 2 deletions COPYRIGHT.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Portions Copyright (C) 2008-2015 Red Hat, Inc.
Portions Copyright (C) 2000-2007 MetaMatrix, Inc.
Portions Copyright (c) 2000, 2003, 2008 IBM Corporation and others.
Portions Copyright (c) 1997-2000 Sun Microsystems, Inc.
Portions Copyright (C) 2001 Vivid Solutions
Portions Copyright (C) 2001 Vivid Solutions
Portions Copyright (c) 2003-2011, PostgreSQL Global Development Group
Portions Copyright (C) 2000 Saxonica Limited and others
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,13 @@ Enter the following:

you can find the deployment artifacts in the "teiid/build/target" directory once the build is completed.

Licenses
-------

The default license for all submodules is the [Less GNU Public License (LGPL) v2.1][1]

Where applicable individual submodules will provide additional copyright and license information.

[1]: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html


3 changes: 3 additions & 0 deletions client/COPYRIGHT.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Portions Copyright (C) 2008-2017 Red Hat, Inc.
Portions Copyright (C) 2000-2007 MetaMatrix, Inc.
Portions Copyright (c) 2008, PostgreSQL Global Development Group
26 changes: 26 additions & 0 deletions client/PostgreSQL-BSD.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright (c) 1997-2010, PostgreSQL Global Development Group
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. 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.
3. Neither the name of the PostgreSQL Global Development Group 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.
12 changes: 12 additions & 0 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
<groupId>org.jboss.teiid</groupId>
<version>9.3.0.Beta3-SNAPSHOT</version>
</parent>
<licenses>
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl.html</url>
<comments>A business-friendly OSS license</comments>
</license>
<license>
<name>BSD-3-Clause</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution>
</license>
</licenses>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
<name>Client</name>
Expand Down
4 changes: 0 additions & 4 deletions common-core/src/main/java/org/teiid/core/util/SqlUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
* Utilities for dealing with SQL strings.
*/
public class SqlUtil {
public static final char CR_CHAR = StringUtil.Constants.CARRIAGE_RETURN_CHAR;
public static final char NL_CHAR = StringUtil.Constants.NEW_LINE_CHAR;
public static final char SPACE_CHAR = StringUtil.Constants.SPACE_CHAR;
public static final char TAB_CHAR = StringUtil.Constants.TAB_CHAR;
private static TreeSet<String> updateKeywords = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
static {
updateKeywords.add("insert"); //$NON-NLS-1$
Expand Down
Loading

0 comments on commit 985b0fb

Please sign in to comment.