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/08 15:47:45 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
hibernate
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 14afd4872 -> 50b698bb6
[NETBEANS-54] Module Review hibernate
- external binary contains DTDs for Hibernate 3.0 configuration files
- changed license headers for files reported by Rat
- replacing the bundled binary is tracked by https://issues.apache.org/jira/browse/NETBEANS-79
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/0a5a1a61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/0a5a1a61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/0a5a1a61
Branch: refs/heads/master
Commit: 0a5a1a61c9bad9dae96908f9b3fd63c3d3d5099d
Parents: 0ed2eb8
Author: Illya Kysil <ik...@ikysil.name>
Authored: Wed Oct 4 21:48:37 2017 +0200
Committer: Illya Kysil <ik...@ikysil.name>
Committed: Sat Oct 7 21:58:57 2017 +0200
----------------------------------------------------------------------
.../hqleditor/HQLEditorController.java | 55 ++++++--------------
.../refactoring/HibernateRefactoringUtil.java | 55 ++++++--------------
.../hibernate/resources/HibernateUtil.javax | 53 ++++++-------------
.../completion/resources/Person.hbm.xml | 20 +++++++
.../completion/resources/hibernate.cfg.xml | 20 +++++++
.../hyperlink/resources/Person.hbm.xml | 20 +++++++
.../hyperlink/resources/hibernate.cfg.xml | 20 +++++++
7 files changed, 127 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/src/org/netbeans/modules/hibernate/hqleditor/HQLEditorController.java
----------------------------------------------------------------------
diff --git a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/HQLEditorController.java b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/HQLEditorController.java
index 6c232a2..07869cd 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/HQLEditorController.java
+++ b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/HQLEditorController.java
@@ -1,43 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 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 the1
- * 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 org.netbeans.modules.hibernate.hqleditor;
@@ -79,9 +56,9 @@ import org.netbeans.modules.hibernate.service.api.HibernateEnvironment;
import org.netbeans.modules.hibernate.util.HibernateUtil;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
-import org.openide.nodes.Node;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
+import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/src/org/netbeans/modules/hibernate/refactoring/HibernateRefactoringUtil.java
----------------------------------------------------------------------
diff --git a/hibernate/src/org/netbeans/modules/hibernate/refactoring/HibernateRefactoringUtil.java b/hibernate/src/org/netbeans/modules/hibernate/refactoring/HibernateRefactoringUtil.java
index 3fc7834..e740265 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/refactoring/HibernateRefactoringUtil.java
+++ b/hibernate/src/org/netbeans/modules/hibernate/refactoring/HibernateRefactoringUtil.java
@@ -1,45 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * 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] [searchingForName of copyright owner]"
- *
- * 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
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
*/
package org.netbeans.modules.hibernate.refactoring;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
----------------------------------------------------------------------
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
index 04d7522..67bbe34 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
@@ -1,41 +1,20 @@
<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 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.
-
-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.
-->
<#assign licenseFirst = "/*">
<#assign licensePrefix = " * ">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/Person.hbm.xml
----------------------------------------------------------------------
diff --git a/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/Person.hbm.xml b/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/Person.hbm.xml
index 77f487a..548ec55 100644
--- a/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/Person.hbm.xml
+++ b/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/Person.hbm.xml
@@ -1,4 +1,24 @@
<?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">
<hibernate-mapping>
<class name="travel.Person" table="PERSON">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/hibernate.cfg.xml
----------------------------------------------------------------------
diff --git a/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/hibernate.cfg.xml b/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/hibernate.cfg.xml
index 5653276..4abbef7 100644
--- a/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/hibernate.cfg.xml
+++ b/hibernate/test/unit/src/org/netbeans/modules/hibernate/completion/resources/hibernate.cfg.xml
@@ -1,4 +1,24 @@
<?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">
<hibernate-configuration>
<session-factory>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/Person.hbm.xml
----------------------------------------------------------------------
diff --git a/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/Person.hbm.xml b/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/Person.hbm.xml
index 77f487a..548ec55 100644
--- a/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/Person.hbm.xml
+++ b/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/Person.hbm.xml
@@ -1,4 +1,24 @@
<?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">
<hibernate-mapping>
<class name="travel.Person" table="PERSON">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a5a1a61/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/hibernate.cfg.xml
----------------------------------------------------------------------
diff --git a/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/hibernate.cfg.xml b/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/hibernate.cfg.xml
index 5653276..4abbef7 100644
--- a/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/hibernate.cfg.xml
+++ b/hibernate/test/unit/src/org/netbeans/modules/hibernate/hyperlink/resources/hibernate.cfg.xml
@@ -1,4 +1,24 @@
<?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">
<hibernate-configuration>
<session-factory>
[2/2] incubator-netbeans git commit: Merge branch 'pr/82'
Posted by ma...@apache.org.
Merge branch 'pr/82'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/50b698bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/50b698bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/50b698bb
Branch: refs/heads/master
Commit: 50b698bb6d79e84963186a0b4981fdeb55913f40
Parents: 14afd48 0a5a1a6
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 17:47:26 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 17:47:26 2017 +0200
----------------------------------------------------------------------
.../hqleditor/HQLEditorController.java | 55 ++++++--------------
.../refactoring/HibernateRefactoringUtil.java | 55 ++++++--------------
.../hibernate/resources/HibernateUtil.javax | 53 ++++++-------------
.../completion/resources/Person.hbm.xml | 20 +++++++
.../completion/resources/hibernate.cfg.xml | 20 +++++++
.../hyperlink/resources/Person.hbm.xml | 20 +++++++
.../hyperlink/resources/hibernate.cfg.xml | 20 +++++++
7 files changed, 127 insertions(+), 116 deletions(-)
----------------------------------------------------------------------