You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2017/10/22 18:11:09 UTC
[incubator-netbeans] branch master updated: [NETBEANS-54] Module
Review websvc.saas.api
This is an automated email from the ASF dual-hosted git repository.
emi 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 25eacb7 [NETBEANS-54] Module Review websvc.saas.api
25eacb7 is described below
commit 25eacb7fd77742b31dd54034a609cd31082977cb
Author: Trevor Lewis <td...@gmail.com>
AuthorDate: Sun Oct 22 12:10:16 2017 -0600
[NETBEANS-54] Module Review websvc.saas.api
Update .properties file license.
Exclude template and test data from Rat.
---
nbbuild/build.xml | 3 ++
.../modules/websvc/saas/spi/Bundle.properties | 54 ++++++----------------
2 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index f12270d..3ce4b6d 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2018,6 +2018,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="versioning.core/test/unit/data/workdir/root-test-versioned/**" /> <!--test data-->
<exclude name="versioning.core/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data-->
<exclude name="websvc.saas.kit/release/VERSION.txt" /> <!--generated file-->
+ <exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template" /> <!--template files-->
+ <exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl" /> <!--test data-->
+ <exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml" /> <!--test data-->
<exclude name="versioning/test/unit/data/workdir/root/a.txt" /> <!--test data-->
<exclude name="versioning/test/unit/data/workdir/root-test-versioned/**" /> <!--test data-->
<exclude name="versioning/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data-->
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties b/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties
index fc3ba90..05cd738 100644
--- a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties
+++ b/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-# Sample ResourceBundle properties file
+# 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.
OpenIDE-Module-Display-Category=Web Services
OpenIDE-Module-Long-Description=\
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].