[NETBEANS-1074] Module review j2ee.dd

- Added license to binaries-list
- Integrated necessary external schema files
- Modified external dependency licenses accordingly
- Added license header to files, where missing
- Checked against Rat
- Scanned sources...no other changes needed.  Left data classes un-licensed'
- add generated files to .gitignore

enterprise/j2ee.dd/.gitignore

@@ -0,0 +1,19 @@
+# Generated files from XML Schema
+src/org/netbeans/modules/j2ee/dd/impl/application/model_1_4/*
+src/org/netbeans/modules/j2ee/dd/impl/application/model_5/*
+src/org/netbeans/modules/j2ee/dd/impl/application/model_6/*
+src/org/netbeans/modules/j2ee/dd/impl/application/model_7/*
+src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4/*
+src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0/*
+src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0/*
+src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0/*
+src/org/netbeans/modules/j2ee/dd/impl/ejb/model_2_1/*
+src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_0/*
+src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_1/*
+src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_2/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_2_4/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_2_5/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*

enterprise/j2ee.dd/build.xml

@@ -45,12 +45,8 @@
   <property name="s2b_root_client_7_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0"/>
   <property name="j2ee.dd.resources.dir" value="src/org/netbeans/modules/j2ee/dd/impl/"/>
 
-  <target name="build-init" depends="projectized.build-init">
-  <unzip src="external/j2ee.dd-w3c-resources.zip" dest="${j2ee.dd.resources.dir}"/>
-  <unzip src="external/j2ee.dd-glassfish-resources.zip" dest="${j2ee.dd.resources.dir}"/>
-    </target>
 
-  <target name="s2binit" depends="build-init">
+  <target name="s2binit" depends="projectized.build-init">
       <!-- XXX do not know how to replace with @Schema2Beans; see issue #178426 for discussion -->
 	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
 	  <classpath>
@@ -665,7 +661,7 @@
   </target>
 
   <target name="compile" depends="dd2beansgen,projectized-common.compile"/>
-  
+
   <target name="clean" depends="projectized-common.clean,clean-ddgen-src"/>
 
   <target name="clean-ddgen-src">
@@ -796,14 +792,14 @@
         </delete>
         <delete dir="${s2b_root_client_7_0}"/>
   </target>
-  
+
   <target name="javadoc" depends="init-javadoc, projectized.javadoc"/>
-  
+
   <target name="init-javadoc">
       <mkdir dir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
       <copy file="doc/ddapi_architecture.html" todir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
       <copy file="doc/dd_api_schema.jpg" todir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
       <copy file="doc/usage.html" todir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
   </target>
-  
+
 </project>

enterprise/j2ee.dd/external/binaries-list

@@ -1,3 +1,17 @@
-D2F2B34B7D0A13256D491B14590ED23CA0E49B46 javaee-api-5.jar
-2801A0BB60C19040FDA8C4801963911255774718 j2ee.dd-glassfish-resources.zip
-12763FC339B86791D848078A479793C3FF815982 j2ee.dd-w3c-resources.zip
+# 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.
+E3CC17B10AB552219EDBE33915E62937E387D0EF javaee:javaee-api:5

enterprise/j2ee.dd/external/javaee-api-5-license.txt

@@ -4,6 +4,7 @@ Description: Stripped version of Java EE 5 API.
 License: CDDL-1.0
 Origin: http://java.sun.com/javaee
 Comment: Typically added on classpath of tests to resolve Java EE anotations.
+Type: compile-time
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 

enterprise/j2ee.dd/licenseinfo.xml

@@ -0,0 +1,95 @@
+<?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>doc/dd_api_schema.jpg</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="COMMENT_UNSUPPORTED"/>
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_1_4.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_1_4.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_5.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_5.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_6.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_6.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_5.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_5.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_6.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_6.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_7.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_2_1.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_2_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_0.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_0.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_1.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_2.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_2.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/j2ee_1_4.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/j2ee_web_services_client_1_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_5.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_6.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_1_4.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_client_1_2.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_client_1_3.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_client_1_4.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jsp_2_0.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jsp_2_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jsp_2_2.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jsp_2_3.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/permissions_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_2.dtd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_3.dtd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_4.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_4.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_5.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_5.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_0.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.xsd</file>
+        <license ref="CDDL-1.1" />
+        <comment type="CATEGORY_B" />
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/datatypes.dtd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/XMLSchema.dtd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/xml.xsd</file>
+        <license ref="W3C2" />
+        <comment type="CATEGORY_B" />
+    </fileset>
+</licenseinfo>

enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/Bundle.properties

@@ -1,46 +1,19 @@
-#
-# 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 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.
-#
+# 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.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message

enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/Bundle.properties

@@ -1,46 +1,19 @@
-#
-# 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 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.
-#
+# 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.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message