Fixing tests that were failing because of the license upgrade BLD200611231637
authoremononen@netbeans.org
Tue, 21 Nov 2006 10:28:17 +0000
changeset 182062096660f1a5
parent 1819 94a3760a713e
child 1821 83d464365dc2
Fixing tests that were failing because of the license upgrade
schema2beans/test/unit/src/data/TestApplication1_4.xml
schema2beans/test/unit/src/data/TestBadNames.xml
schema2beans/test/unit/src/data/TestBook.xml
schema2beans/test/unit/src/data/TestBookXMLSchema.xml
schema2beans/test/unit/src/data/TestContrivedApp.xml
schema2beans/test/unit/src/data/TestEncoding.xml
schema2beans/test/unit/src/data/TestExceptions.xml
schema2beans/test/unit/src/data/TestValid.xml
schema2beans/test/unit/src/data/TestWebAppDelegator.xml
schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xml
schema2beans/test/unit/src/data/tm01_g1.xml
schema2beans/test/unit/src/data/tm01_g2.xml
schema2beans/test/unit/src/data/tm01_g3.xml
schema2beans/test/unit/src/data/tm01_g4.xml
     1.1 --- a/schema2beans/test/unit/src/data/TestApplication1_4.xml	Mon Nov 13 13:42:26 2006 +0000
     1.2 +++ b/schema2beans/test/unit/src/data/TestApplication1_4.xml	Tue Nov 21 10:28:17 2006 +0000
     1.3 @@ -1,22 +1,4 @@
     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 -
    1.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    1.11 -or http://www.netbeans.org/cddl.txt.
    1.12 -
    1.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    1.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    1.15 -If applicable, add the following below the CDDL Header, with the fields
    1.16 -enclosed by brackets [] replaced by your own identifying information:
    1.17 -"Portions Copyrighted [year] [name of copyright owner]"
    1.18 -
    1.19 -The Original Software is NetBeans. The Initial Developer of the Original
    1.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    1.21 -Microsystems, Inc. All Rights Reserved.
    1.22 --->
    1.23  <application xmlns='http://java.sun.com/xml/ns/j2ee' version='1.4'>
    1.24  	<display-name>test app</display-name>
    1.25  	<module>
     2.1 --- a/schema2beans/test/unit/src/data/TestBadNames.xml	Mon Nov 13 13:42:26 2006 +0000
     2.2 +++ b/schema2beans/test/unit/src/data/TestBadNames.xml	Tue Nov 21 10:28:17 2006 +0000
     2.3 @@ -1,22 +1,4 @@
     2.4  <?xml version="1.0" ?>
     2.5 -<!--
     2.6 -The contents of this file are subject to the terms of the Common Development
     2.7 -and Distribution License (the License). You may not use this file except in
     2.8 -compliance with the License.
     2.9 -
    2.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    2.11 -or http://www.netbeans.org/cddl.txt.
    2.12 -
    2.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    2.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    2.15 -If applicable, add the following below the CDDL Header, with the fields
    2.16 -enclosed by brackets [] replaced by your own identifying information:
    2.17 -"Portions Copyrighted [year] [name of copyright owner]"
    2.18 -
    2.19 -The Original Software is NetBeans. The Initial Developer of the Original
    2.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    2.21 -Microsystems, Inc. All Rights Reserved.
    2.22 --->
    2.23  <bad-names>
    2.24    <el class="c" package="p">
    2.25  	<property>-9</property>
     3.1 --- a/schema2beans/test/unit/src/data/TestBook.xml	Mon Nov 13 13:42:26 2006 +0000
     3.2 +++ b/schema2beans/test/unit/src/data/TestBook.xml	Tue Nov 21 10:28:17 2006 +0000
     3.3 @@ -1,22 +1,4 @@
     3.4  <?xml version="1.0" encoding="ISO-8859-1"?>
     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 -
    3.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    3.11 -or http://www.netbeans.org/cddl.txt.
    3.12 -
    3.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    3.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    3.15 -If applicable, add the following below the CDDL Header, with the fields
    3.16 -enclosed by brackets [] replaced by your own identifying information:
    3.17 -"Portions Copyrighted [year] [name of copyright owner]"
    3.18 -
    3.19 -The Original Software is NetBeans. The Initial Developer of the Original
    3.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    3.21 -Microsystems, Inc. All Rights Reserved.
    3.22 --->
    3.23  <book>
    3.24  	<summary>
    3.25  	This book is about the life of a book spent between books who dreamed
     4.1 --- a/schema2beans/test/unit/src/data/TestBookXMLSchema.xml	Mon Nov 13 13:42:26 2006 +0000
     4.2 +++ b/schema2beans/test/unit/src/data/TestBookXMLSchema.xml	Tue Nov 21 10:28:17 2006 +0000
     4.3 @@ -1,22 +1,4 @@
     4.4  <?xml version="1.0" encoding="ISO-8859-1"?>
     4.5 -<!--
     4.6 -The contents of this file are subject to the terms of the Common Development
     4.7 -and Distribution License (the License). You may not use this file except in
     4.8 -compliance with the License.
     4.9 -
    4.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    4.11 -or http://www.netbeans.org/cddl.txt.
    4.12 -
    4.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    4.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    4.15 -If applicable, add the following below the CDDL Header, with the fields
    4.16 -enclosed by brackets [] replaced by your own identifying information:
    4.17 -"Portions Copyrighted [year] [name of copyright owner]"
    4.18 -
    4.19 -The Original Software is NetBeans. The Initial Developer of the Original
    4.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    4.21 -Microsystems, Inc. All Rights Reserved.
    4.22 --->
    4.23  <book>
    4.24  	<summary>
    4.25  	This book is about the life of a book spent between books who dreamed
     5.1 --- a/schema2beans/test/unit/src/data/TestContrivedApp.xml	Mon Nov 13 13:42:26 2006 +0000
     5.2 +++ b/schema2beans/test/unit/src/data/TestContrivedApp.xml	Tue Nov 21 10:28:17 2006 +0000
     5.3 @@ -1,22 +1,4 @@
     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 -
    5.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    5.11 -or http://www.netbeans.org/cddl.txt.
    5.12 -
    5.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    5.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    5.15 -If applicable, add the following below the CDDL Header, with the fields
    5.16 -enclosed by brackets [] replaced by your own identifying information:
    5.17 -"Portions Copyrighted [year] [name of copyright owner]"
    5.18 -
    5.19 -The Original Software is NetBeans. The Initial Developer of the Original
    5.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    5.21 -Microsystems, Inc. All Rights Reserved.
    5.22 --->
    5.23  <!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
    5.24  <application>
    5.25  <display-name>Application_EJBModule_Entity2</display-name>
     6.1 --- a/schema2beans/test/unit/src/data/TestEncoding.xml	Mon Nov 13 13:42:26 2006 +0000
     6.2 +++ b/schema2beans/test/unit/src/data/TestEncoding.xml	Tue Nov 21 10:28:17 2006 +0000
     6.3 @@ -1,22 +1,4 @@
     6.4  <?xml version="1.0" encoding="ISO-8859-1"?>
     6.5 -<!--
     6.6 -The contents of this file are subject to the terms of the Common Development
     6.7 -and Distribution License (the License). You may not use this file except in
     6.8 -compliance with the License.
     6.9 -
    6.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    6.11 -or http://www.netbeans.org/cddl.txt.
    6.12 -
    6.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    6.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    6.15 -If applicable, add the following below the CDDL Header, with the fields
    6.16 -enclosed by brackets [] replaced by your own identifying information:
    6.17 -"Portions Copyrighted [year] [name of copyright owner]"
    6.18 -
    6.19 -The Original Software is NetBeans. The Initial Developer of the Original
    6.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    6.21 -Microsystems, Inc. All Rights Reserved.
    6.22 --->
    6.23  <!-- ex1.xml                                                      -->
    6.24  <!-- This is a simple XML source file.  Object class metamethod   -->
    6.25  <!-- m3 includes 8-bit ASCII text, with a tilde-n and accent-e    -->
     7.1 --- a/schema2beans/test/unit/src/data/TestExceptions.xml	Mon Nov 13 13:42:26 2006 +0000
     7.2 +++ b/schema2beans/test/unit/src/data/TestExceptions.xml	Tue Nov 21 10:28:17 2006 +0000
     7.3 @@ -1,20 +1,2 @@
     7.4  <?xml version='1.0'?>
     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 -
    7.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    7.11 -or http://www.netbeans.org/cddl.txt.
    7.12 -
    7.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    7.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    7.15 -If applicable, add the following below the CDDL Header, with the fields
    7.16 -enclosed by brackets [] replaced by your own identifying information:
    7.17 -"Portions Copyrighted [year] [name of copyright owner]"
    7.18 -
    7.19 -The Original Software is NetBeans. The Initial Developer of the Original
    7.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    7.21 -Microsystems, Inc. All Rights Reserved.
    7.22 --->
    7.23  <foo/>
     8.1 --- a/schema2beans/test/unit/src/data/TestValid.xml	Mon Nov 13 13:42:26 2006 +0000
     8.2 +++ b/schema2beans/test/unit/src/data/TestValid.xml	Tue Nov 21 10:28:17 2006 +0000
     8.3 @@ -1,22 +1,4 @@
     8.4  <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> 
     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 -
    8.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    8.11 -or http://www.netbeans.org/cddl.txt.
    8.12 -
    8.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    8.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    8.15 -If applicable, add the following below the CDDL Header, with the fields
    8.16 -enclosed by brackets [] replaced by your own identifying information:
    8.17 -"Portions Copyrighted [year] [name of copyright owner]"
    8.18 -
    8.19 -The Original Software is NetBeans. The Initial Developer of the Original
    8.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    8.21 -Microsystems, Inc. All Rights Reserved.
    8.22 --->
    8.23  <!DOCTYPE book [
    8.24  <!ELEMENT book (title?, chapter+, note?, paperback?, summary?, isbn?, price?)> 
    8.25  <!ELEMENT title (#PCDATA)> 
     9.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegator.xml	Mon Nov 13 13:42:26 2006 +0000
     9.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegator.xml	Tue Nov 21 10:28:17 2006 +0000
     9.3 @@ -1,22 +1,4 @@
     9.4  <?xml version='1.0'?>
     9.5 -<!--
     9.6 -The contents of this file are subject to the terms of the Common Development
     9.7 -and Distribution License (the License). You may not use this file except in
     9.8 -compliance with the License.
     9.9 -
    9.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    9.11 -or http://www.netbeans.org/cddl.txt.
    9.12 -
    9.13 -When distributing Covered Code, include this CDDL Header Notice in each file
    9.14 -and include the License file at http://www.netbeans.org/cddl.txt.
    9.15 -If applicable, add the following below the CDDL Header, with the fields
    9.16 -enclosed by brackets [] replaced by your own identifying information:
    9.17 -"Portions Copyrighted [year] [name of copyright owner]"
    9.18 -
    9.19 -The Original Software is NetBeans. The Initial Developer of the Original
    9.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    9.21 -Microsystems, Inc. All Rights Reserved.
    9.22 --->
    9.23  <web-app>
    9.24    <description>This is my Web App</description>
    9.25    <display-name>MyWebApp</display-name>
    10.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xml	Mon Nov 13 13:42:26 2006 +0000
    10.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xml	Tue Nov 21 10:28:17 2006 +0000
    10.3 @@ -1,22 +1,4 @@
    10.4  <?xml version='1.0'?>
    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 -
   10.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   10.11 -or http://www.netbeans.org/cddl.txt.
   10.12 -
   10.13 -When distributing Covered Code, include this CDDL Header Notice in each file
   10.14 -and include the License file at http://www.netbeans.org/cddl.txt.
   10.15 -If applicable, add the following below the CDDL Header, with the fields
   10.16 -enclosed by brackets [] replaced by your own identifying information:
   10.17 -"Portions Copyrighted [year] [name of copyright owner]"
   10.18 -
   10.19 -The Original Software is NetBeans. The Initial Developer of the Original
   10.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
   10.21 -Microsystems, Inc. All Rights Reserved.
   10.22 --->
   10.23  <web-app>
   10.24    <description>This is my Web App</description>
   10.25    <display-name>MyWebApp</display-name>
    11.1 --- a/schema2beans/test/unit/src/data/tm01_g1.xml	Mon Nov 13 13:42:26 2006 +0000
    11.2 +++ b/schema2beans/test/unit/src/data/tm01_g1.xml	Tue Nov 21 10:28:17 2006 +0000
    11.3 @@ -1,22 +1,4 @@
    11.4  <?xml version="1.0" encoding="ISO-8859-1"?>
    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 -
   11.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   11.11 -or http://www.netbeans.org/cddl.txt.
   11.12 -
   11.13 -When distributing Covered Code, include this CDDL Header Notice in each file
   11.14 -and include the License file at http://www.netbeans.org/cddl.txt.
   11.15 -If applicable, add the following below the CDDL Header, with the fields
   11.16 -enclosed by brackets [] replaced by your own identifying information:
   11.17 -"Portions Copyrighted [year] [name of copyright owner]"
   11.18 -
   11.19 -The Original Software is NetBeans. The Initial Developer of the Original
   11.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
   11.21 -Microsystems, Inc. All Rights Reserved.
   11.22 --->
   11.23  <book>
   11.24  	<author>
   11.25  	John Smith
    12.1 --- a/schema2beans/test/unit/src/data/tm01_g2.xml	Mon Nov 13 13:42:26 2006 +0000
    12.2 +++ b/schema2beans/test/unit/src/data/tm01_g2.xml	Tue Nov 21 10:28:17 2006 +0000
    12.3 @@ -1,22 +1,4 @@
    12.4  <?xml version="1.0" encoding="ISO-8859-1"?>
    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 -
   12.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   12.11 -or http://www.netbeans.org/cddl.txt.
   12.12 -
   12.13 -When distributing Covered Code, include this CDDL Header Notice in each file
   12.14 -and include the License file at http://www.netbeans.org/cddl.txt.
   12.15 -If applicable, add the following below the CDDL Header, with the fields
   12.16 -enclosed by brackets [] replaced by your own identifying information:
   12.17 -"Portions Copyrighted [year] [name of copyright owner]"
   12.18 -
   12.19 -The Original Software is NetBeans. The Initial Developer of the Original
   12.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
   12.21 -Microsystems, Inc. All Rights Reserved.
   12.22 --->
   12.23  <book>
   12.24  	<summary size="12">
   12.25  	This book is about the life of a book spent between books who dreamed
    13.1 --- a/schema2beans/test/unit/src/data/tm01_g3.xml	Mon Nov 13 13:42:26 2006 +0000
    13.2 +++ b/schema2beans/test/unit/src/data/tm01_g3.xml	Tue Nov 21 10:28:17 2006 +0000
    13.3 @@ -1,22 +1,4 @@
    13.4  <?xml version="1.0" encoding="ISO-8859-1"?>
    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 -
   13.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   13.11 -or http://www.netbeans.org/cddl.txt.
   13.12 -
   13.13 -When distributing Covered Code, include this CDDL Header Notice in each file
   13.14 -and include the License file at http://www.netbeans.org/cddl.txt.
   13.15 -If applicable, add the following below the CDDL Header, with the fields
   13.16 -enclosed by brackets [] replaced by your own identifying information:
   13.17 -"Portions Copyrighted [year] [name of copyright owner]"
   13.18 -
   13.19 -The Original Software is NetBeans. The Initial Developer of the Original
   13.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
   13.21 -Microsystems, Inc. All Rights Reserved.
   13.22 --->
   13.23  <book good="no">
   13.24  	<summary length="123" lang="us" size="12">
   13.25  	This book is about the life of a book spent between books who dreamed
    14.1 --- a/schema2beans/test/unit/src/data/tm01_g4.xml	Mon Nov 13 13:42:26 2006 +0000
    14.2 +++ b/schema2beans/test/unit/src/data/tm01_g4.xml	Tue Nov 21 10:28:17 2006 +0000
    14.3 @@ -1,22 +1,4 @@
    14.4  <?xml version="1.0" encoding="ISO-8859-1"?>
    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 -
   14.10 -You can obtain a copy of the License at http://www.netbeans.org/cddl.html
   14.11 -or http://www.netbeans.org/cddl.txt.
   14.12 -
   14.13 -When distributing Covered Code, include this CDDL Header Notice in each file
   14.14 -and include the License file at http://www.netbeans.org/cddl.txt.
   14.15 -If applicable, add the following below the CDDL Header, with the fields
   14.16 -enclosed by brackets [] replaced by your own identifying information:
   14.17 -"Portions Copyrighted [year] [name of copyright owner]"
   14.18 -
   14.19 -The Original Software is NetBeans. The Initial Developer of the Original
   14.20 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
   14.21 -Microsystems, Inc. All Rights Reserved.
   14.22 --->
   14.23  <book good="no">
   14.24  	<!-- BLUE -->
   14.25  	<summary length="123" lang="us" size="12">