You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/20 18:33:32 UTC
[incubator-netbeans] branch master updated: [NETBEANS-54] Module
Review lib.terminalemulator
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 87a646b [NETBEANS-54] Module Review lib.terminalemulator
87a646b is described below
commit 87a646b5cb3fa8be1b07ad09b9e4c2f2a8b02f0e
Author: Antonio Vieiro <vi...@users.noreply.github.com>
AuthorDate: Fri Oct 20 20:33:30 2017 +0200
[NETBEANS-54] Module Review lib.terminalemulator
- Added Apache license to different files.
- genfiles.properties, build-impl.xml and manifest.mf files to be handled centrally.
- No other licensing issues found.
---
lib.terminalemulator/ReleaseNotes.ivan.txt | 3 ++
lib.terminalemulator/doc-files/keyboard | 4 ++
lib.terminalemulator/doc-files/sequences | 4 ++
lib.terminalemulator/examples/README | 3 ++
.../examples/TermApp/release/nbterm | 53 ++++++---------------
.../examples/TermApp/release/nbterm64 | 54 ++++++----------------
.../examples/TermExample/make_filter.awk | 18 ++++++++
lib.terminalemulator/examples/buildtool/README | 18 ++++++++
lib.terminalemulator/examples/buildtool/buildtool | 18 ++++++++
.../lib.richexecution/maintainers.properties | 48 ++++++-------------
.../examples/lib.richexecution/process_start.cat | 16 +++++++
lib.terminalemulator/examples/telnet/README | 18 ++++++++
lib.terminalemulator/examples/telnet/telnet | 18 ++++++++
.../lib/terminalemulator/support/Bundle.properties | 49 ++++++--------------
14 files changed, 176 insertions(+), 148 deletions(-)
diff --git a/lib.terminalemulator/ReleaseNotes.ivan.txt b/lib.terminalemulator/ReleaseNotes.ivan.txt
index 68d7d35..ffb1f4c 100644
--- a/lib.terminalemulator/ReleaseNotes.ivan.txt
+++ b/lib.terminalemulator/ReleaseNotes.ivan.txt
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+
242273 PARTFIX Please support 256 Colors in Terminal
xterm-16color
@@ -2554,3 +2556,4 @@ tag: term_aug2001_ivan_1
Per NB folks' request.
You should be able to get rid of expandTabs() in
org/netbeans/core/output/OutputTabTerm.java.
+
diff --git a/lib.terminalemulator/doc-files/keyboard b/lib.terminalemulator/doc-files/keyboard
index b9fb4e3..d824380 100644
--- a/lib.terminalemulator/doc-files/keyboard
+++ b/lib.terminalemulator/doc-files/keyboard
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+
6 key editing group
-------------------
Insert Insert VK_INSERT \ESC[2~
@@ -93,3 +95,5 @@ Tab
Modifier parameters?
--------------------
Yup, it's real ...
+
+
diff --git a/lib.terminalemulator/doc-files/sequences b/lib.terminalemulator/doc-files/sequences
index 33648b8..24dbfb0 100644
--- a/lib.terminalemulator/doc-files/sequences
+++ b/lib.terminalemulator/doc-files/sequences
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+
infocmp
-C termcap Compatibility
-1 1 entry per line
@@ -340,3 +342,5 @@ ACS_STERLING '}' 234 '}' '}' ansi+protoansix
ACS_BULLET '~' 376 '~' '~' ansi+protoansix
----------------------------------------------------------------------------------------------------------------------------------------
sequence mnemonic termcap op terminfo numbers margin ansi dtterm xterm Term
+
+
diff --git a/lib.terminalemulator/examples/README b/lib.terminalemulator/examples/README
index c6feaa1..8b9396a 100644
--- a/lib.terminalemulator/examples/README
+++ b/lib.terminalemulator/examples/README
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+
"README"
Current examples
@@ -27,3 +29,4 @@ buildtool
telnet An old telnet application that depends on an external (not supplied)
Java telnet library.
+
diff --git a/lib.terminalemulator/examples/TermApp/release/nbterm b/lib.terminalemulator/examples/TermApp/release/nbterm
index 42d9ad7..7583fe6 100755
--- a/lib.terminalemulator/examples/TermApp/release/nbterm
+++ b/lib.terminalemulator/examples/TermApp/release/nbterm
@@ -1,47 +1,22 @@
#!/bin/bash
# nterm -- A simple Java based ANSI terminal emulator
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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-2006 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.
+# 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.
if [ -h $0 ]
diff --git a/lib.terminalemulator/examples/TermApp/release/nbterm64 b/lib.terminalemulator/examples/TermApp/release/nbterm64
index 5363bf4..96e6d58 100644
--- a/lib.terminalemulator/examples/TermApp/release/nbterm64
+++ b/lib.terminalemulator/examples/TermApp/release/nbterm64
@@ -1,48 +1,22 @@
#!/bin/bash
# nterm -- A simple Java based ANSI terminal emulator
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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-2006 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.
-
+# 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.
if [ -h $0 ]
then
diff --git a/lib.terminalemulator/examples/TermExample/make_filter.awk b/lib.terminalemulator/examples/TermExample/make_filter.awk
index 5597a0f..c75bcf6 100644
--- a/lib.terminalemulator/examples/TermExample/make_filter.awk
+++ b/lib.terminalemulator/examples/TermExample/make_filter.awk
@@ -1,6 +1,24 @@
# "make_filter.awk"
# Convert errors and warnings to Term hyperlinks
+# 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
+#
+# 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.
+
+
/^.*:[[:digit:]]+: warning: / {
printf "]10;WARNING;"
printf $0
diff --git a/lib.terminalemulator/examples/buildtool/README b/lib.terminalemulator/examples/buildtool/README
index 88f8d91..2f90981 100644
--- a/lib.terminalemulator/examples/buildtool/README
+++ b/lib.terminalemulator/examples/buildtool/README
@@ -1,3 +1,21 @@
+# 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
+#
+# 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.
+
+
A simple build tool application
===============================
diff --git a/lib.terminalemulator/examples/buildtool/buildtool b/lib.terminalemulator/examples/buildtool/buildtool
index cf234f9..20a5bf4 100644
--- a/lib.terminalemulator/examples/buildtool/buildtool
+++ b/lib.terminalemulator/examples/buildtool/buildtool
@@ -1,3 +1,21 @@
#!/bin/ksh
+
+# 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
+#
+# 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.
+
TERM=../../build/classes
java -classpath "classes:$TERM" BuildTool $*
diff --git a/lib.terminalemulator/examples/lib.richexecution/maintainers.properties b/lib.terminalemulator/examples/lib.richexecution/maintainers.properties
index 70f180c..4f2b6fb 100644
--- a/lib.terminalemulator/examples/lib.richexecution/maintainers.properties
+++ b/lib.terminalemulator/examples/lib.richexecution/maintainers.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
+# 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.
#
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
# "maintainers.properties" -- Define the maintainers property
# Builds work differently for maintainers of this project.
diff --git a/lib.terminalemulator/examples/lib.richexecution/process_start.cat b/lib.terminalemulator/examples/lib.richexecution/process_start.cat
index 8485725..9b72587 100644
--- a/lib.terminalemulator/examples/lib.richexecution/process_start.cat
+++ b/lib.terminalemulator/examples/lib.richexecution/process_start.cat
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
process_start(1) process_start(1)
@@ -54,3 +56,17 @@ DESCRIPTION
which is inherited by children processes.
process_start.sh cannot do this.
+
+LICENSE
+
+ 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.
+
diff --git a/lib.terminalemulator/examples/telnet/README b/lib.terminalemulator/examples/telnet/README
index 4ec5a29..5009a3e 100644
--- a/lib.terminalemulator/examples/telnet/README
+++ b/lib.terminalemulator/examples/telnet/README
@@ -1,3 +1,21 @@
+# 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
+#
+# 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.
+
+
A simple telnet application
===========================
diff --git a/lib.terminalemulator/examples/telnet/telnet b/lib.terminalemulator/examples/telnet/telnet
index 7985c5f..7607418 100644
--- a/lib.terminalemulator/examples/telnet/telnet
+++ b/lib.terminalemulator/examples/telnet/telnet
@@ -1,3 +1,21 @@
#!/bin/ksh
+
+# 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
+#
+# 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.
+
TERM=../../build/classes
java -classpath "classes:$TERM" TelnetApp $*
diff --git a/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties b/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties
index 4933464..dbdb8c2 100644
--- a/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties
+++ b/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# 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.
#
# FindBar
#
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].