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/03 07:50:56 UTC
[GitHub] geertjanw closed pull request #219: [NETBEANS-54] Module Review websvc.saas.codegen.java
geertjanw closed pull request #219: [NETBEANS-54] Module Review websvc.saas.codegen.java
URL: https://github.com/apache/incubator-netbeans/pull/219
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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties
index 4043c5fb8..ad582864b 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/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-Name=SaaS Services Code Generation for Java
OpenIDE-Module-Display-Category=Java
diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template
index 95402f981..4904eb515 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template
index f68c9724b..04cb19f70 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template
index f570264e4..f2e26a59f 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template
index c4364b93d..e0a698d08 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template
index b29f79956..d1736f36c 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template
index 5b1f1132a..2da0f0c80 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template
index 3330c2467..4e0dfa10b 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ 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 = " */">
----------------------------------------------------------------
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