1.1 --- a/de.hunsicker.jalopy.plugin.netbeans/build.xml	Tue Feb 28 01:19:36 2006 +0000
     1.2 +++ b/de.hunsicker.jalopy.plugin.netbeans/build.xml	Tue Feb 28 01:22:30 2006 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4  http://www.sun.com/
     1.5  
     1.6  The Original Code is NetBeans. The Initial Developer of the Original
     1.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     1.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
     1.9  Microsystems, Inc. All Rights Reserved.
    1.10  -->
    1.11  <project name="jalopy" default="netbeans" basedir=".">
    1.12 @@ -41,7 +41,7 @@
    1.13              needsrestart="${nbm.needs.restart}"
    1.14              releasedate="${nbm.release.date}"
    1.15              moduleauthor="${nbm.module.author}">
    1.16 -            <license name="org-netbeans-modules-javacore.txt">
    1.17 +            <license>
    1.18                  <text>The Jalopy NetBeans Plugin module is under SPL.</text>
    1.19                  <text>For the Jalopy Source Code Formatter code itself:</text>
    1.20                  <file location="external/${jalopy.license}"/>

     2.1 --- a/docbook/build.xml	Tue Feb 28 01:19:36 2006 +0000
     2.2 +++ b/docbook/build.xml	Tue Feb 28 01:22:30 2006 +0000
     2.3 @@ -8,7 +8,7 @@
     2.4  http://www.sun.com/
     2.5  
     2.6  The Original Code is NetBeans. The Initial Developer of the Original
     2.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     2.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
     2.9  Microsystems, Inc. All Rights Reserved.
    2.10  -->
    2.11  <project name="contrib/docbook" basedir="." default="netbeans">
    2.12 @@ -79,7 +79,7 @@
    2.13                   releasedate="${nbm.release.date}"
    2.14  		 moduleauthor="${nbm.module.author}">
    2.15              <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
    2.16 -            <license name="docbook-license.txt">
    2.17 +            <license>
    2.18                  <text>For the module itself:</text>
    2.19                  <file location="${license.file}"/>
    2.20                  <text>For the included DocBook stylesheets and Slides DTD:</text>

     3.1 --- a/insertunicode/build.xml	Tue Feb 28 01:19:36 2006 +0000
     3.2 +++ b/insertunicode/build.xml	Tue Feb 28 01:22:30 2006 +0000
     3.3 @@ -8,7 +8,7 @@
     3.4  http://www.sun.com/
     3.5  
     3.6  The Original Code is NetBeans. The Initial Developer of the Original
     3.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     3.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
     3.9  Microsystems, Inc. All Rights Reserved.
    3.10  -->
    3.11  <project name="contrib/insertunicode" basedir="." default="netbeans">
    3.12 @@ -42,7 +42,7 @@
    3.13                   homepage="${nbm.homepage}"
    3.14                   distribution="http://${dist.base}/${nbm}"
    3.15                   needsrestart="${nbm.needs.restart}">
    3.16 -            <license name="insertunicode-license.txt">
    3.17 +            <license>
    3.18                  <text>For the module itself:</text>
    3.19                  <file location="${license.file}"/>
    3.20                  <text>For the included Unicode naming data, extracted from http://www.unicode.org/Public/UNIDATA/UnicodeData.txt:</text>

     4.1 --- a/j2ee.sun.avk/build.xml	Tue Feb 28 01:19:36 2006 +0000
     4.2 +++ b/j2ee.sun.avk/build.xml	Tue Feb 28 01:22:30 2006 +0000
     4.3 @@ -1,4 +1,4 @@
     4.4 -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- -->
     4.5 +<?xml version="1.0" encoding="UTF-8"?>
     4.6  <!--
     4.7                  Sun Public License Notice
     4.8  
     4.9 @@ -8,7 +8,7 @@
    4.10  http://www.sun.com/
    4.11  
    4.12  The Original Code is NetBeans. The Initial Developer of the Original
    4.13 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
    4.14 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    4.15  Microsystems, Inc. All Rights Reserved.
    4.16  -->
    4.17  
    4.18 @@ -25,7 +25,7 @@
    4.19                   needsrestart="${nbm.needs.restart}"
    4.20                   releasedate="${nbm.release.date}"
    4.21  		 moduleauthor="${nbm.module.author}">
    4.22 -            <license name="avk-plugin-license.txt">
    4.23 +            <license>
    4.24                  <file location="../../external/javke1.4.2_fcs-netbeanslicense.txt"/>
    4.25              </license>
    4.26          </makenbm>

     5.1 --- a/omnidebugger/build.xml	Tue Feb 28 01:19:36 2006 +0000
     5.2 +++ b/omnidebugger/build.xml	Tue Feb 28 01:22:30 2006 +0000
     5.3 @@ -25,7 +25,7 @@
     5.4                   global="${nbm.is.global}"
     5.5                   releasedate="${nbm.release.date}"
     5.6  		 moduleauthor="${nbm.module.author}">
     5.7 -            <license name="omnidebugger-license.txt">
     5.8 +            <license>
     5.9                  <text>For the integration module:</text>
    5.10                  <file location="${license.file}"/>
    5.11                  <text>For the Omniscient Debugger program:</text>

     6.1 --- a/other/calpane/build.xml	Tue Feb 28 01:19:36 2006 +0000
     6.2 +++ b/other/calpane/build.xml	Tue Feb 28 01:22:30 2006 +0000
     6.3 @@ -41,7 +41,7 @@
     6.4                   module="netbeans/modules/calpane.jar"
     6.5                   homepage="http://contrib.netbeans.org/">
     6.6          </makenbm>
     6.7 -        <license name="calpane-license.txt">
     6.8 +        <license>
     6.9              <text>For the Calpane HTML component:</text>
    6.10              <file location="external/calpane-license.txt"/>
    6.11  	    <text>For the NetBeans integration module:</text>

     7.1 --- a/projectpackager/build.xml	Tue Feb 28 01:19:36 2006 +0000
     7.2 +++ b/projectpackager/build.xml	Tue Feb 28 01:22:30 2006 +0000
     7.3 @@ -1,4 +1,4 @@
     7.4 -<?xml version='1.0' encoding='ISO-8859-1' ?>
     7.5 +<?xml version="1.0" encoding="UTF-8"?>
     7.6  <!--
     7.7                  Sun Public License Notice
     7.8  
     7.9 @@ -8,7 +8,7 @@
    7.10  http://www.sun.com/
    7.11  
    7.12  The Original Code is NetBeans. The Initial Developer of the Original
    7.13 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
    7.14 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    7.15  Microsystems, Inc. All Rights Reserved.
    7.16  -->
    7.17  
    7.18 @@ -36,7 +36,7 @@
    7.19                   needsrestart="${nbm.needs.restart}"
    7.20                   releasedate="${nbm.release.date}"
    7.21  		 moduleauthor="${nbm.module.author}">
    7.22 -            <license name="projectpackager-license.txt">
    7.23 +            <license>
    7.24                  <text>For the projectpackager module itself:</text>
    7.25                  <file location="${license.file}"/>
    7.26                  <text>For the JavaMail library:</text>

     8.1 --- a/tasklist.usertasks/build.xml	Tue Feb 28 01:19:36 2006 +0000
     8.2 +++ b/tasklist.usertasks/build.xml	Tue Feb 28 01:22:30 2006 +0000
     8.3 @@ -8,7 +8,7 @@
     8.4  http://www.sun.com/
     8.5  
     8.6  The Original Code is NetBeans. The Initial Developer of the Original
     8.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     8.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
     8.9  Microsystems, Inc. All Rights Reserved.
    8.10  -->
    8.11  <project name="tasklist/usertasks" default="netbeans" basedir=".">
    8.12 @@ -23,7 +23,7 @@
    8.13                   homepage="${nbm.homepage}"
    8.14                   distribution="http://${dist.base}/${nbm}"
    8.15                   needsrestart="${nbm.needs.restart}">
    8.16 -            <license name="usertasks-license.txt">
    8.17 +            <license>
    8.18                  <text>For the User Tasks module itself:</text>
    8.19                  <file location="${license.file}"/>
    8.20                  <text>For the bundled JCalendar runtime library:</text>

     9.1 --- a/tomcat5.bundled/build.xml	Tue Feb 28 01:19:36 2006 +0000
     9.2 +++ b/tomcat5.bundled/build.xml	Tue Feb 28 01:22:30 2006 +0000
     9.3 @@ -51,7 +51,7 @@
     9.4                   global="${nbm.is.global}"
     9.5                   releasedate="${nbm.release.date}"
     9.6  		 moduleauthor="${nbm.module.author}">
     9.7 -            <license name="bundledtomcat-license.txt">
     9.8 +            <license>
     9.9                  <text>For the integration module:</text>
    9.10                  <file location="${license.file}"/>
    9.11                  <text>For Tomcat:</text>