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/07 19:07:27 UTC
[1/3] incubator-netbeans git commit: [NETBEANS-54] Module Review
j2ee.core.utilities
Repository: incubator-netbeans
Updated Branches:
refs/heads/master cdf0df38c -> f6137d804
[NETBEANS-54] Module Review j2ee.core.utilities
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/1c33153b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/1c33153b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/1c33153b
Branch: refs/heads/master
Commit: 1c33153b40ec0caebc913f6e63373736a47d4258
Parents: ccc46bd
Author: Josh Juneau <ju...@gmail.com>
Authored: Thu Oct 5 23:35:45 2017 -0500
Committer: Josh Juneau <ju...@gmail.com>
Committed: Thu Oct 5 23:35:45 2017 -0500
----------------------------------------------------------------------
.../unit/data/JavaApp/nbproject/project.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/1c33153b/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.xml b/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.xml
index 63c2475..214d738 100644
--- a/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.xml
+++ b/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.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.
+
+-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
[3/3] incubator-netbeans git commit: Merge branch 'pr/64'
Posted by ma...@apache.org.
Merge branch 'pr/64'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/f6137d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/f6137d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/f6137d80
Branch: refs/heads/master
Commit: f6137d804c90b9a5442f6073238630ef6372b411
Parents: cdf0df3 b2fde45
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 21:07:19 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 21:07:19 2017 +0200
----------------------------------------------------------------------
.../unit/data/JavaApp/nbproject/project.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
[2/3] incubator-netbeans git commit: [NETBEANS-54] Module Review
j2ee.eclipselinkmodelgen
Posted by ma...@apache.org.
[NETBEANS-54] Module Review j2ee.eclipselinkmodelgen
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/b2fde451
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/b2fde451
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/b2fde451
Branch: refs/heads/master
Commit: b2fde4515fdb8955084fffd3ec8110178b205536
Parents: 1c33153
Author: Josh Juneau <ju...@gmail.com>
Authored: Thu Oct 5 23:49:49 2017 -0500
Committer: Josh Juneau <ju...@gmail.com>
Committed: Thu Oct 5 23:49:49 2017 -0500
----------------------------------------------------------------------
.../modules/j2ee/eclipselinkmodelgen/layer.xml | 58 ++++++--------------
1 file changed, 16 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b2fde451/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/layer.xml
----------------------------------------------------------------------
diff --git a/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/layer.xml b/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/layer.xml
index f48ce09..a8e2571 100644
--- a/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/layer.xml
+++ b/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/layer.xml
@@ -3,48 +3,22 @@
<!--
-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]"
-
-Contributor(s):
-
- The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
+ 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.
-->