You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2017/10/21 08:59:26 UTC
[incubator-netbeans] branch master updated: [NETBEANS-54] Module
Review hibernate
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 0bfbc1e [NETBEANS-54] Module Review hibernate
0bfbc1e is described below
commit 0bfbc1e4ba1d85c8a21ddd9089892731dbf39ac1
Author: Junichi Yamamoto <ju...@apache.org>
AuthorDate: Fri Oct 13 12:25:12 2017 +0900
[NETBEANS-54] Module Review hibernate
- Update the license header Bundle.properties
- Exclude template files from rat
---
.../hibernate/hqleditor/ui/Bundle.properties | 54 ++++++----------------
.../hibernate/resources/HibernateConfig.xml | 20 --------
.../hibernate/resources/HibernateMapping.xml | 21 ---------
.../hibernate/resources/HibernateReveng.xml | 21 ---------
.../hibernate/resources/HibernateUtil.javax | 18 --------
nbbuild/build.xml | 2 +
6 files changed, 17 insertions(+), 119 deletions(-)
diff --git a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties
index ca06806..b5344ae 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties
+++ b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-
-# 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 2008 Sun Microsystems, Inc.
+# 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.
CTL_HQLEditorAction=Run HQL Query
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml
index b25bcd3..f71fcae 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml
@@ -1,24 +1,4 @@
<?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 hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml
index 29a322b..2879d64 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml
@@ -1,25 +1,4 @@
<?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 hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml
index 209d83d..8e0e4fb 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml
@@ -1,25 +1,4 @@
<?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 hibernate-reverse-engineering PUBLIC
"-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd">
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
index 67bbe34..39a6264 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
@@ -1,21 +1,3 @@
-<#--
-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.
--->
<#assign licenseFirst = "/*">
<#assign licensePrefix = " * ">
<#assign licenseLast = " */">
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 117387e..41fe553 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2059,6 +2059,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya-->
<exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya-->
<exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya-->
+ <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files-->
+ <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file-->
</patternset>
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt">
<rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License">
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].