You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/28 18:28:41 UTC
[GitHub] matthiasblaesing closed pull request #768: [NETBEANS-1074] Module
Review j2ee.ddloaders
matthiasblaesing closed pull request #768: [NETBEANS-1074] Module Review j2ee.ddloaders
URL: https://github.com/apache/incubator-netbeans/pull/768
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/j2ee.ddloaders/licenseinfo.xml b/j2ee.ddloaders/licenseinfo.xml
new file mode 100644
index 0000000000..a2ebdc2c6a
--- /dev/null
+++ b/j2ee.ddloaders/licenseinfo.xml
@@ -0,0 +1,65 @@
+<?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.
+
+-->
+
+ <licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/app/DDCatalog.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon1.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/catalog/resources/DDCatalog.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/client/DDCatalog.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/client/DDDataIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/client/error-badge.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/ejb/DDCatalog.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon1.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon1.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/DDInvalidIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/DDValidIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/EjbContainerNodeIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/EjbModuleNodeIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/EntityNodeIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/MessageNodeIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/MiscNodeIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/resources/SessionNodeIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/class.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/constant.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/EnterpriseJavaBean16.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/htmlObject.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/jspObject.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/mappingsNode.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramNode.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramsNode.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDCatalog.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDDataIcon.gif</file>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/resources/error-badge.gif</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd</file>
+ <license ref="W3C2" />
+ <comment>XML Schema is used at runtime to offer code completion for HTML/XHTML files.</comment>
+ </fileset>
+</licenseinfo>
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form
index 172adf2554..ff15826591 100644
--- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form
+++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form
@@ -1,5 +1,25 @@
<?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.
+
+-->
+
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents>
<Component class="javax.swing.ButtonGroup" name="interfaceButtonGroup">
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties
index 2954e26286..6859c0191e 100644
--- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties
+++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties
@@ -1,44 +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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
+# 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.
# Module manifest localization
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd
index b790838406..001a367d77 100644
--- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd
+++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd
@@ -1,10 +1,76 @@
<?xml version='1.0'?>
+
+<!--
+
+ W3C Software and Document Notice and License
+
+ This work is being provided by the copyright holders under the following license.
+
+ License
+
+ By obtaining and/or copying this work, you (the licensee) agree that you have
+ read, understood, and will comply with the following terms and conditions.
+
+ Permission to copy, modify, and distribute this work, with or without
+ modification, for any purpose and without fee or royalty is hereby granted,
+ provided that you include the following on ALL copies of the work or portions
+ thereof, including modifications:
+
+ - The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ - Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+ - Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+ Disclaimers
+
+ THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+ MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+ SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ TRADEMARKS OR OTHER RIGHTS.
+
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+ The name and trademarks of copyright holders may NOT be used in advertising or
+ publicity pertaining to the work without specific, written prior permission.
+ Title to copyright in this work will at all times remain with copyright
+ holders.
+
+ Changes:
+
+ - File content extracted from https://www.w3.org/2001/03/xml.xsd
+ - Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
+
<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
<xs:annotation>
<xs:documentation>
- See http://www.w3.org/XML/1998/namespace.html and
- http://www.w3.org/TR/REC-xml for information about this namespace.
+ See http://www.w3.org/XML/1998/namespace.html and http://www.w3.org/TR/REC-xml for information
+ about this namespace. This schema document describes the XML namespace, in a form suitable
+ for import by other schema documents. Note that local names in this namespace are intended
+ to be defined only by the World Wide Web Consortium or its subgroups. The following names
+ are currently defined in this namespace and should not be used with conflicting semantics by
+ any Working Group, specification, or document instance: base (as an attribute name): denotes
+ an attribute whose value provides a URI to be used as the base for interpreting any relative
+ URIs in the scope of the element on which it appears; its value is inherited. This name is
+ reserved by virtue of its definition in the XML Base specification. lang (as an attribute name):
+ denotes an attribute whose value is a language code for the natural language of the content of any
+ element; its value is inherited. This name is reserved by virtue of its definition in the XML
+ specification. space (as an attribute name): denotes an attribute whose value is a keyword indicating
+ what whitespace processing discipline is intended for the content of the element; its value is inherited.
+ This name is reserved by virtue of its definition in the XML specification. Father (in any context at all):
+ denotes Jon Bosak, the chair of the original XML Working Group. This name is reserved by the following
+ decision of the W3C XML Plenary and XML Coordination groups: In appreciation for his vision, leadership
+ and dedication the W3C XML Plenary on this 10th day of February, 2000 reserves for Jon Bosak in perpetuity
+ the XML name xml:Father
</xs:documentation>
</xs:annotation>
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists