1.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Fri Oct 21 13:28:37 2005 +0000
     1.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Fri Oct 21 15:21:22 2005 +0000
     1.3 @@ -282,58 +282,21 @@
     1.4  out: TestMerge - creating the bean graph for the comment merge test
     1.5  out: <?xml version="1.0" encoding="UTF-8"?>
     1.6  out: <book good="no">
     1.7 +out:   <!-- BLUE -->
     1.8 +out:   <summary size="12" length="123" lang="us">
     1.9 +out: 	This book is about the life of a book spent between books who dreamed
    1.10 +out: 	to meet a fairy who could transform it into an XML book and travel
    1.11 +out: 	in an electronic boundary-less world.
    1.12 +out: 	</summary>
    1.13  out:   <author>
    1.14  out: 	John Smith
    1.15  out: 	</author>
    1.16  out:   <author>
    1.17  out: 	Mikey Mouse
    1.18  out: 	</author>
    1.19 -out:   <index cross-ref="no" color="blue">
    1.20 -out:     <word>
    1.21 -out: 			Good book
    1.22 -out: 		</word>
    1.23 -out:     <!-- MAUVE -->
    1.24 -out:     <!-- CYAN -->
    1.25 -out:     <ref>
    1.26 -out:       <page>
    1.27 -out: 			22
    1.28 -out: 		</page>
    1.29 -out:       <line>
    1.30 -out: 			12
    1.31 -out: 		</line>
    1.32 -out:     </ref>
    1.33 -out:   </index>
    1.34  out:   <author>
    1.35  out: 	Donald Duck
    1.36  out: 	</author>
    1.37 -out:   <chapter>
    1.38 -out:     <comment>
    1.39 -out: 		Empty chapter
    1.40 -out: 		</comment>
    1.41 -out:   </chapter>
    1.42 -out:   <good/>
    1.43 -out:   <index>
    1.44 -out:     <ref>
    1.45 -out:       <page>
    1.46 -out: 			5
    1.47 -out: 		</page>
    1.48 -out:       <line>
    1.49 -out: 			15
    1.50 -out: 		</line>
    1.51 -out:     </ref>
    1.52 -out:     <!--RED-->
    1.53 -out:     <word>
    1.54 -out: 			E-Tool
    1.55 -out: 		</word>
    1.56 -out:     <ref>
    1.57 -out:       <page>
    1.58 -out: 			29
    1.59 -out: 		</page>
    1.60 -out:       <line>
    1.61 -out: 			31
    1.62 -out: 		</line>
    1.63 -out:     </ref>
    1.64 -out:   </index>
    1.65  out:   <chapter title="First">
    1.66  out:     <paragraph>
    1.67  out: 			And the book lived a never ending happy life, read, copied
    1.68 @@ -352,12 +315,49 @@
    1.69  out: 			story began.
    1.70  out: 		</paragraph>
    1.71  out:   </chapter>
    1.72 -out:   <!-- BLUE -->
    1.73 -out:   <summary size="12" length="123" lang="us">
    1.74 -out: 	This book is about the life of a book spent between books who dreamed
    1.75 -out: 	to meet a fairy who could transform it into an XML book and travel
    1.76 -out: 	in an electronic boundary-less world.
    1.77 -out: 	</summary>
    1.78 +out:   <chapter>
    1.79 +out:     <comment>
    1.80 +out: 		Empty chapter
    1.81 +out: 		</comment>
    1.82 +out:   </chapter>
    1.83 +out:   <index cross-ref="no" color="blue">
    1.84 +out:     <word>
    1.85 +out: 			Good book
    1.86 +out: 		</word>
    1.87 +out:     <!-- MAUVE -->
    1.88 +out:     <!-- CYAN -->
    1.89 +out:     <ref>
    1.90 +out:       <page>
    1.91 +out: 			22
    1.92 +out: 		</page>
    1.93 +out:       <line>
    1.94 +out: 			12
    1.95 +out: 		</line>
    1.96 +out:     </ref>
    1.97 +out:   </index>
    1.98 +out:   <index>
    1.99 +out:     <!--RED-->
   1.100 +out:     <word>
   1.101 +out: 			E-Tool
   1.102 +out: 		</word>
   1.103 +out:     <ref>
   1.104 +out:       <page>
   1.105 +out: 			5
   1.106 +out: 		</page>
   1.107 +out:       <line>
   1.108 +out: 			15
   1.109 +out: 		</line>
   1.110 +out:     </ref>
   1.111 +out:     <ref>
   1.112 +out:       <page>
   1.113 +out: 			29
   1.114 +out: 		</page>
   1.115 +out:       <line>
   1.116 +out: 			31
   1.117 +out: 		</line>
   1.118 +out:     </ref>
   1.119 +out:   </index>
   1.120 +out:   <good/>
   1.121  out:   <!-- GREEN -->
   1.122  out: </book>
   1.123  Finished running TestMerge: 0

     2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass	Fri Oct 21 13:28:37 2005 +0000
     2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass	Fri Oct 21 15:21:22 2005 +0000
     2.3 @@ -396,7 +396,7 @@
     2.4  out: TestWebAppDelegatorBaseBean null thing2 -> OK
     2.5  out: TestWebAppDelegatorBaseBean null thing3 -> OK
     2.6  out: <?xml version="1.0" encoding="UTF-8"?>
     2.7 -out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
     2.8 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
     2.9  out:   <description xml:lang="en">Changed the description</description>
    2.10  out:   <description xml:lang="de">Das ist mein App.</description>
    2.11  out:   <display-name>MyWebApp</display-name>