Fix up some license headers as they didn't get updated correctly by the script. post_nb6_exp_root
authorcnguyencasj@netbeans.org
Thu, 04 Oct 2007 03:26:59 +0000
changeset 258652066da2cada
parent 2585 45a918b8b17f
child 2587 a30616448779
Fix up some license headers as they didn't get updated correctly by the script.
visualweb/project/jsfportlet/build.xml
visualweb/project/jsfportlet/nbproject/project.properties
visualweb/project/jsfportlet/nbproject/project.xml
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/Bundle.properties
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/JsfPortletProjectTemplateJakarta.xml
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/Bundle.properties
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/jsf-portlet-runtime.xml
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/portlet-runtime.xml
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/Bundle.properties
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/layer.xml
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletJavaPageTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletPageFragmentTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletPageTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/facesConfigTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletTLDTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletWebTemplateHelp.html
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/resources/Bundle.properties
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/Bundle.properties
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/FileChooser.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/FoldersListSettings.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelConfigureProject.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelConfigureProjectVisual.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelProjectLocationVisual.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectDeployDescriptorVisual.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectDeploymentDescriptor.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectWizardIterator.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletWizardProperties.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/SettingsPanel.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/Utils.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/WizardProperties.java
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/resources/Bundle.properties
visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/resources/PortletProject.html
visualweb/ravebuild/default-rave-properties.xml
visualweb/ravebuild/merge-forked-modules.xml
     1.1 --- a/visualweb/project/jsfportlet/build.xml	Wed Oct 03 17:44:32 2007 +0000
     1.2 +++ b/visualweb/project/jsfportlet/build.xml	Thu Oct 04 03:26:59 2007 +0000
     1.3 @@ -1,21 +1,44 @@
     1.4  <?xml version="1.0" encoding="UTF-8"?>
     1.5  <!--
     1.6 -The contents of this file are subject to the terms of the Common Development
     1.7 -and Distribution License (the License). You may not use this file except in
     1.8 -compliance with the License.
     1.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    1.10  
    1.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    1.12 -or http://www.netbeans.org/cddl.txt.
    1.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    1.14  
    1.15 -When distributing Covered Code, include this CDDL Header Notice in each file
    1.16 -and include the License file at http://www.netbeans.org/cddl.txt.
    1.17 -If applicable, add the following below the CDDL Header, with the fields
    1.18 -enclosed by brackets [] replaced by your own identifying information:
    1.19 +
    1.20 +The contents of this file are subject to the terms of either the GNU
    1.21 +General Public License Version 2 only ("GPL") or the Common
    1.22 +Development and Distribution License("CDDL") (collectively, the
    1.23 +"License"). You may not use this file except in compliance with the
    1.24 +License. You can obtain a copy of the License at
    1.25 +http://www.netbeans.org/cddl-gplv2.html
    1.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.27 +specific language governing permissions and limitations under the
    1.28 +License.  When distributing the software, include this License Header
    1.29 +Notice in each file and include the License file at
    1.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    1.31 +particular file as subject to the "Classpath" exception as provided
    1.32 +by Sun in the GPL Version 2 section of the License file that
    1.33 +accompanied this code. If applicable, add the following below the
    1.34 +License Header, with the fields enclosed by brackets [] replaced by
    1.35 +your own identifying information:
    1.36  "Portions Copyrighted [year] [name of copyright owner]"
    1.37  
    1.38 +Contributor(s):
    1.39 +
    1.40  The Original Software is NetBeans. The Initial Developer of the Original
    1.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    1.42  Microsystems, Inc. All Rights Reserved.
    1.43 +
    1.44 +If you wish your version of this file to be governed by only the CDDL
    1.45 +or only the GPL Version 2, indicate your decision by adding
    1.46 +"[Contributor] elects to include this software in this distribution
    1.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.48 +single choice of license, a recipient has the option to distribute
    1.49 +your version of this file under either the CDDL, the GPL Version 2 or
    1.50 +to extend the choice of license to its licensees as provided above.
    1.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
    1.52 +Version 2 license, then the option applies only if the new code is
    1.53 +made subject to such option by the copyright holder.
    1.54  -->
    1.55  
    1.56  <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
     2.1 --- a/visualweb/project/jsfportlet/nbproject/project.properties	Wed Oct 03 17:44:32 2007 +0000
     2.2 +++ b/visualweb/project/jsfportlet/nbproject/project.properties	Thu Oct 04 03:26:59 2007 +0000
     2.3 @@ -1,10 +1,39 @@
     2.4 -#                 Sun Public License Notice
     2.5 -# 
     2.6 -# The contents of this file are subject to the Sun Public License
     2.7 -# Version 1.0 (the "License"). You may not use this file except in
     2.8 -# compliance with the License. A copy of the License is available at
     2.9 -# http://www.sun.com/
    2.10 -# 
    2.11 -# The Original Code is NetBeans. The Initial Developer of the Original
    2.12 -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
    2.13 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    2.14 +#
    2.15 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    2.16 +#
    2.17 +# The contents of this file are subject to the terms of either the GNU
    2.18 +# General Public License Version 2 only ("GPL") or the Common
    2.19 +# Development and Distribution License("CDDL") (collectively, the
    2.20 +# "License"). You may not use this file except in compliance with the
    2.21 +# License. You can obtain a copy of the License at
    2.22 +# http://www.netbeans.org/cddl-gplv2.html
    2.23 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    2.24 +# specific language governing permissions and limitations under the
    2.25 +# License.  When distributing the software, include this License Header
    2.26 +# Notice in each file and include the License file at
    2.27 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    2.28 +# particular file as subject to the "Classpath" exception as provided
    2.29 +# by Sun in the GPL Version 2 section of the License file that
    2.30 +# accompanied this code. If applicable, add the following below the
    2.31 +# License Header, with the fields enclosed by brackets [] replaced by
    2.32 +# your own identifying information:
    2.33 +# "Portions Copyrighted [year] [name of copyright owner]"
    2.34 +#
    2.35 +# Contributor(s):
    2.36 +#
    2.37 +# The Original Software is NetBeans. The Initial Developer of the Original
    2.38 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    2.39  # Microsystems, Inc. All Rights Reserved.
    2.40 +#
    2.41 +# If you wish your version of this file to be governed by only the CDDL
    2.42 +# or only the GPL Version 2, indicate your decision by adding
    2.43 +# "[Contributor] elects to include this software in this distribution
    2.44 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
    2.45 +# single choice of license, a recipient has the option to distribute
    2.46 +# your version of this file under either the CDDL, the GPL Version 2 or
    2.47 +# to extend the choice of license to its licensees as provided above.
    2.48 +# However, if you add GPL Version 2 code and therefore, elected the GPL
    2.49 +# Version 2 license, then the option applies only if the new code is
    2.50 +# made subject to such option by the copyright holder.
    2.51 +
     3.1 --- a/visualweb/project/jsfportlet/nbproject/project.xml	Wed Oct 03 17:44:32 2007 +0000
     3.2 +++ b/visualweb/project/jsfportlet/nbproject/project.xml	Thu Oct 04 03:26:59 2007 +0000
     3.3 @@ -1,21 +1,44 @@
     3.4  <?xml version="1.0" encoding="UTF-8"?>
     3.5  <!--
     3.6 -The contents of this file are subject to the terms of the Common Development
     3.7 -and Distribution License (the License). You may not use this file except in
     3.8 -compliance with the License.
     3.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    3.10  
    3.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    3.12 -or http://www.netbeans.org/cddl.txt.
    3.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    3.14  
    3.15 -When distributing Covered Code, include this CDDL Header Notice in each file
    3.16 -and include the License file at http://www.netbeans.org/cddl.txt.
    3.17 -If applicable, add the following below the CDDL Header, with the fields
    3.18 -enclosed by brackets [] replaced by your own identifying information:
    3.19 +
    3.20 +The contents of this file are subject to the terms of either the GNU
    3.21 +General Public License Version 2 only ("GPL") or the Common
    3.22 +Development and Distribution License("CDDL") (collectively, the
    3.23 +"License"). You may not use this file except in compliance with the
    3.24 +License. You can obtain a copy of the License at
    3.25 +http://www.netbeans.org/cddl-gplv2.html
    3.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    3.27 +specific language governing permissions and limitations under the
    3.28 +License.  When distributing the software, include this License Header
    3.29 +Notice in each file and include the License file at
    3.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    3.31 +particular file as subject to the "Classpath" exception as provided
    3.32 +by Sun in the GPL Version 2 section of the License file that
    3.33 +accompanied this code. If applicable, add the following below the
    3.34 +License Header, with the fields enclosed by brackets [] replaced by
    3.35 +your own identifying information:
    3.36  "Portions Copyrighted [year] [name of copyright owner]"
    3.37  
    3.38 +Contributor(s):
    3.39 +
    3.40  The Original Software is NetBeans. The Initial Developer of the Original
    3.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    3.42  Microsystems, Inc. All Rights Reserved.
    3.43 +
    3.44 +If you wish your version of this file to be governed by only the CDDL
    3.45 +or only the GPL Version 2, indicate your decision by adding
    3.46 +"[Contributor] elects to include this software in this distribution
    3.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
    3.48 +single choice of license, a recipient has the option to distribute
    3.49 +your version of this file under either the CDDL, the GPL Version 2 or
    3.50 +to extend the choice of license to its licensees as provided above.
    3.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
    3.52 +Version 2 license, then the option applies only if the new code is
    3.53 +made subject to such option by the copyright holder.
    3.54  -->
    3.55  
    3.56  <project xmlns="http://www.netbeans.org/ns/project/1">
     4.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/Bundle.properties	Wed Oct 03 17:44:32 2007 +0000
     4.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/Bundle.properties	Thu Oct 04 03:26:59 2007 +0000
     4.3 @@ -1,14 +1,41 @@
     4.4 -#                 Sun Public License Notice
     4.5 -# 
     4.6 -# The contents of this file are subject to the Sun Public License
     4.7 -# Version 1.0 (the "License"). You may not use this file except in
     4.8 -# compliance with the License. A copy of the License is available at
     4.9 -# http://www.sun.com/
    4.10 -# 
    4.11 -# The Original Code is NetBeans. The Initial Developer of the Original
    4.12 -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
    4.13 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    4.14 +#
    4.15 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    4.16 +#
    4.17 +# The contents of this file are subject to the terms of either the GNU
    4.18 +# General Public License Version 2 only ("GPL") or the Common
    4.19 +# Development and Distribution License("CDDL") (collectively, the
    4.20 +# "License"). You may not use this file except in compliance with the
    4.21 +# License. You can obtain a copy of the License at
    4.22 +# http://www.netbeans.org/cddl-gplv2.html
    4.23 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    4.24 +# specific language governing permissions and limitations under the
    4.25 +# License.  When distributing the software, include this License Header
    4.26 +# Notice in each file and include the License file at
    4.27 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    4.28 +# particular file as subject to the "Classpath" exception as provided
    4.29 +# by Sun in the GPL Version 2 section of the License file that
    4.30 +# accompanied this code. If applicable, add the following below the
    4.31 +# License Header, with the fields enclosed by brackets [] replaced by
    4.32 +# your own identifying information:
    4.33 +# "Portions Copyrighted [year] [name of copyright owner]"
    4.34 +#
    4.35 +# Contributor(s):
    4.36 +#
    4.37 +# The Original Software is NetBeans. The Initial Developer of the Original
    4.38 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    4.39  # Microsystems, Inc. All Rights Reserved.
    4.40 -
    4.41 +#
    4.42 +# If you wish your version of this file to be governed by only the CDDL
    4.43 +# or only the GPL Version 2, indicate your decision by adding
    4.44 +# "[Contributor] elects to include this software in this distribution
    4.45 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
    4.46 +# single choice of license, a recipient has the option to distribute
    4.47 +# your version of this file under either the CDDL, the GPL Version 2 or
    4.48 +# to extend the choice of license to its licensees as provided above.
    4.49 +# However, if you add GPL Version 2 code and therefore, elected the GPL
    4.50 +# Version 2 license, then the option applies only if the new code is
    4.51 +# made subject to such option by the copyright holder.
    4.52  
    4.53  # manifest.mf
    4.54  OpenIDE-Module-Name=JSF Portlet
     5.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/JsfPortletProjectTemplateJakarta.xml	Wed Oct 03 17:44:32 2007 +0000
     5.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/JsfPortletProjectTemplateJakarta.xml	Thu Oct 04 03:26:59 2007 +0000
     5.3 @@ -1,21 +1,44 @@
     5.4  <?xml version="1.0" encoding="UTF-8"?>
     5.5  <!--
     5.6 -The contents of this file are subject to the terms of the Common Development
     5.7 -and Distribution License (the License). You may not use this file except in
     5.8 -compliance with the License.
     5.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    5.10  
    5.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    5.12 -or http://www.netbeans.org/cddl.txt.
    5.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    5.14  
    5.15 -When distributing Covered Code, include this CDDL Header Notice in each file
    5.16 -and include the License file at http://www.netbeans.org/cddl.txt.
    5.17 -If applicable, add the following below the CDDL Header, with the fields
    5.18 -enclosed by brackets [] replaced by your own identifying information:
    5.19 +
    5.20 +The contents of this file are subject to the terms of either the GNU
    5.21 +General Public License Version 2 only ("GPL") or the Common
    5.22 +Development and Distribution License("CDDL") (collectively, the
    5.23 +"License"). You may not use this file except in compliance with the
    5.24 +License. You can obtain a copy of the License at
    5.25 +http://www.netbeans.org/cddl-gplv2.html
    5.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    5.27 +specific language governing permissions and limitations under the
    5.28 +License.  When distributing the software, include this License Header
    5.29 +Notice in each file and include the License file at
    5.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    5.31 +particular file as subject to the "Classpath" exception as provided
    5.32 +by Sun in the GPL Version 2 section of the License file that
    5.33 +accompanied this code. If applicable, add the following below the
    5.34 +License Header, with the fields enclosed by brackets [] replaced by
    5.35 +your own identifying information:
    5.36  "Portions Copyrighted [year] [name of copyright owner]"
    5.37  
    5.38 +Contributor(s):
    5.39 +
    5.40  The Original Software is NetBeans. The Initial Developer of the Original
    5.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    5.42  Microsystems, Inc. All Rights Reserved.
    5.43 +
    5.44 +If you wish your version of this file to be governed by only the CDDL
    5.45 +or only the GPL Version 2, indicate your decision by adding
    5.46 +"[Contributor] elects to include this software in this distribution
    5.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
    5.48 +single choice of license, a recipient has the option to distribute
    5.49 +your version of this file under either the CDDL, the GPL Version 2 or
    5.50 +to extend the choice of license to its licensees as provided above.
    5.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
    5.52 +Version 2 license, then the option applies only if the new code is
    5.53 +made subject to such option by the copyright holder.
    5.54  -->
    5.55  
    5.56  <project>
     6.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/Bundle.properties	Wed Oct 03 17:44:32 2007 +0000
     6.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/Bundle.properties	Thu Oct 04 03:26:59 2007 +0000
     6.3 @@ -1,2 +1,41 @@
     6.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     6.5 +#
     6.6 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
     6.7 +#
     6.8 +# The contents of this file are subject to the terms of either the GNU
     6.9 +# General Public License Version 2 only ("GPL") or the Common
    6.10 +# Development and Distribution License("CDDL") (collectively, the
    6.11 +# "License"). You may not use this file except in compliance with the
    6.12 +# License. You can obtain a copy of the License at
    6.13 +# http://www.netbeans.org/cddl-gplv2.html
    6.14 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    6.15 +# specific language governing permissions and limitations under the
    6.16 +# License.  When distributing the software, include this License Header
    6.17 +# Notice in each file and include the License file at
    6.18 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    6.19 +# particular file as subject to the "Classpath" exception as provided
    6.20 +# by Sun in the GPL Version 2 section of the License file that
    6.21 +# accompanied this code. If applicable, add the following below the
    6.22 +# License Header, with the fields enclosed by brackets [] replaced by
    6.23 +# your own identifying information:
    6.24 +# "Portions Copyrighted [year] [name of copyright owner]"
    6.25 +#
    6.26 +# Contributor(s):
    6.27 +#
    6.28 +# The Original Software is NetBeans. The Initial Developer of the Original
    6.29 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    6.30 +# Microsystems, Inc. All Rights Reserved.
    6.31 +#
    6.32 +# If you wish your version of this file to be governed by only the CDDL
    6.33 +# or only the GPL Version 2, indicate your decision by adding
    6.34 +# "[Contributor] elects to include this software in this distribution
    6.35 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
    6.36 +# single choice of license, a recipient has the option to distribute
    6.37 +# your version of this file under either the CDDL, the GPL Version 2 or
    6.38 +# to extend the choice of license to its licensees as provided above.
    6.39 +# However, if you add GPL Version 2 code and therefore, elected the GPL
    6.40 +# Version 2 license, then the option applies only if the new code is
    6.41 +# made subject to such option by the copyright holder.
    6.42 +
    6.43  jsf-portlet-runtime=JSR-168 Portlet to JSF Bridge Support
    6.44  portlet-runtime=Sun Web Portlet 
     7.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/jsf-portlet-runtime.xml	Wed Oct 03 17:44:32 2007 +0000
     7.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/jsf-portlet-runtime.xml	Thu Oct 04 03:26:59 2007 +0000
     7.3 @@ -1,21 +1,44 @@
     7.4  <?xml version="1.0" encoding="UTF-8"?>
     7.5  <!--
     7.6 -The contents of this file are subject to the terms of the Common Development
     7.7 -and Distribution License (the License). You may not use this file except in
     7.8 -compliance with the License.
     7.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    7.10  
    7.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    7.12 -or http://www.netbeans.org/cddl.txt.
    7.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    7.14  
    7.15 -When distributing Covered Code, include this CDDL Header Notice in each file
    7.16 -and include the License file at http://www.netbeans.org/cddl.txt.
    7.17 -If applicable, add the following below the CDDL Header, with the fields
    7.18 -enclosed by brackets [] replaced by your own identifying information:
    7.19 +
    7.20 +The contents of this file are subject to the terms of either the GNU
    7.21 +General Public License Version 2 only ("GPL") or the Common
    7.22 +Development and Distribution License("CDDL") (collectively, the
    7.23 +"License"). You may not use this file except in compliance with the
    7.24 +License. You can obtain a copy of the License at
    7.25 +http://www.netbeans.org/cddl-gplv2.html
    7.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    7.27 +specific language governing permissions and limitations under the
    7.28 +License.  When distributing the software, include this License Header
    7.29 +Notice in each file and include the License file at
    7.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    7.31 +particular file as subject to the "Classpath" exception as provided
    7.32 +by Sun in the GPL Version 2 section of the License file that
    7.33 +accompanied this code. If applicable, add the following below the
    7.34 +License Header, with the fields enclosed by brackets [] replaced by
    7.35 +your own identifying information:
    7.36  "Portions Copyrighted [year] [name of copyright owner]"
    7.37  
    7.38 +Contributor(s):
    7.39 +
    7.40  The Original Software is NetBeans. The Initial Developer of the Original
    7.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    7.42  Microsystems, Inc. All Rights Reserved.
    7.43 +
    7.44 +If you wish your version of this file to be governed by only the CDDL
    7.45 +or only the GPL Version 2, indicate your decision by adding
    7.46 +"[Contributor] elects to include this software in this distribution
    7.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
    7.48 +single choice of license, a recipient has the option to distribute
    7.49 +your version of this file under either the CDDL, the GPL Version 2 or
    7.50 +to extend the choice of license to its licensees as provided above.
    7.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
    7.52 +Version 2 license, then the option applies only if the new code is
    7.53 +made subject to such option by the copyright holder.
    7.54  -->
    7.55  
    7.56  <!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
     8.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/portlet-runtime.xml	Wed Oct 03 17:44:32 2007 +0000
     8.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/libraries/portlet-runtime.xml	Thu Oct 04 03:26:59 2007 +0000
     8.3 @@ -1,21 +1,44 @@
     8.4  <?xml version="1.0" encoding="UTF-8"?>
     8.5  <!--
     8.6 -The contents of this file are subject to the terms of the Common Development
     8.7 -and Distribution License (the License). You may not use this file except in
     8.8 -compliance with the License.
     8.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    8.10  
    8.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    8.12 -or http://www.netbeans.org/cddl.txt.
    8.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    8.14  
    8.15 -When distributing Covered Code, include this CDDL Header Notice in each file
    8.16 -and include the License file at http://www.netbeans.org/cddl.txt.
    8.17 -If applicable, add the following below the CDDL Header, with the fields
    8.18 -enclosed by brackets [] replaced by your own identifying information:
    8.19 +
    8.20 +The contents of this file are subject to the terms of either the GNU
    8.21 +General Public License Version 2 only ("GPL") or the Common
    8.22 +Development and Distribution License("CDDL") (collectively, the
    8.23 +"License"). You may not use this file except in compliance with the
    8.24 +License. You can obtain a copy of the License at
    8.25 +http://www.netbeans.org/cddl-gplv2.html
    8.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    8.27 +specific language governing permissions and limitations under the
    8.28 +License.  When distributing the software, include this License Header
    8.29 +Notice in each file and include the License file at
    8.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    8.31 +particular file as subject to the "Classpath" exception as provided
    8.32 +by Sun in the GPL Version 2 section of the License file that
    8.33 +accompanied this code. If applicable, add the following below the
    8.34 +License Header, with the fields enclosed by brackets [] replaced by
    8.35 +your own identifying information:
    8.36  "Portions Copyrighted [year] [name of copyright owner]"
    8.37  
    8.38 +Contributor(s):
    8.39 +
    8.40  The Original Software is NetBeans. The Initial Developer of the Original
    8.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    8.42  Microsystems, Inc. All Rights Reserved.
    8.43 +
    8.44 +If you wish your version of this file to be governed by only the CDDL
    8.45 +or only the GPL Version 2, indicate your decision by adding
    8.46 +"[Contributor] elects to include this software in this distribution
    8.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
    8.48 +single choice of license, a recipient has the option to distribute
    8.49 +your version of this file under either the CDDL, the GPL Version 2 or
    8.50 +to extend the choice of license to its licensees as provided above.
    8.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
    8.52 +Version 2 license, then the option applies only if the new code is
    8.53 +made subject to such option by the copyright holder.
    8.54  -->
    8.55  
    8.56  <!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
     9.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/Bundle.properties	Wed Oct 03 17:44:32 2007 +0000
     9.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/Bundle.properties	Thu Oct 04 03:26:59 2007 +0000
     9.3 @@ -1,13 +1,42 @@
     9.4 -#                 Sun Public License Notice
     9.5 -# 
     9.6 -# The contents of this file are subject to the Sun Public License
     9.7 -# Version 1.0 (the "License"). You may not use this file except in
     9.8 -# compliance with the License. A copy of the License is available at
     9.9 -# http://www.sun.com/
    9.10 -# 
    9.11 -# The Original Code is NetBeans. The Initial Developer of the Original
    9.12 -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
    9.13 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    9.14 +#
    9.15 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    9.16 +#
    9.17 +# The contents of this file are subject to the terms of either the GNU
    9.18 +# General Public License Version 2 only ("GPL") or the Common
    9.19 +# Development and Distribution License("CDDL") (collectively, the
    9.20 +# "License"). You may not use this file except in compliance with the
    9.21 +# License. You can obtain a copy of the License at
    9.22 +# http://www.netbeans.org/cddl-gplv2.html
    9.23 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    9.24 +# specific language governing permissions and limitations under the
    9.25 +# License.  When distributing the software, include this License Header
    9.26 +# Notice in each file and include the License file at
    9.27 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    9.28 +# particular file as subject to the "Classpath" exception as provided
    9.29 +# by Sun in the GPL Version 2 section of the License file that
    9.30 +# accompanied this code. If applicable, add the following below the
    9.31 +# License Header, with the fields enclosed by brackets [] replaced by
    9.32 +# your own identifying information:
    9.33 +# "Portions Copyrighted [year] [name of copyright owner]"
    9.34 +#
    9.35 +# Contributor(s):
    9.36 +#
    9.37 +# The Original Software is NetBeans. The Initial Developer of the Original
    9.38 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
    9.39  # Microsystems, Inc. All Rights Reserved.
    9.40 +#
    9.41 +# If you wish your version of this file to be governed by only the CDDL
    9.42 +# or only the GPL Version 2, indicate your decision by adding
    9.43 +# "[Contributor] elects to include this software in this distribution
    9.44 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
    9.45 +# single choice of license, a recipient has the option to distribute
    9.46 +# your version of this file under either the CDDL, the GPL Version 2 or
    9.47 +# to extend the choice of license to its licensees as provided above.
    9.48 +# However, if you add GPL Version 2 code and therefore, elected the GPL
    9.49 +# Version 2 license, then the option applies only if the new code is
    9.50 +# made subject to such option by the copyright holder.
    9.51 +
    9.52  OpenIDE-Module-Name=Portlet Project Support
    9.53  OpenIDE-Module-Display-Category=Visual Web
    9.54  OpenIDE-Module-Short-Description=Supports creating Portlet Web Projects
    10.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/layer.xml	Wed Oct 03 17:44:32 2007 +0000
    10.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/layer.xml	Thu Oct 04 03:26:59 2007 +0000
    10.3 @@ -1,21 +1,44 @@
    10.4  <?xml version="1.0" encoding="UTF-8"?>
    10.5  <!--
    10.6 -The contents of this file are subject to the terms of the Common Development
    10.7 -and Distribution License (the License). You may not use this file except in
    10.8 -compliance with the License.
    10.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   10.10  
   10.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   10.12 -or http://www.netbeans.org/cddl.txt.
   10.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   10.14  
   10.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   10.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   10.17 -If applicable, add the following below the CDDL Header, with the fields
   10.18 -enclosed by brackets [] replaced by your own identifying information:
   10.19 +
   10.20 +The contents of this file are subject to the terms of either the GNU
   10.21 +General Public License Version 2 only ("GPL") or the Common
   10.22 +Development and Distribution License("CDDL") (collectively, the
   10.23 +"License"). You may not use this file except in compliance with the
   10.24 +License. You can obtain a copy of the License at
   10.25 +http://www.netbeans.org/cddl-gplv2.html
   10.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   10.27 +specific language governing permissions and limitations under the
   10.28 +License.  When distributing the software, include this License Header
   10.29 +Notice in each file and include the License file at
   10.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   10.31 +particular file as subject to the "Classpath" exception as provided
   10.32 +by Sun in the GPL Version 2 section of the License file that
   10.33 +accompanied this code. If applicable, add the following below the
   10.34 +License Header, with the fields enclosed by brackets [] replaced by
   10.35 +your own identifying information:
   10.36  "Portions Copyrighted [year] [name of copyright owner]"
   10.37  
   10.38 +Contributor(s):
   10.39 +
   10.40  The Original Software is NetBeans. The Initial Developer of the Original
   10.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   10.42  Microsystems, Inc. All Rights Reserved.
   10.43 +
   10.44 +If you wish your version of this file to be governed by only the CDDL
   10.45 +or only the GPL Version 2, indicate your decision by adding
   10.46 +"[Contributor] elects to include this software in this distribution
   10.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   10.48 +single choice of license, a recipient has the option to distribute
   10.49 +your version of this file under either the CDDL, the GPL Version 2 or
   10.50 +to extend the choice of license to its licensees as provided above.
   10.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   10.52 +Version 2 license, then the option applies only if the new code is
   10.53 +made subject to such option by the copyright holder.
   10.54  -->
   10.55  
   10.56  <?xml-stylesheet type="text/xml" href="http://openide.netbeans.org/fs/filesystem.xsl"?>
    11.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletJavaPageTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    11.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletJavaPageTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    11.3 @@ -1,21 +1,44 @@
    11.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    11.5  <!--
    11.6 -The contents of this file are subject to the terms of the Common Development
    11.7 -and Distribution License (the License). You may not use this file except in
    11.8 -compliance with the License.
    11.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   11.10  
   11.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   11.12 -or http://www.netbeans.org/cddl.txt.
   11.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   11.14  
   11.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   11.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   11.17 -If applicable, add the following below the CDDL Header, with the fields
   11.18 -enclosed by brackets [] replaced by your own identifying information:
   11.19 +
   11.20 +The contents of this file are subject to the terms of either the GNU
   11.21 +General Public License Version 2 only ("GPL") or the Common
   11.22 +Development and Distribution License("CDDL") (collectively, the
   11.23 +"License"). You may not use this file except in compliance with the
   11.24 +License. You can obtain a copy of the License at
   11.25 +http://www.netbeans.org/cddl-gplv2.html
   11.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   11.27 +specific language governing permissions and limitations under the
   11.28 +License.  When distributing the software, include this License Header
   11.29 +Notice in each file and include the License file at
   11.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   11.31 +particular file as subject to the "Classpath" exception as provided
   11.32 +by Sun in the GPL Version 2 section of the License file that
   11.33 +accompanied this code. If applicable, add the following below the
   11.34 +License Header, with the fields enclosed by brackets [] replaced by
   11.35 +your own identifying information:
   11.36  "Portions Copyrighted [year] [name of copyright owner]"
   11.37  
   11.38 +Contributor(s):
   11.39 +
   11.40  The Original Software is NetBeans. The Initial Developer of the Original
   11.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   11.42  Microsystems, Inc. All Rights Reserved.
   11.43 +
   11.44 +If you wish your version of this file to be governed by only the CDDL
   11.45 +or only the GPL Version 2, indicate your decision by adding
   11.46 +"[Contributor] elects to include this software in this distribution
   11.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   11.48 +single choice of license, a recipient has the option to distribute
   11.49 +your version of this file under either the CDDL, the GPL Version 2 or
   11.50 +to extend the choice of license to its licensees as provided above.
   11.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   11.52 +Version 2 license, then the option applies only if the new code is
   11.53 +made subject to such option by the copyright holder.
   11.54  -->
   11.55  
   11.56  
    12.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletPageFragmentTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    12.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletPageFragmentTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    12.3 @@ -1,21 +1,44 @@
    12.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    12.5  <!--
    12.6 -The contents of this file are subject to the terms of the Common Development
    12.7 -and Distribution License (the License). You may not use this file except in
    12.8 -compliance with the License.
    12.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   12.10  
   12.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   12.12 -or http://www.netbeans.org/cddl.txt.
   12.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   12.14  
   12.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   12.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   12.17 -If applicable, add the following below the CDDL Header, with the fields
   12.18 -enclosed by brackets [] replaced by your own identifying information:
   12.19 +
   12.20 +The contents of this file are subject to the terms of either the GNU
   12.21 +General Public License Version 2 only ("GPL") or the Common
   12.22 +Development and Distribution License("CDDL") (collectively, the
   12.23 +"License"). You may not use this file except in compliance with the
   12.24 +License. You can obtain a copy of the License at
   12.25 +http://www.netbeans.org/cddl-gplv2.html
   12.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   12.27 +specific language governing permissions and limitations under the
   12.28 +License.  When distributing the software, include this License Header
   12.29 +Notice in each file and include the License file at
   12.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   12.31 +particular file as subject to the "Classpath" exception as provided
   12.32 +by Sun in the GPL Version 2 section of the License file that
   12.33 +accompanied this code. If applicable, add the following below the
   12.34 +License Header, with the fields enclosed by brackets [] replaced by
   12.35 +your own identifying information:
   12.36  "Portions Copyrighted [year] [name of copyright owner]"
   12.37  
   12.38 +Contributor(s):
   12.39 +
   12.40  The Original Software is NetBeans. The Initial Developer of the Original
   12.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   12.42  Microsystems, Inc. All Rights Reserved.
   12.43 +
   12.44 +If you wish your version of this file to be governed by only the CDDL
   12.45 +or only the GPL Version 2, indicate your decision by adding
   12.46 +"[Contributor] elects to include this software in this distribution
   12.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   12.48 +single choice of license, a recipient has the option to distribute
   12.49 +your version of this file under either the CDDL, the GPL Version 2 or
   12.50 +to extend the choice of license to its licensees as provided above.
   12.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   12.52 +Version 2 license, then the option applies only if the new code is
   12.53 +made subject to such option by the copyright holder.
   12.54  -->
   12.55  
   12.56  
    13.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletPageTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    13.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/PortletPageTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    13.3 @@ -1,21 +1,44 @@
    13.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    13.5  <!--
    13.6 -The contents of this file are subject to the terms of the Common Development
    13.7 -and Distribution License (the License). You may not use this file except in
    13.8 -compliance with the License.
    13.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   13.10  
   13.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   13.12 -or http://www.netbeans.org/cddl.txt.
   13.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   13.14  
   13.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   13.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   13.17 -If applicable, add the following below the CDDL Header, with the fields
   13.18 -enclosed by brackets [] replaced by your own identifying information:
   13.19 +
   13.20 +The contents of this file are subject to the terms of either the GNU
   13.21 +General Public License Version 2 only ("GPL") or the Common
   13.22 +Development and Distribution License("CDDL") (collectively, the
   13.23 +"License"). You may not use this file except in compliance with the
   13.24 +License. You can obtain a copy of the License at
   13.25 +http://www.netbeans.org/cddl-gplv2.html
   13.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   13.27 +specific language governing permissions and limitations under the
   13.28 +License.  When distributing the software, include this License Header
   13.29 +Notice in each file and include the License file at
   13.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   13.31 +particular file as subject to the "Classpath" exception as provided
   13.32 +by Sun in the GPL Version 2 section of the License file that
   13.33 +accompanied this code. If applicable, add the following below the
   13.34 +License Header, with the fields enclosed by brackets [] replaced by
   13.35 +your own identifying information:
   13.36  "Portions Copyrighted [year] [name of copyright owner]"
   13.37  
   13.38 +Contributor(s):
   13.39 +
   13.40  The Original Software is NetBeans. The Initial Developer of the Original
   13.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   13.42  Microsystems, Inc. All Rights Reserved.
   13.43 +
   13.44 +If you wish your version of this file to be governed by only the CDDL
   13.45 +or only the GPL Version 2, indicate your decision by adding
   13.46 +"[Contributor] elects to include this software in this distribution
   13.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   13.48 +single choice of license, a recipient has the option to distribute
   13.49 +your version of this file under either the CDDL, the GPL Version 2 or
   13.50 +to extend the choice of license to its licensees as provided above.
   13.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   13.52 +Version 2 license, then the option applies only if the new code is
   13.53 +made subject to such option by the copyright holder.
   13.54  -->
   13.55  
   13.56  
    14.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/facesConfigTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    14.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/facesConfigTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    14.3 @@ -1,21 +1,44 @@
    14.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    14.5  <!--
    14.6 -The contents of this file are subject to the terms of the Common Development
    14.7 -and Distribution License (the License). You may not use this file except in
    14.8 -compliance with the License.
    14.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   14.10  
   14.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   14.12 -or http://www.netbeans.org/cddl.txt.
   14.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   14.14  
   14.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   14.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   14.17 -If applicable, add the following below the CDDL Header, with the fields
   14.18 -enclosed by brackets [] replaced by your own identifying information:
   14.19 +
   14.20 +The contents of this file are subject to the terms of either the GNU
   14.21 +General Public License Version 2 only ("GPL") or the Common
   14.22 +Development and Distribution License("CDDL") (collectively, the
   14.23 +"License"). You may not use this file except in compliance with the
   14.24 +License. You can obtain a copy of the License at
   14.25 +http://www.netbeans.org/cddl-gplv2.html
   14.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   14.27 +specific language governing permissions and limitations under the
   14.28 +License.  When distributing the software, include this License Header
   14.29 +Notice in each file and include the License file at
   14.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   14.31 +particular file as subject to the "Classpath" exception as provided
   14.32 +by Sun in the GPL Version 2 section of the License file that
   14.33 +accompanied this code. If applicable, add the following below the
   14.34 +License Header, with the fields enclosed by brackets [] replaced by
   14.35 +your own identifying information:
   14.36  "Portions Copyrighted [year] [name of copyright owner]"
   14.37  
   14.38 +Contributor(s):
   14.39 +
   14.40  The Original Software is NetBeans. The Initial Developer of the Original
   14.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   14.42  Microsystems, Inc. All Rights Reserved.
   14.43 +
   14.44 +If you wish your version of this file to be governed by only the CDDL
   14.45 +or only the GPL Version 2, indicate your decision by adding
   14.46 +"[Contributor] elects to include this software in this distribution
   14.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   14.48 +single choice of license, a recipient has the option to distribute
   14.49 +your version of this file under either the CDDL, the GPL Version 2 or
   14.50 +to extend the choice of license to its licensees as provided above.
   14.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   14.52 +Version 2 license, then the option applies only if the new code is
   14.53 +made subject to such option by the copyright holder.
   14.54  -->
   14.55  
   14.56  
    15.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletTLDTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    15.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletTLDTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    15.3 @@ -1,21 +1,44 @@
    15.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    15.5  <!--
    15.6 -The contents of this file are subject to the terms of the Common Development
    15.7 -and Distribution License (the License). You may not use this file except in
    15.8 -compliance with the License.
    15.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   15.10  
   15.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   15.12 -or http://www.netbeans.org/cddl.txt.
   15.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   15.14  
   15.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   15.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   15.17 -If applicable, add the following below the CDDL Header, with the fields
   15.18 -enclosed by brackets [] replaced by your own identifying information:
   15.19 +
   15.20 +The contents of this file are subject to the terms of either the GNU
   15.21 +General Public License Version 2 only ("GPL") or the Common
   15.22 +Development and Distribution License("CDDL") (collectively, the
   15.23 +"License"). You may not use this file except in compliance with the
   15.24 +License. You can obtain a copy of the License at
   15.25 +http://www.netbeans.org/cddl-gplv2.html
   15.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   15.27 +specific language governing permissions and limitations under the
   15.28 +License.  When distributing the software, include this License Header
   15.29 +Notice in each file and include the License file at
   15.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   15.31 +particular file as subject to the "Classpath" exception as provided
   15.32 +by Sun in the GPL Version 2 section of the License file that
   15.33 +accompanied this code. If applicable, add the following below the
   15.34 +License Header, with the fields enclosed by brackets [] replaced by
   15.35 +your own identifying information:
   15.36  "Portions Copyrighted [year] [name of copyright owner]"
   15.37  
   15.38 +Contributor(s):
   15.39 +
   15.40  The Original Software is NetBeans. The Initial Developer of the Original
   15.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   15.42  Microsystems, Inc. All Rights Reserved.
   15.43 +
   15.44 +If you wish your version of this file to be governed by only the CDDL
   15.45 +or only the GPL Version 2, indicate your decision by adding
   15.46 +"[Contributor] elects to include this software in this distribution
   15.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   15.48 +single choice of license, a recipient has the option to distribute
   15.49 +your version of this file under either the CDDL, the GPL Version 2 or
   15.50 +to extend the choice of license to its licensees as provided above.
   15.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   15.52 +Version 2 license, then the option applies only if the new code is
   15.53 +made subject to such option by the copyright holder.
   15.54  -->
   15.55  
   15.56  
    16.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    16.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    16.3 @@ -1,21 +1,44 @@
    16.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    16.5  <!--
    16.6 -The contents of this file are subject to the terms of the Common Development
    16.7 -and Distribution License (the License). You may not use this file except in
    16.8 -compliance with the License.
    16.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   16.10  
   16.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   16.12 -or http://www.netbeans.org/cddl.txt.
   16.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   16.14  
   16.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   16.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   16.17 -If applicable, add the following below the CDDL Header, with the fields
   16.18 -enclosed by brackets [] replaced by your own identifying information:
   16.19 +
   16.20 +The contents of this file are subject to the terms of either the GNU
   16.21 +General Public License Version 2 only ("GPL") or the Common
   16.22 +Development and Distribution License("CDDL") (collectively, the
   16.23 +"License"). You may not use this file except in compliance with the
   16.24 +License. You can obtain a copy of the License at
   16.25 +http://www.netbeans.org/cddl-gplv2.html
   16.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   16.27 +specific language governing permissions and limitations under the
   16.28 +License.  When distributing the software, include this License Header
   16.29 +Notice in each file and include the License file at
   16.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   16.31 +particular file as subject to the "Classpath" exception as provided
   16.32 +by Sun in the GPL Version 2 section of the License file that
   16.33 +accompanied this code. If applicable, add the following below the
   16.34 +License Header, with the fields enclosed by brackets [] replaced by
   16.35 +your own identifying information:
   16.36  "Portions Copyrighted [year] [name of copyright owner]"
   16.37  
   16.38 +Contributor(s):
   16.39 +
   16.40  The Original Software is NetBeans. The Initial Developer of the Original
   16.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   16.42  Microsystems, Inc. All Rights Reserved.
   16.43 +
   16.44 +If you wish your version of this file to be governed by only the CDDL
   16.45 +or only the GPL Version 2, indicate your decision by adding
   16.46 +"[Contributor] elects to include this software in this distribution
   16.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   16.48 +single choice of license, a recipient has the option to distribute
   16.49 +your version of this file under either the CDDL, the GPL Version 2 or
   16.50 +to extend the choice of license to its licensees as provided above.
   16.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   16.52 +Version 2 license, then the option applies only if the new code is
   16.53 +made subject to such option by the copyright holder.
   16.54  -->
   16.55  
   16.56  
    17.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletWebTemplateHelp.html	Wed Oct 03 17:44:32 2007 +0000
    17.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/descriptions/portletWebTemplateHelp.html	Thu Oct 04 03:26:59 2007 +0000
    17.3 @@ -1,21 +1,44 @@
    17.4  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    17.5  <!--
    17.6 -The contents of this file are subject to the terms of the Common Development
    17.7 -and Distribution License (the License). You may not use this file except in
    17.8 -compliance with the License.
    17.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   17.10  
   17.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   17.12 -or http://www.netbeans.org/cddl.txt.
   17.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   17.14  
   17.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   17.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   17.17 -If applicable, add the following below the CDDL Header, with the fields
   17.18 -enclosed by brackets [] replaced by your own identifying information:
   17.19 +
   17.20 +The contents of this file are subject to the terms of either the GNU
   17.21 +General Public License Version 2 only ("GPL") or the Common
   17.22 +Development and Distribution License("CDDL") (collectively, the
   17.23 +"License"). You may not use this file except in compliance with the
   17.24 +License. You can obtain a copy of the License at
   17.25 +http://www.netbeans.org/cddl-gplv2.html
   17.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   17.27 +specific language governing permissions and limitations under the
   17.28 +License.  When distributing the software, include this License Header
   17.29 +Notice in each file and include the License file at
   17.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   17.31 +particular file as subject to the "Classpath" exception as provided
   17.32 +by Sun in the GPL Version 2 section of the License file that
   17.33 +accompanied this code. If applicable, add the following below the
   17.34 +License Header, with the fields enclosed by brackets [] replaced by
   17.35 +your own identifying information:
   17.36  "Portions Copyrighted [year] [name of copyright owner]"
   17.37  
   17.38 +Contributor(s):
   17.39 +
   17.40  The Original Software is NetBeans. The Initial Developer of the Original
   17.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   17.42  Microsystems, Inc. All Rights Reserved.
   17.43 +
   17.44 +If you wish your version of this file to be governed by only the CDDL
   17.45 +or only the GPL Version 2, indicate your decision by adding
   17.46 +"[Contributor] elects to include this software in this distribution
   17.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   17.48 +single choice of license, a recipient has the option to distribute
   17.49 +your version of this file under either the CDDL, the GPL Version 2 or
   17.50 +to extend the choice of license to its licensees as provided above.
   17.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   17.52 +Version 2 license, then the option applies only if the new code is
   17.53 +made subject to such option by the copyright holder.
   17.54  -->
   17.55  
   17.56  
    18.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/resources/Bundle.properties	Wed Oct 03 17:44:32 2007 +0000
    18.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/resources/templates/resources/Bundle.properties	Thu Oct 04 03:26:59 2007 +0000
    18.3 @@ -1,18 +1,45 @@
    18.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    18.5  #
    18.6 -#                 Sun Public License Notice
    18.7 -# 
    18.8 -# The contents of this file are subject to the Sun Public License
    18.9 -# Version 1.0 (the "License"). You may not use this file except in
   18.10 -# compliance with the License. A copy of the License is available at
   18.11 -# http://www.sun.com/
   18.12 -# 
   18.13 -# The Original Code is NetBeans. The Initial Developer of the Original
   18.14 -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
   18.15 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   18.16 +#
   18.17 +# The contents of this file are subject to the terms of either the GNU
   18.18 +# General Public License Version 2 only ("GPL") or the Common
   18.19 +# Development and Distribution License("CDDL") (collectively, the
   18.20 +# "License"). You may not use this file except in compliance with the
   18.21 +# License. You can obtain a copy of the License at
   18.22 +# http://www.netbeans.org/cddl-gplv2.html
   18.23 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   18.24 +# specific language governing permissions and limitations under the
   18.25 +# License.  When distributing the software, include this License Header
   18.26 +# Notice in each file and include the License file at
   18.27 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   18.28 +# particular file as subject to the "Classpath" exception as provided
   18.29 +# by Sun in the GPL Version 2 section of the License file that
   18.30 +# accompanied this code. If applicable, add the following below the
   18.31 +# License Header, with the fields enclosed by brackets [] replaced by
   18.32 +# your own identifying information:
   18.33 +# "Portions Copyrighted [year] [name of copyright owner]"
   18.34 +#
   18.35 +# Contributor(s):
   18.36 +#
   18.37 +# The Original Software is NetBeans. The Initial Developer of the Original
   18.38 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   18.39  # Microsystems, Inc. All Rights Reserved.
   18.40  #
   18.41 +# If you wish your version of this file to be governed by only the CDDL
   18.42 +# or only the GPL Version 2, indicate your decision by adding
   18.43 +# "[Contributor] elects to include this software in this distribution
   18.44 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
   18.45 +# single choice of license, a recipient has the option to distribute
   18.46 +# your version of this file under either the CDDL, the GPL Version 2 or
   18.47 +# to extend the choice of license to its licensees as provided above.
   18.48 +# However, if you add GPL Version 2 code and therefore, elected the GPL
   18.49 +# Version 2 license, then the option applies only if the new code is
   18.50 +# made subject to such option by the copyright holder.
   18.51 +#
   18.52  Templates/JsfPortlet/portletWeb.xml=Portlet Web Application Configuration
   18.53  Templates/JsfPortlet/portlet.xml=Portlet Deployment Descriptor
   18.54  Templates/JsfPortlet/faces.config.xml=Java Server Faces Configuration for JSF-Portlet Bridge
   18.55  Templates/JsfPortlet/portlet.tld=JSR-168 Portlet Tag Library
   18.56 -Templates/JsfPortlet/PortletPage.jsp=Portlet Page 
   18.57 +Templates/JsfPortlet/PortletPage.jsp=Portlet Page
   18.58  Templates/JsfPortlet/PortletPageFragment.jspf=Portlet Page Fragment
    19.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/Bundle.properties	Wed Oct 03 17:44:32 2007 +0000
    19.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/Bundle.properties	Thu Oct 04 03:26:59 2007 +0000
    19.3 @@ -1,15 +1,41 @@
    19.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    19.5  #
    19.6 -#                 Sun Public License Notice
    19.7 -# 
    19.8 -# The contents of this file are subject to the Sun Public License
    19.9 -# Version 1.0 (the "License"). You may not use this file except in
   19.10 -# compliance with the License. A copy of the License is available at
   19.11 -# http://www.sun.com/
   19.12 -# 
   19.13 -# The Original Code is NetBeans. The Initial Developer of the Original
   19.14 -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
   19.15 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   19.16 +#
   19.17 +# The contents of this file are subject to the terms of either the GNU
   19.18 +# General Public License Version 2 only ("GPL") or the Common
   19.19 +# Development and Distribution License("CDDL") (collectively, the
   19.20 +# "License"). You may not use this file except in compliance with the
   19.21 +# License. You can obtain a copy of the License at
   19.22 +# http://www.netbeans.org/cddl-gplv2.html
   19.23 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   19.24 +# specific language governing permissions and limitations under the
   19.25 +# License.  When distributing the software, include this License Header
   19.26 +# Notice in each file and include the License file at
   19.27 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   19.28 +# particular file as subject to the "Classpath" exception as provided
   19.29 +# by Sun in the GPL Version 2 section of the License file that
   19.30 +# accompanied this code. If applicable, add the following below the
   19.31 +# License Header, with the fields enclosed by brackets [] replaced by
   19.32 +# your own identifying information:
   19.33 +# "Portions Copyrighted [year] [name of copyright owner]"
   19.34 +#
   19.35 +# Contributor(s):
   19.36 +#
   19.37 +# The Original Software is NetBeans. The Initial Developer of the Original
   19.38 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   19.39  # Microsystems, Inc. All Rights Reserved.
   19.40  #
   19.41 +# If you wish your version of this file to be governed by only the CDDL
   19.42 +# or only the GPL Version 2, indicate your decision by adding
   19.43 +# "[Contributor] elects to include this software in this distribution
   19.44 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
   19.45 +# single choice of license, a recipient has the option to distribute
   19.46 +# your version of this file under either the CDDL, the GPL Version 2 or
   19.47 +# to extend the choice of license to its licensees as provided above.
   19.48 +# However, if you add GPL Version 2 code and therefore, elected the GPL
   19.49 +# Version 2 license, then the option applies only if the new code is
   19.50 +# made subject to such option by the copyright holder.
   19.51  
   19.52  #PanelProjectLocationVisual
   19.53  TXT_NewWebApp=Portlet
    20.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/FileChooser.java	Wed Oct 03 17:44:32 2007 +0000
    20.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/FileChooser.java	Thu Oct 04 03:26:59 2007 +0000
    20.3 @@ -1,10 +1,45 @@
    20.4  /*
    20.5 - * {START_JAVA_COPYRIGHT_NOTICE
    20.6 - * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
    20.7 - * Use is subject to license terms.
    20.8 - * END_COPYRIGHT_NOTICE}
    20.9 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   20.10 + *
   20.11 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   20.12 + *
   20.13 + * The contents of this file are subject to the terms of either the GNU
   20.14 + * General Public License Version 2 only ("GPL") or the Common
   20.15 + * Development and Distribution License("CDDL") (collectively, the
   20.16 + * "License"). You may not use this file except in compliance with the
   20.17 + * License. You can obtain a copy of the License at
   20.18 + * http://www.netbeans.org/cddl-gplv2.html
   20.19 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   20.20 + * specific language governing permissions and limitations under the
   20.21 + * License.  When distributing the software, include this License Header
   20.22 + * Notice in each file and include the License file at
   20.23 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   20.24 + * particular file as subject to the "Classpath" exception as provided
   20.25 + * by Sun in the GPL Version 2 section of the License file that
   20.26 + * accompanied this code. If applicable, add the following below the
   20.27 + * License Header, with the fields enclosed by brackets [] replaced by
   20.28 + * your own identifying information:
   20.29 + * "Portions Copyrighted [year] [name of copyright owner]"
   20.30 + *
   20.31 + * Contributor(s):
   20.32 + *
   20.33 + * The Original Software is NetBeans. The Initial Developer of the Original
   20.34 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   20.35 + * Microsystems, Inc. All Rights Reserved.
   20.36 + *
   20.37 + * If you wish your version of this file to be governed by only the CDDL
   20.38 + * or only the GPL Version 2, indicate your decision by adding
   20.39 + * "[Contributor] elects to include this software in this distribution
   20.40 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   20.41 + * single choice of license, a recipient has the option to distribute
   20.42 + * your version of this file under either the CDDL, the GPL Version 2 or
   20.43 + * to extend the choice of license to its licensees as provided above.
   20.44 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   20.45 + * Version 2 license, then the option applies only if the new code is
   20.46 + * made subject to such option by the copyright holder.
   20.47   */
   20.48  
   20.49 +
   20.50  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   20.51  
   20.52  import org.openide.filesystems.FileUtil;
    21.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/FoldersListSettings.java	Wed Oct 03 17:44:32 2007 +0000
    21.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/FoldersListSettings.java	Thu Oct 04 03:26:59 2007 +0000
    21.3 @@ -1,10 +1,45 @@
    21.4  /*
    21.5 - * {START_JAVA_COPYRIGHT_NOTICE
    21.6 - * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
    21.7 - * Use is subject to license terms.
    21.8 - * END_COPYRIGHT_NOTICE}
    21.9 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   21.10 + *
   21.11 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   21.12 + *
   21.13 + * The contents of this file are subject to the terms of either the GNU
   21.14 + * General Public License Version 2 only ("GPL") or the Common
   21.15 + * Development and Distribution License("CDDL") (collectively, the
   21.16 + * "License"). You may not use this file except in compliance with the
   21.17 + * License. You can obtain a copy of the License at
   21.18 + * http://www.netbeans.org/cddl-gplv2.html
   21.19 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   21.20 + * specific language governing permissions and limitations under the
   21.21 + * License.  When distributing the software, include this License Header
   21.22 + * Notice in each file and include the License file at
   21.23 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   21.24 + * particular file as subject to the "Classpath" exception as provided
   21.25 + * by Sun in the GPL Version 2 section of the License file that
   21.26 + * accompanied this code. If applicable, add the following below the
   21.27 + * License Header, with the fields enclosed by brackets [] replaced by
   21.28 + * your own identifying information:
   21.29 + * "Portions Copyrighted [year] [name of copyright owner]"
   21.30 + *
   21.31 + * Contributor(s):
   21.32 + *
   21.33 + * The Original Software is NetBeans. The Initial Developer of the Original
   21.34 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   21.35 + * Microsystems, Inc. All Rights Reserved.
   21.36 + *
   21.37 + * If you wish your version of this file to be governed by only the CDDL
   21.38 + * or only the GPL Version 2, indicate your decision by adding
   21.39 + * "[Contributor] elects to include this software in this distribution
   21.40 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   21.41 + * single choice of license, a recipient has the option to distribute
   21.42 + * your version of this file under either the CDDL, the GPL Version 2 or
   21.43 + * to extend the choice of license to its licensees as provided above.
   21.44 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   21.45 + * Version 2 license, then the option applies only if the new code is
   21.46 + * made subject to such option by the copyright holder.
   21.47   */
   21.48  
   21.49 +
   21.50  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   21.51  
   21.52  import java.io.File;
    22.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelConfigureProject.java	Wed Oct 03 17:44:32 2007 +0000
    22.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelConfigureProject.java	Thu Oct 04 03:26:59 2007 +0000
    22.3 @@ -1,11 +1,46 @@
    22.4  /*
    22.5 - * {START_JAVA_COPYRIGHT_NOTICE
    22.6 - * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
    22.7 - * Use is subject to license terms.
    22.8 - * END_COPYRIGHT_NOTICE}
    22.9 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   22.10 + *
   22.11 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   22.12 + *
   22.13 + * The contents of this file are subject to the terms of either the GNU
   22.14 + * General Public License Version 2 only ("GPL") or the Common
   22.15 + * Development and Distribution License("CDDL") (collectively, the
   22.16 + * "License"). You may not use this file except in compliance with the
   22.17 + * License. You can obtain a copy of the License at
   22.18 + * http://www.netbeans.org/cddl-gplv2.html
   22.19 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   22.20 + * specific language governing permissions and limitations under the
   22.21 + * License.  When distributing the software, include this License Header
   22.22 + * Notice in each file and include the License file at
   22.23 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   22.24 + * particular file as subject to the "Classpath" exception as provided
   22.25 + * by Sun in the GPL Version 2 section of the License file that
   22.26 + * accompanied this code. If applicable, add the following below the
   22.27 + * License Header, with the fields enclosed by brackets [] replaced by
   22.28 + * your own identifying information:
   22.29 + * "Portions Copyrighted [year] [name of copyright owner]"
   22.30 + *
   22.31 + * Contributor(s):
   22.32 + *
   22.33 + * The Original Software is NetBeans. The Initial Developer of the Original
   22.34 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   22.35 + * Microsystems, Inc. All Rights Reserved.
   22.36 + *
   22.37 + * If you wish your version of this file to be governed by only the CDDL
   22.38 + * or only the GPL Version 2, indicate your decision by adding
   22.39 + * "[Contributor] elects to include this software in this distribution
   22.40 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   22.41 + * single choice of license, a recipient has the option to distribute
   22.42 + * your version of this file under either the CDDL, the GPL Version 2 or
   22.43 + * to extend the choice of license to its licensees as provided above.
   22.44 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   22.45 + * Version 2 license, then the option applies only if the new code is
   22.46 + * made subject to such option by the copyright holder.
   22.47   */
   22.48  
   22.49  
   22.50 +
   22.51  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   22.52  
   22.53  import java.awt.Component;
    23.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelConfigureProjectVisual.java	Wed Oct 03 17:44:32 2007 +0000
    23.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelConfigureProjectVisual.java	Thu Oct 04 03:26:59 2007 +0000
    23.3 @@ -1,14 +1,42 @@
    23.4  /*
    23.5 - *                 Sun Public License Notice
    23.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    23.7   *
    23.8 - * The contents of this file are subject to the Sun Public License
    23.9 - * Version 1.0 (the "License"). You may not use this file except in
   23.10 - * compliance with the License. A copy of the License is available at
   23.11 - * http://www.sun.com/
   23.12 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   23.13   *
   23.14 - * The Original Code is NetBeans. The Initial Developer of the Original
   23.15 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
   23.16 + * The contents of this file are subject to the terms of either the GNU
   23.17 + * General Public License Version 2 only ("GPL") or the Common
   23.18 + * Development and Distribution License("CDDL") (collectively, the
   23.19 + * "License"). You may not use this file except in compliance with the
   23.20 + * License. You can obtain a copy of the License at
   23.21 + * http://www.netbeans.org/cddl-gplv2.html
   23.22 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   23.23 + * specific language governing permissions and limitations under the
   23.24 + * License.  When distributing the software, include this License Header
   23.25 + * Notice in each file and include the License file at
   23.26 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   23.27 + * particular file as subject to the "Classpath" exception as provided
   23.28 + * by Sun in the GPL Version 2 section of the License file that
   23.29 + * accompanied this code. If applicable, add the following below the
   23.30 + * License Header, with the fields enclosed by brackets [] replaced by
   23.31 + * your own identifying information:
   23.32 + * "Portions Copyrighted [year] [name of copyright owner]"
   23.33 + *
   23.34 + * Contributor(s):
   23.35 + *
   23.36 + * The Original Software is NetBeans. The Initial Developer of the Original
   23.37 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   23.38   * Microsystems, Inc. All Rights Reserved.
   23.39 + *
   23.40 + * If you wish your version of this file to be governed by only the CDDL
   23.41 + * or only the GPL Version 2, indicate your decision by adding
   23.42 + * "[Contributor] elects to include this software in this distribution
   23.43 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   23.44 + * single choice of license, a recipient has the option to distribute
   23.45 + * your version of this file under either the CDDL, the GPL Version 2 or
   23.46 + * to extend the choice of license to its licensees as provided above.
   23.47 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   23.48 + * Version 2 license, then the option applies only if the new code is
   23.49 + * made subject to such option by the copyright holder.
   23.50   */
   23.51  
   23.52  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
    24.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelProjectLocationVisual.java	Wed Oct 03 17:44:32 2007 +0000
    24.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PanelProjectLocationVisual.java	Thu Oct 04 03:26:59 2007 +0000
    24.3 @@ -1,16 +1,45 @@
    24.4  /*
    24.5 - *                 Sun Public License Notice
    24.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    24.7   *
    24.8 - * The contents of this file are subject to the Sun Public License
    24.9 - * Version 1.0 (the "License"). You may not use this file except in
   24.10 - * compliance with the License. A copy of the License is available at
   24.11 - * http://www.sun.com/
   24.12 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   24.13   *
   24.14 - * The Original Code is NetBeans. The Initial Developer of the Original
   24.15 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
   24.16 + * The contents of this file are subject to the terms of either the GNU
   24.17 + * General Public License Version 2 only ("GPL") or the Common
   24.18 + * Development and Distribution License("CDDL") (collectively, the
   24.19 + * "License"). You may not use this file except in compliance with the
   24.20 + * License. You can obtain a copy of the License at
   24.21 + * http://www.netbeans.org/cddl-gplv2.html
   24.22 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   24.23 + * specific language governing permissions and limitations under the
   24.24 + * License.  When distributing the software, include this License Header
   24.25 + * Notice in each file and include the License file at
   24.26 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   24.27 + * particular file as subject to the "Classpath" exception as provided
   24.28 + * by Sun in the GPL Version 2 section of the License file that
   24.29 + * accompanied this code. If applicable, add the following below the
   24.30 + * License Header, with the fields enclosed by brackets [] replaced by
   24.31 + * your own identifying information:
   24.32 + * "Portions Copyrighted [year] [name of copyright owner]"
   24.33 + *
   24.34 + * Contributor(s):
   24.35 + *
   24.36 + * The Original Software is NetBeans. The Initial Developer of the Original
   24.37 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   24.38   * Microsystems, Inc. All Rights Reserved.
   24.39 + *
   24.40 + * If you wish your version of this file to be governed by only the CDDL
   24.41 + * or only the GPL Version 2, indicate your decision by adding
   24.42 + * "[Contributor] elects to include this software in this distribution
   24.43 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   24.44 + * single choice of license, a recipient has the option to distribute
   24.45 + * your version of this file under either the CDDL, the GPL Version 2 or
   24.46 + * to extend the choice of license to its licensees as provided above.
   24.47 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   24.48 + * Version 2 license, then the option applies only if the new code is
   24.49 + * made subject to such option by the copyright holder.
   24.50   */
   24.51  
   24.52 +
   24.53  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   24.54  
   24.55  
    25.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectDeployDescriptorVisual.java	Wed Oct 03 17:44:32 2007 +0000
    25.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectDeployDescriptorVisual.java	Thu Oct 04 03:26:59 2007 +0000
    25.3 @@ -1,3 +1,44 @@
    25.4 +/*
    25.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    25.6 + *
    25.7 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    25.8 + *
    25.9 + * The contents of this file are subject to the terms of either the GNU
   25.10 + * General Public License Version 2 only ("GPL") or the Common
   25.11 + * Development and Distribution License("CDDL") (collectively, the
   25.12 + * "License"). You may not use this file except in compliance with the
   25.13 + * License. You can obtain a copy of the License at
   25.14 + * http://www.netbeans.org/cddl-gplv2.html
   25.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   25.16 + * specific language governing permissions and limitations under the
   25.17 + * License.  When distributing the software, include this License Header
   25.18 + * Notice in each file and include the License file at
   25.19 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   25.20 + * particular file as subject to the "Classpath" exception as provided
   25.21 + * by Sun in the GPL Version 2 section of the License file that
   25.22 + * accompanied this code. If applicable, add the following below the
   25.23 + * License Header, with the fields enclosed by brackets [] replaced by
   25.24 + * your own identifying information:
   25.25 + * "Portions Copyrighted [year] [name of copyright owner]"
   25.26 + *
   25.27 + * Contributor(s):
   25.28 + *
   25.29 + * The Original Software is NetBeans. The Initial Developer of the Original
   25.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   25.31 + * Microsystems, Inc. All Rights Reserved.
   25.32 + *
   25.33 + * If you wish your version of this file to be governed by only the CDDL
   25.34 + * or only the GPL Version 2, indicate your decision by adding
   25.35 + * "[Contributor] elects to include this software in this distribution
   25.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   25.37 + * single choice of license, a recipient has the option to distribute
   25.38 + * your version of this file under either the CDDL, the GPL Version 2 or
   25.39 + * to extend the choice of license to its licensees as provided above.
   25.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   25.41 + * Version 2 license, then the option applies only if the new code is
   25.42 + * made subject to such option by the copyright holder.
   25.43 + */
   25.44 +
   25.45  /*
   25.46   * PortletProjectDeployDescriptorVisual.java
   25.47   *
    26.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectDeploymentDescriptor.java	Wed Oct 03 17:44:32 2007 +0000
    26.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectDeploymentDescriptor.java	Thu Oct 04 03:26:59 2007 +0000
    26.3 @@ -1,3 +1,44 @@
    26.4 +/*
    26.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    26.6 + *
    26.7 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    26.8 + *
    26.9 + * The contents of this file are subject to the terms of either the GNU
   26.10 + * General Public License Version 2 only ("GPL") or the Common
   26.11 + * Development and Distribution License("CDDL") (collectively, the
   26.12 + * "License"). You may not use this file except in compliance with the
   26.13 + * License. You can obtain a copy of the License at
   26.14 + * http://www.netbeans.org/cddl-gplv2.html
   26.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   26.16 + * specific language governing permissions and limitations under the
   26.17 + * License.  When distributing the software, include this License Header
   26.18 + * Notice in each file and include the License file at
   26.19 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   26.20 + * particular file as subject to the "Classpath" exception as provided
   26.21 + * by Sun in the GPL Version 2 section of the License file that
   26.22 + * accompanied this code. If applicable, add the following below the
   26.23 + * License Header, with the fields enclosed by brackets [] replaced by
   26.24 + * your own identifying information:
   26.25 + * "Portions Copyrighted [year] [name of copyright owner]"
   26.26 + *
   26.27 + * Contributor(s):
   26.28 + *
   26.29 + * The Original Software is NetBeans. The Initial Developer of the Original
   26.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   26.31 + * Microsystems, Inc. All Rights Reserved.
   26.32 + *
   26.33 + * If you wish your version of this file to be governed by only the CDDL
   26.34 + * or only the GPL Version 2, indicate your decision by adding
   26.35 + * "[Contributor] elects to include this software in this distribution
   26.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   26.37 + * single choice of license, a recipient has the option to distribute
   26.38 + * your version of this file under either the CDDL, the GPL Version 2 or
   26.39 + * to extend the choice of license to its licensees as provided above.
   26.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   26.41 + * Version 2 license, then the option applies only if the new code is
   26.42 + * made subject to such option by the copyright holder.
   26.43 + */
   26.44 +
   26.45  /*
   26.46   * PortletProjectDeploymentDescriptor.java
   26.47   *
    27.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectWizardIterator.java	Wed Oct 03 17:44:32 2007 +0000
    27.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletProjectWizardIterator.java	Thu Oct 04 03:26:59 2007 +0000
    27.3 @@ -1,11 +1,45 @@
    27.4  /*
    27.5 - * {START_JAVA_COPYRIGHT_NOTICE
    27.6 - * Copyright 2002-2005 Sun Microsystems, Inc. All rights reserved.
    27.7 - * SUN PROPRIETARY/CONFIDENTIAL.
    27.8 - * Use is subject to license terms.
    27.9 - * END_COPYRIGHT_NOTICE}
   27.10 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   27.11 + *
   27.12 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   27.13 + *
   27.14 + * The contents of this file are subject to the terms of either the GNU
   27.15 + * General Public License Version 2 only ("GPL") or the Common
   27.16 + * Development and Distribution License("CDDL") (collectively, the
   27.17 + * "License"). You may not use this file except in compliance with the
   27.18 + * License. You can obtain a copy of the License at
   27.19 + * http://www.netbeans.org/cddl-gplv2.html
   27.20 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   27.21 + * specific language governing permissions and limitations under the
   27.22 + * License.  When distributing the software, include this License Header
   27.23 + * Notice in each file and include the License file at
   27.24 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   27.25 + * particular file as subject to the "Classpath" exception as provided
   27.26 + * by Sun in the GPL Version 2 section of the License file that
   27.27 + * accompanied this code. If applicable, add the following below the
   27.28 + * License Header, with the fields enclosed by brackets [] replaced by
   27.29 + * your own identifying information:
   27.30 + * "Portions Copyrighted [year] [name of copyright owner]"
   27.31 + *
   27.32 + * Contributor(s):
   27.33 + *
   27.34 + * The Original Software is NetBeans. The Initial Developer of the Original
   27.35 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   27.36 + * Microsystems, Inc. All Rights Reserved.
   27.37 + *
   27.38 + * If you wish your version of this file to be governed by only the CDDL
   27.39 + * or only the GPL Version 2, indicate your decision by adding
   27.40 + * "[Contributor] elects to include this software in this distribution
   27.41 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   27.42 + * single choice of license, a recipient has the option to distribute
   27.43 + * your version of this file under either the CDDL, the GPL Version 2 or
   27.44 + * to extend the choice of license to its licensees as provided above.
   27.45 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   27.46 + * Version 2 license, then the option applies only if the new code is
   27.47 + * made subject to such option by the copyright holder.
   27.48   */
   27.49  
   27.50 +
   27.51  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   27.52  
   27.53  import org.netbeans.modules.visualweb.project.jsf.api.JsfProjectConstants;
    28.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletWizardProperties.java	Wed Oct 03 17:44:32 2007 +0000
    28.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/PortletWizardProperties.java	Thu Oct 04 03:26:59 2007 +0000
    28.3 @@ -1,11 +1,45 @@
    28.4  /*
    28.5 - * {START_JAVA_COPYRIGHT_NOTICE
    28.6 - * Copyright 2002-2005 Sun Microsystems, Inc. All rights reserved.
    28.7 - * SUN PROPRIETARY/CONFIDENTIAL.
    28.8 - * Use is subject to license terms.
    28.9 - * END_COPYRIGHT_NOTICE}
   28.10 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   28.11 + *
   28.12 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   28.13 + *
   28.14 + * The contents of this file are subject to the terms of either the GNU
   28.15 + * General Public License Version 2 only ("GPL") or the Common
   28.16 + * Development and Distribution License("CDDL") (collectively, the
   28.17 + * "License"). You may not use this file except in compliance with the
   28.18 + * License. You can obtain a copy of the License at
   28.19 + * http://www.netbeans.org/cddl-gplv2.html
   28.20 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   28.21 + * specific language governing permissions and limitations under the
   28.22 + * License.  When distributing the software, include this License Header
   28.23 + * Notice in each file and include the License file at
   28.24 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   28.25 + * particular file as subject to the "Classpath" exception as provided
   28.26 + * by Sun in the GPL Version 2 section of the License file that
   28.27 + * accompanied this code. If applicable, add the following below the
   28.28 + * License Header, with the fields enclosed by brackets [] replaced by
   28.29 + * your own identifying information:
   28.30 + * "Portions Copyrighted [year] [name of copyright owner]"
   28.31 + *
   28.32 + * Contributor(s):
   28.33 + *
   28.34 + * The Original Software is NetBeans. The Initial Developer of the Original
   28.35 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   28.36 + * Microsystems, Inc. All Rights Reserved.
   28.37 + *
   28.38 + * If you wish your version of this file to be governed by only the CDDL
   28.39 + * or only the GPL Version 2, indicate your decision by adding
   28.40 + * "[Contributor] elects to include this software in this distribution
   28.41 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   28.42 + * single choice of license, a recipient has the option to distribute
   28.43 + * your version of this file under either the CDDL, the GPL Version 2 or
   28.44 + * to extend the choice of license to its licensees as provided above.
   28.45 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   28.46 + * Version 2 license, then the option applies only if the new code is
   28.47 + * made subject to such option by the copyright holder.
   28.48   */
   28.49  
   28.50 +
   28.51  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   28.52  
   28.53  /**
    29.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/SettingsPanel.java	Wed Oct 03 17:44:32 2007 +0000
    29.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/SettingsPanel.java	Thu Oct 04 03:26:59 2007 +0000
    29.3 @@ -1,11 +1,46 @@
    29.4  /*
    29.5 - * {START_JAVA_COPYRIGHT_NOTICE
    29.6 - * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
    29.7 - * Use is subject to license terms.
    29.8 - * END_COPYRIGHT_NOTICE}
    29.9 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   29.10 + *
   29.11 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   29.12 + *
   29.13 + * The contents of this file are subject to the terms of either the GNU
   29.14 + * General Public License Version 2 only ("GPL") or the Common
   29.15 + * Development and Distribution License("CDDL") (collectively, the
   29.16 + * "License"). You may not use this file except in compliance with the
   29.17 + * License. You can obtain a copy of the License at
   29.18 + * http://www.netbeans.org/cddl-gplv2.html
   29.19 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   29.20 + * specific language governing permissions and limitations under the
   29.21 + * License.  When distributing the software, include this License Header
   29.22 + * Notice in each file and include the License file at
   29.23 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   29.24 + * particular file as subject to the "Classpath" exception as provided
   29.25 + * by Sun in the GPL Version 2 section of the License file that
   29.26 + * accompanied this code. If applicable, add the following below the
   29.27 + * License Header, with the fields enclosed by brackets [] replaced by
   29.28 + * your own identifying information:
   29.29 + * "Portions Copyrighted [year] [name of copyright owner]"
   29.30 + *
   29.31 + * Contributor(s):
   29.32 + *
   29.33 + * The Original Software is NetBeans. The Initial Developer of the Original
   29.34 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   29.35 + * Microsystems, Inc. All Rights Reserved.
   29.36 + *
   29.37 + * If you wish your version of this file to be governed by only the CDDL
   29.38 + * or only the GPL Version 2, indicate your decision by adding
   29.39 + * "[Contributor] elects to include this software in this distribution
   29.40 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   29.41 + * single choice of license, a recipient has the option to distribute
   29.42 + * your version of this file under either the CDDL, the GPL Version 2 or
   29.43 + * to extend the choice of license to its licensees as provided above.
   29.44 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   29.45 + * Version 2 license, then the option applies only if the new code is
   29.46 + * made subject to such option by the copyright holder.
   29.47   */
   29.48  
   29.49  
   29.50 +
   29.51  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   29.52  
   29.53  import javax.swing.JPanel;
    30.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/Utils.java	Wed Oct 03 17:44:32 2007 +0000
    30.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/Utils.java	Thu Oct 04 03:26:59 2007 +0000
    30.3 @@ -1,11 +1,46 @@
    30.4  /*
    30.5 - * {START_JAVA_COPYRIGHT_NOTICE
    30.6 - * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
    30.7 - * Use is subject to license terms.
    30.8 - * END_COPYRIGHT_NOTICE}
    30.9 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   30.10 + *
   30.11 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   30.12 + *
   30.13 + * The contents of this file are subject to the terms of either the GNU
   30.14 + * General Public License Version 2 only ("GPL") or the Common
   30.15 + * Development and Distribution License("CDDL") (collectively, the
   30.16 + * "License"). You may not use this file except in compliance with the
   30.17 + * License. You can obtain a copy of the License at
   30.18 + * http://www.netbeans.org/cddl-gplv2.html
   30.19 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   30.20 + * specific language governing permissions and limitations under the
   30.21 + * License.  When distributing the software, include this License Header
   30.22 + * Notice in each file and include the License file at
   30.23 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   30.24 + * particular file as subject to the "Classpath" exception as provided
   30.25 + * by Sun in the GPL Version 2 section of the License file that
   30.26 + * accompanied this code. If applicable, add the following below the
   30.27 + * License Header, with the fields enclosed by brackets [] replaced by
   30.28 + * your own identifying information:
   30.29 + * "Portions Copyrighted [year] [name of copyright owner]"
   30.30 + *
   30.31 + * Contributor(s):
   30.32 + *
   30.33 + * The Original Software is NetBeans. The Initial Developer of the Original
   30.34 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   30.35 + * Microsystems, Inc. All Rights Reserved.
   30.36 + *
   30.37 + * If you wish your version of this file to be governed by only the CDDL
   30.38 + * or only the GPL Version 2, indicate your decision by adding
   30.39 + * "[Contributor] elects to include this software in this distribution
   30.40 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   30.41 + * single choice of license, a recipient has the option to distribute
   30.42 + * your version of this file under either the CDDL, the GPL Version 2 or
   30.43 + * to extend the choice of license to its licensees as provided above.
   30.44 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   30.45 + * Version 2 license, then the option applies only if the new code is
   30.46 + * made subject to such option by the copyright holder.
   30.47   */
   30.48  
   30.49  
   30.50 +
   30.51  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   30.52  
   30.53  import java.util.Vector;
    31.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/WizardProperties.java	Wed Oct 03 17:44:32 2007 +0000
    31.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/WizardProperties.java	Thu Oct 04 03:26:59 2007 +0000
    31.3 @@ -1,23 +1,52 @@
    31.4  /*
    31.5 - *                 Sun Public License Notice
    31.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    31.7   *
    31.8 - * The contents of this file are subject to the Sun Public License
    31.9 - * Version 1.0 (the "License"). You may not use this file except in
   31.10 - * compliance with the License. A copy of the License is available at
   31.11 - * http://www.sun.com/
   31.12 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   31.13   *
   31.14 - * The Original Code is NetBeans. The Initial Developer of the Original
   31.15 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
   31.16 + * The contents of this file are subject to the terms of either the GNU
   31.17 + * General Public License Version 2 only ("GPL") or the Common
   31.18 + * Development and Distribution License("CDDL") (collectively, the
   31.19 + * "License"). You may not use this file except in compliance with the
   31.20 + * License. You can obtain a copy of the License at
   31.21 + * http://www.netbeans.org/cddl-gplv2.html
   31.22 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   31.23 + * specific language governing permissions and limitations under the
   31.24 + * License.  When distributing the software, include this License Header
   31.25 + * Notice in each file and include the License file at
   31.26 + * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   31.27 + * particular file as subject to the "Classpath" exception as provided
   31.28 + * by Sun in the GPL Version 2 section of the License file that
   31.29 + * accompanied this code. If applicable, add the following below the
   31.30 + * License Header, with the fields enclosed by brackets [] replaced by
   31.31 + * your own identifying information:
   31.32 + * "Portions Copyrighted [year] [name of copyright owner]"
   31.33 + *
   31.34 + * Contributor(s):
   31.35 + *
   31.36 + * The Original Software is NetBeans. The Initial Developer of the Original
   31.37 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   31.38   * Microsystems, Inc. All Rights Reserved.
   31.39 + *
   31.40 + * If you wish your version of this file to be governed by only the CDDL
   31.41 + * or only the GPL Version 2, indicate your decision by adding
   31.42 + * "[Contributor] elects to include this software in this distribution
   31.43 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
   31.44 + * single choice of license, a recipient has the option to distribute
   31.45 + * your version of this file under either the CDDL, the GPL Version 2 or
   31.46 + * to extend the choice of license to its licensees as provided above.
   31.47 + * However, if you add GPL Version 2 code and therefore, elected the GPL
   31.48 + * Version 2 license, then the option applies only if the new code is
   31.49 + * made subject to such option by the copyright holder.
   31.50   */
   31.51  
   31.52 +
   31.53  package org.netbeans.modules.visualweb.project.jsfportlet.ui.wizard;
   31.54  
   31.55  public class WizardProperties {
   31.56      public static final String PROJECT_DIR = "projdir"; //NOI18N
   31.57      public static final String NAME = "name"; //NOI18N
   31.58      public static final String SOURCE_ROOT = "sourceRoot"; //NOI18N
   31.59 -    
   31.60 +
   31.61      public static final String SET_AS_MAIN = "setAsMain"; //NOI18N
   31.62      public static final String SERVER_INSTANCE_ID = "serverInstanceID"; //NOI18N
   31.63      public static final String J2EE_LEVEL = "j2eeLevel"; //NOI18N
    32.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/resources/Bundle.properties	Wed Oct 03 17:44:32 2007 +0000
    32.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/resources/Bundle.properties	Thu Oct 04 03:26:59 2007 +0000
    32.3 @@ -1,15 +1,41 @@
    32.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    32.5  #
    32.6 -#                 Sun Public License Notice
    32.7 -# 
    32.8 -# The contents of this file are subject to the Sun Public License
    32.9 -# Version 1.0 (the "License"). You may not use this file except in
   32.10 -# compliance with the License. A copy of the License is available at
   32.11 -# http://www.sun.com/
   32.12 -# 
   32.13 -# The Original Code is NetBeans. The Initial Developer of the Original
   32.14 -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
   32.15 +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   32.16 +#
   32.17 +# The contents of this file are subject to the terms of either the GNU
   32.18 +# General Public License Version 2 only ("GPL") or the Common
   32.19 +# Development and Distribution License("CDDL") (collectively, the
   32.20 +# "License"). You may not use this file except in compliance with the
   32.21 +# License. You can obtain a copy of the License at
   32.22 +# http://www.netbeans.org/cddl-gplv2.html
   32.23 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   32.24 +# specific language governing permissions and limitations under the
   32.25 +# License.  When distributing the software, include this License Header
   32.26 +# Notice in each file and include the License file at
   32.27 +# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   32.28 +# particular file as subject to the "Classpath" exception as provided
   32.29 +# by Sun in the GPL Version 2 section of the License file that
   32.30 +# accompanied this code. If applicable, add the following below the
   32.31 +# License Header, with the fields enclosed by brackets [] replaced by
   32.32 +# your own identifying information:
   32.33 +# "Portions Copyrighted [year] [name of copyright owner]"
   32.34 +#
   32.35 +# Contributor(s):
   32.36 +#
   32.37 +# The Original Software is NetBeans. The Initial Developer of the Original
   32.38 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   32.39  # Microsystems, Inc. All Rights Reserved.
   32.40  #
   32.41 +# If you wish your version of this file to be governed by only the CDDL
   32.42 +# or only the GPL Version 2, indicate your decision by adding
   32.43 +# "[Contributor] elects to include this software in this distribution
   32.44 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
   32.45 +# single choice of license, a recipient has the option to distribute
   32.46 +# your version of this file under either the CDDL, the GPL Version 2 or
   32.47 +# to extend the choice of license to its licensees as provided above.
   32.48 +# However, if you add GPL Version 2 code and therefore, elected the GPL
   32.49 +# Version 2 license, then the option applies only if the new code is
   32.50 +# made subject to such option by the copyright holder.
   32.51  
   32.52  #System file system
   32.53  Templates/Project/Web/portletProject.xml=JSR-168 JSF Portlet Project
    33.1 --- a/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/resources/PortletProject.html	Wed Oct 03 17:44:32 2007 +0000
    33.2 +++ b/visualweb/project/jsfportlet/src/org/netbeans/modules/visualweb/project/jsfportlet/ui/wizard/resources/PortletProject.html	Thu Oct 04 03:26:59 2007 +0000
    33.3 @@ -1,20 +1,43 @@
    33.4  <!--
    33.5 -The contents of this file are subject to the terms of the Common Development
    33.6 -and Distribution License (the License). You may not use this file except in
    33.7 -compliance with the License.
    33.8 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    33.9  
   33.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   33.11 -or http://www.netbeans.org/cddl.txt.
   33.12 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   33.13  
   33.14 -When distributing Covered Code, include this CDDL Header Notice in each file
   33.15 -and include the License file at http://www.netbeans.org/cddl.txt.
   33.16 -If applicable, add the following below the CDDL Header, with the fields
   33.17 -enclosed by brackets [] replaced by your own identifying information:
   33.18 +
   33.19 +The contents of this file are subject to the terms of either the GNU
   33.20 +General Public License Version 2 only ("GPL") or the Common
   33.21 +Development and Distribution License("CDDL") (collectively, the
   33.22 +"License"). You may not use this file except in compliance with the
   33.23 +License. You can obtain a copy of the License at
   33.24 +http://www.netbeans.org/cddl-gplv2.html
   33.25 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   33.26 +specific language governing permissions and limitations under the
   33.27 +License.  When distributing the software, include this License Header
   33.28 +Notice in each file and include the License file at
   33.29 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   33.30 +particular file as subject to the "Classpath" exception as provided
   33.31 +by Sun in the GPL Version 2 section of the License file that
   33.32 +accompanied this code. If applicable, add the following below the
   33.33 +License Header, with the fields enclosed by brackets [] replaced by
   33.34 +your own identifying information:
   33.35  "Portions Copyrighted [year] [name of copyright owner]"
   33.36  
   33.37 +Contributor(s):
   33.38 +
   33.39  The Original Software is NetBeans. The Initial Developer of the Original
   33.40  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   33.41  Microsystems, Inc. All Rights Reserved.
   33.42 +
   33.43 +If you wish your version of this file to be governed by only the CDDL
   33.44 +or only the GPL Version 2, indicate your decision by adding
   33.45 +"[Contributor] elects to include this software in this distribution
   33.46 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   33.47 +single choice of license, a recipient has the option to distribute
   33.48 +your version of this file under either the CDDL, the GPL Version 2 or
   33.49 +to extend the choice of license to its licensees as provided above.
   33.50 +However, if you add GPL Version 2 code and therefore, elected the GPL
   33.51 +Version 2 license, then the option applies only if the new code is
   33.52 +made subject to such option by the copyright holder.
   33.53  -->
   33.54  
   33.55  
    34.1 --- a/visualweb/ravebuild/default-rave-properties.xml	Wed Oct 03 17:44:32 2007 +0000
    34.2 +++ b/visualweb/ravebuild/default-rave-properties.xml	Thu Oct 04 03:26:59 2007 +0000
    34.3 @@ -1,27 +1,50 @@
    34.4 -<?xml version="1.0" encoding="UTF-8"?> 
    34.5 +<?xml version="1.0" encoding="UTF-8"?>
    34.6  <!--
    34.7 -The contents of this file are subject to the terms of the Common Development
    34.8 -and Distribution License (the License). You may not use this file except in
    34.9 -compliance with the License.
   34.10 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   34.11  
   34.12 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   34.13 -or http://www.netbeans.org/cddl.txt.
   34.14 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   34.15  
   34.16 -When distributing Covered Code, include this CDDL Header Notice in each file
   34.17 -and include the License file at http://www.netbeans.org/cddl.txt.
   34.18 -If applicable, add the following below the CDDL Header, with the fields
   34.19 -enclosed by brackets [] replaced by your own identifying information:
   34.20 +
   34.21 +The contents of this file are subject to the terms of either the GNU
   34.22 +General Public License Version 2 only ("GPL") or the Common
   34.23 +Development and Distribution License("CDDL") (collectively, the
   34.24 +"License"). You may not use this file except in compliance with the
   34.25 +License. You can obtain a copy of the License at
   34.26 +http://www.netbeans.org/cddl-gplv2.html
   34.27 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   34.28 +specific language governing permissions and limitations under the
   34.29 +License.  When distributing the software, include this License Header
   34.30 +Notice in each file and include the License file at
   34.31 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   34.32 +particular file as subject to the "Classpath" exception as provided
   34.33 +by Sun in the GPL Version 2 section of the License file that
   34.34 +accompanied this code. If applicable, add the following below the
   34.35 +License Header, with the fields enclosed by brackets [] replaced by
   34.36 +your own identifying information:
   34.37  "Portions Copyrighted [year] [name of copyright owner]"
   34.38  
   34.39 +Contributor(s):
   34.40 +
   34.41  The Original Software is NetBeans. The Initial Developer of the Original
   34.42  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   34.43  Microsystems, Inc. All Rights Reserved.
   34.44 +
   34.45 +If you wish your version of this file to be governed by only the CDDL
   34.46 +or only the GPL Version 2, indicate your decision by adding
   34.47 +"[Contributor] elects to include this software in this distribution
   34.48 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   34.49 +single choice of license, a recipient has the option to distribute
   34.50 +your version of this file under either the CDDL, the GPL Version 2 or
   34.51 +to extend the choice of license to its licensees as provided above.
   34.52 +However, if you add GPL Version 2 code and therefore, elected the GPL
   34.53 +Version 2 license, then the option applies only if the new code is
   34.54 +made subject to such option by the copyright holder.
   34.55  -->
   34.56  
   34.57  <project name="default-rave-properties" default="none" basedir=".">
   34.58  
   34.59    <dirname property="rave_all" file="${ant.file.default-rave-properties}/.."/>
   34.60 -  
   34.61 +
   34.62    <property name="netbeans.dest.dir" location="${rave_all}/../nbbuild/netbeans"/>
   34.63    <property name="netbeans.location" location="${netbeans.dest.dir}"/>
   34.64    
    35.1 --- a/visualweb/ravebuild/merge-forked-modules.xml	Wed Oct 03 17:44:32 2007 +0000
    35.2 +++ b/visualweb/ravebuild/merge-forked-modules.xml	Thu Oct 04 03:26:59 2007 +0000
    35.3 @@ -1,21 +1,44 @@
    35.4  <?xml version='1.0' encoding='UTF-8' ?>
    35.5  <!--
    35.6 -The contents of this file are subject to the terms of the Common Development
    35.7 -and Distribution License (the License). You may not use this file except in
    35.8 -compliance with the License.
    35.9 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   35.10  
   35.11 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   35.12 -or http://www.netbeans.org/cddl.txt.
   35.13 +Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
   35.14  
   35.15 -When distributing Covered Code, include this CDDL Header Notice in each file
   35.16 -and include the License file at http://www.netbeans.org/cddl.txt.
   35.17 -If applicable, add the following below the CDDL Header, with the fields
   35.18 -enclosed by brackets [] replaced by your own identifying information:
   35.19 +
   35.20 +The contents of this file are subject to the terms of either the GNU
   35.21 +General Public License Version 2 only ("GPL") or the Common
   35.22 +Development and Distribution License("CDDL") (collectively, the
   35.23 +"License"). You may not use this file except in compliance with the
   35.24 +License. You can obtain a copy of the License at
   35.25 +http://www.netbeans.org/cddl-gplv2.html
   35.26 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   35.27 +specific language governing permissions and limitations under the
   35.28 +License.  When distributing the software, include this License Header
   35.29 +Notice in each file and include the License file at
   35.30 +nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   35.31 +particular file as subject to the "Classpath" exception as provided
   35.32 +by Sun in the GPL Version 2 section of the License file that
   35.33 +accompanied this code. If applicable, add the following below the
   35.34 +License Header, with the fields enclosed by brackets [] replaced by
   35.35 +your own identifying information:
   35.36  "Portions Copyrighted [year] [name of copyright owner]"
   35.37  
   35.38 +Contributor(s):
   35.39 +
   35.40  The Original Software is NetBeans. The Initial Developer of the Original
   35.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
   35.42  Microsystems, Inc. All Rights Reserved.
   35.43 +
   35.44 +If you wish your version of this file to be governed by only the CDDL
   35.45 +or only the GPL Version 2, indicate your decision by adding
   35.46 +"[Contributor] elects to include this software in this distribution
   35.47 +under the [CDDL or GPL Version 2] license." If you do not indicate a
   35.48 +single choice of license, a recipient has the option to distribute
   35.49 +your version of this file under either the CDDL, the GPL Version 2 or
   35.50 +to extend the choice of license to its licensees as provided above.
   35.51 +However, if you add GPL Version 2 code and therefore, elected the GPL
   35.52 +Version 2 license, then the option applies only if the new code is
   35.53 +made subject to such option by the copyright holder.
   35.54  -->
   35.55  
   35.56