You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by GitBox <gi...@apache.org> on 2017/11/12 20:54:10 UTC
[GitHub] matthiasblaesing closed pull request #272: [NETBEANS-54] Further license cleanup
matthiasblaesing closed pull request #272: [NETBEANS-54] Further license cleanup
URL: https://github.com/apache/incubator-netbeans/pull/272
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html b/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html
index 36d74b74b..7f152d47c 100644
--- a/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html
+++ b/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html
@@ -19,47 +19,6 @@
-->
<!DOCTYPE html>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
-
-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):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
--->
<html>
<head>
<title>TODO supply a title</title>
diff --git a/beans/src/org/netbeans/modules/beans/resources/beansSetting.gif b/beans/src/org/netbeans/modules/beans/resources/beansSetting.gif
deleted file mode 100644
index b09c4afe5..000000000
Binary files a/beans/src/org/netbeans/modules/beans/resources/beansSetting.gif and /dev/null differ
diff --git a/gsf.testrunner.ui/src/META-INF/netbeans/translate.names b/gsf.testrunner.ui/src/META-INF/netbeans/translate.names
index 1a8b11322..0308f66da 100644
--- a/gsf.testrunner.ui/src/META-INF/netbeans/translate.names
+++ b/gsf.testrunner.ui/src/META-INF/netbeans/translate.names
@@ -1,39 +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) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# 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.
+# 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.
+
# Contributor(s):
# Changed filename of actions
Actions/UnitTests/org-netbeans-modules-gsf-testrunner-TestCreatorAction.instance=Actions/UnitTests/org-netbeans-modules-gsf-testrunner-ui-TestCreatorAction.instance
diff --git a/gsf.testrunner/src/META-INF/netbeans/translate.names b/gsf.testrunner/src/META-INF/netbeans/translate.names
index 8a4d6cee6..f0cb86c4d 100644
--- a/gsf.testrunner/src/META-INF/netbeans/translate.names
+++ b/gsf.testrunner/src/META-INF/netbeans/translate.names
@@ -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.
-#
-# 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.
+
# Changed filename of actions
Actions/JUnitTests/org-netbeans-modules-junit-CreateTestAction.instance=Actions/UnitTests/org-netbeans-modules-gsf-testrunner-TestCreatorAction.instance
Actions/JUnitTests/org-netbeans-modules-junit-actions-RunTestMethodAction.instance=Actions/CommonTestRunner/org-netbeans-modules-gsf-testrunner-TestMethodRunnerAction.instance
diff --git a/html/src/org/netbeans/modules/html/templates/html.html b/html/src/org/netbeans/modules/html/templates/html.html
index 31d550dc0..3be05ddd4 100644
--- a/html/src/org/netbeans/modules/html/templates/html.html
+++ b/html/src/org/netbeans/modules/html/templates/html.html
@@ -1,41 +1,22 @@
<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2016 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.
+ http://www.apache.org/licenses/LICENSE-2.0
-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]"
+ 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 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):
-->
${doctype}
<#assign licenseFirst = "<!--">
diff --git a/html/src/org/netbeans/modules/html/templates/xhtml.xhtml b/html/src/org/netbeans/modules/html/templates/xhtml.xhtml
index a3d6bab8f..430b344e4 100644
--- a/html/src/org/netbeans/modules/html/templates/xhtml.xhtml
+++ b/html/src/org/netbeans/modules/html/templates/xhtml.xhtml
@@ -1,42 +1,23 @@
<?xml version="1.0" encoding="${encoding}"?>
<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2016 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.
+ http://www.apache.org/licenses/LICENSE-2.0
-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]"
+ 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 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):
-->
<#assign licenseFirst = "<!--">
<#assign licensePrefix = "">
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
index 6f6c60da6..b283ee14f 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
@@ -49,9 +49,6 @@ derby/release/modules/ext/derbysampledb.zip
# Not distributed with product, only used during build:
nbbuild/external/apitest*.jar
-# Developed under CDDL inside nb.org (later snapshot moved to dev.java.net):
-apisupport.paintapp/PaintApp-suite/ColorChooser/release/modules/ext/ColorChooser.jar
-
# Build by NetBeans team
mobility.databindingme/lib/*
diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties
index a04b1907a..48479befb 100644
--- a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties
+++ b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties
@@ -1,19 +1,19 @@
-# The contents of this file are subject to the terms of the Common Development
-# and Distribution License (the License). You may not use this file except in
-# compliance with the License.
+# 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
#
-# You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-# or http://www.netbeans.org/cddl.txt.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# When distributing Covered Code, include this CDDL Header Notice in each file
-# and include the License file at http://www.netbeans.org/cddl.txt.
-# If applicable, add the following below the CDDL Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# 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.
+# 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.
# VERSIONING (TopLogging, MainWindow)
# {0} - build number
diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties
index 7a5928918..f8d66637c 100644
--- a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties
+++ b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties
@@ -1,19 +1,19 @@
-# The contents of this file are subject to the terms of the Common Development
-# and Distribution License (the License). You may not use this file except in
-# compliance with the License.
+# 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
#
-# You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-# or http://www.netbeans.org/cddl.txt.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# When distributing Covered Code, include this CDDL Header Notice in each file
-# and include the License file at http://www.netbeans.org/cddl.txt.
-# If applicable, add the following below the CDDL Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# 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.
+# 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.
# VERSIONING (TopLogging, MainWindow)
# {0} - build number
diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass
index baf97ce82..a2f8a3e43 100644
--- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass
+++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass
@@ -34,46 +34,23 @@ public class Reference {
}
}
==>StatRef
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * 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.
+/**
+ * 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
*
- * Contributor(s):
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *** Portions Copyrighted 2008 Sun Microsystems, Inc.
+ * 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 moveSource;
diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass
index 6f4ab0d12..b5a5fa803 100644
--- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass
+++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass
@@ -32,46 +32,23 @@ public class Renamed {
}
Created file:
==>Renamed.java
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * 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.
+/**
+ * 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
*
- * Contributor(s):
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ * 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 renameClass;
diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass
index fd04b1771..7b3e8f0c4 100644
--- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass
+++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass
@@ -36,46 +36,23 @@ public class RenamedCtor {
}
Created file:
==>RenamedCtor.java
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * 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.
+/**
+ * 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
*
- * Contributor(s):
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Portions Copyrighted 2008 Sun Microsystems, Inc.
+ * 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 renameClass;
diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass
index b1ed9b72d..c0599eb19 100644
--- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass
+++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass
@@ -32,46 +32,23 @@ Created directory:
/renamedPkg
Created file:
==>RenamePkg.java
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * 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.
+/**
+ * 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
*
- * Contributor(s):
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ * 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 renamedPkg;
diff --git a/schema2beans/test/unit/data/TestGroupUnbounded.java b/schema2beans/test/unit/data/TestGroupUnbounded.java
index 1cb1d2089..e2bf10536 100644
--- a/schema2beans/test/unit/data/TestGroupUnbounded.java
+++ b/schema2beans/test/unit/data/TestGroupUnbounded.java
@@ -1,42 +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 1997-2009 Sun Microsystems, Inc. All rights reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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
- * Code is Sun Microsystems, Inc. PGroupUnboundedtions 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.
*/
import java.io.*;
diff --git a/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties b/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties
index ac7c03956..fcbf5d9df 100644
--- a/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties
+++ b/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.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) 2006, 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.
+
## ImportStep.java
BK2014=Repository Folder must be specified
diff --git a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml
index 450ba66c1..36bfc2bf3 100644
--- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml
+++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<!DOCTYPE codetemplates PUBLIC "-//NetBeans//DTD Editor Code Templates settings 1.0//EN" "http://www.netbeans.org/dtds/EditorCodeTemplates-1_0.dtd">
<codetemplates>
<codetemplate abbreviation="jaxbm" xml:space="preserve">
diff --git a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties
index aa8077f47..259d5a89a 100644
--- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties
+++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.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) 2007, 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.
+
# Labels
LBL_JAXBWizTitle=Configure XML Binding
LBL_XSDFileLoc=XSD File Location\:
diff --git a/xml.jaxb/test/unit/src/data/BuildFile1.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile1.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/BuildFile1.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile1.xml
diff --git a/xml.jaxb/test/unit/src/data/BuildFile2.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile2.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/BuildFile2.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile2.xml
diff --git a/xml.jaxb/test/unit/src/data/BuildFile3.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile3.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/BuildFile3.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile3.xml
diff --git a/xml.jaxb/test/unit/src/data/BuildFileEmptyCatalog.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFileEmptyCatalog.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/BuildFileEmptyCatalog.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFileEmptyCatalog.xml
diff --git a/xml.jaxb/test/unit/src/data/ConfigFile1.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile1.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/ConfigFile1.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile1.xml
diff --git a/xml.jaxb/test/unit/src/data/ConfigFile2.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile2.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/ConfigFile2.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile2.xml
diff --git a/xml.jaxb/test/unit/src/data/ConfigFile3.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile3.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/ConfigFile3.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile3.xml
diff --git a/xml.jaxb/test/unit/src/data/ConfigFileEmptyCatalog.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFileEmptyCatalog.xml
similarity index 100%
rename from xml.jaxb/test/unit/src/data/ConfigFileEmptyCatalog.xml
rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFileEmptyCatalog.xml
diff --git a/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java b/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java
index 991bd02b4..bfacec5a3 100644
--- a/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java
+++ b/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java
@@ -22,6 +22,7 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -45,16 +46,14 @@
* @author gmpatil
*/
public class XSLTest extends NbTestCase {
- private static final String CONFIG_FILE1 = "/data/ConfigFile1.xml"; //NOI18N
- private static final String CONFIG_FILE2 = "/data/ConfigFile2.xml"; //NOI18N
- private static final String CONFIG_FILE3 = "/data/ConfigFile3.xml"; //NOI18N
- private static final String CONFIG_EMPTY_CAT =
- "/data/ConfigFileEmptyCatalog.xml"; //NOI18N
- private static final String BUILD_FILE1 = "/data/BuildFile1.xml"; //NOI18N
- private static final String BUILD_FILE2 = "/data/BuildFile2.xml"; //NOI18N
- private static final String BUILD_FILE3 = "/data/BuildFile3.xml"; //NOI18N
- private static final String BUILD_EMPTY_CAT =
- "/data/BuildFileEmptyCatalog.xml"; //NOI18N
+ private static final String CONFIG_FILE1 = "ConfigFile1.xml"; //NOI18N
+ private static final String CONFIG_FILE2 = "ConfigFile2.xml"; //NOI18N
+ private static final String CONFIG_FILE3 = "ConfigFile3.xml"; //NOI18N
+ private static final String CONFIG_EMPTY_CAT = "ConfigFileEmptyCatalog.xml"; //NOI18N
+ private static final String BUILD_FILE1 = "BuildFile1.xml"; //NOI18N
+ private static final String BUILD_FILE2 = "BuildFile2.xml"; //NOI18N
+ private static final String BUILD_FILE3 = "BuildFile3.xml"; //NOI18N
+ private static final String BUILD_EMPTY_CAT = "BuildFileEmptyCatalog.xml"; //NOI18N
private static final String XSL_FILE =
"/org/netbeans/modules/xml/jaxb/resources/JAXBBuild.xsl"; //NOI18N
@@ -70,10 +69,15 @@ public void setUp() throws Exception {
public void tearDown() throws Exception {
}
- private InputStream getInputStream(String filePath){
+ private InputStream getFromClasspath(String filePath){
return this.getClass().getResourceAsStream(filePath);
}
+ private InputStream getDatafile(String filename) throws FileNotFoundException{
+ String dataFilename = "/org/netbeans/modules/xml/jaxb/util/" + filename;
+ return new FileInputStream(new File(getDataDir(), dataFilename));
+ }
+
private String getString(InputStream stream) throws IOException{
BufferedReader br = new BufferedReader(new InputStreamReader(stream));
StringBuffer sb = new StringBuffer();
@@ -100,8 +104,8 @@ private void compareStream(InputStream file1, InputStream file2) throws IOExcept
private void transformConfig2Build(String configFile, String buildFile){
try {
- Source xmlSource = new StreamSource(getInputStream(configFile));
- Source xslSource = new StreamSource(getInputStream(XSL_FILE));
+ Source xmlSource = new StreamSource(getDatafile(configFile));
+ Source xslSource = new StreamSource(getFromClasspath(XSL_FILE));
File tmpFile = java.io.File.createTempFile(TEMP_BUILD_FILE, ".xml");
//System.out.println("tmpFile:" + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();
@@ -115,7 +119,7 @@ private void transformConfig2Build(String configFile, String buildFile){
xformer.transform(xmlSource, result);
// Compare.
fos.close();
- compareStream(getInputStream(buildFile), new FileInputStream(tmpFile));
+ compareStream(getDatafile(buildFile), new FileInputStream(tmpFile));
} catch (TransformerConfigurationException ex) {
Logger.getLogger("global").log(Level.SEVERE, null, ex);
fail("TransformerConfigurationException");
diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass
index 7a35d3f63..e454392aa 100644
--- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass
+++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass
@@ -45,22 +45,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (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.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-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.
+
+ 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.
+
-->
<!-- Created by pk97937 on June 21, 2001, 4:23 PM -->
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj
index fa7f72b80..664d995ed 100644
--- a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj
@@ -61,44 +61,23 @@ options {
PARSER_BEGIN(DTDSyntax)
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997, 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * 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]"
+/**
+ * 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
*
- * 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
*
- * 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.
*/
package org.netbeans.modules.xml.text.syntax.javacc;
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj
index 26deb7479..78c10935a 100644
--- a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj
@@ -60,44 +60,23 @@ options {
PARSER_BEGIN(XMLSyntax)
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997, 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * 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]"
+/**
+ * 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
*
- * 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
*
- * 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.
*/
package org.netbeans.modules.xml.text.syntax.javacc;
diff --git a/xml/bin/gen-icons_xml.sh b/xml/bin/gen-icons_xml.sh
index c0a0a0de3..c4efc4f93 100644
--- a/xml/bin/gen-icons_xml.sh
+++ b/xml/bin/gen-icons_xml.sh
@@ -48,87 +48,45 @@ for dir in api catalog core css tax text-edit tools tree-edit xsl schema; do
if [ "$GENERATE" == "true" ]; then
DESC_FILE=$ICONS/description.properties
- echo "#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997, 2010 Oracle and/or its affiliates. All rights reserved.
-#
-# 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]"
+ echo "# \
+# 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
#
-# 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
#
-# 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.
" > $DESC_FILE
fi
DATA=$WWW/$dir/data/icons.xml
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997, 2010 Oracle and/or its affiliates. All rights reserved.
-
-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):
+ 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.
-->
" > $DATA
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services