1.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass Sat Apr 09 19:26:56 2005 +0000
1.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass Sat Apr 09 19:32:54 2005 +0000
1.3 @@ -85,7 +85,7 @@
1.4 out: <!-- -->
1.5 out: <!-- <!DOCTYPE FORTEDDL SYSTEM "TestEncoding.dtd" []> -->
1.6 out: <FORTEDDL>
1.7 -out: <PHASE OBJECTTYPE="MetaPlan.MetaClass" OBJECTNAME="c1" NUMBER="1">
1.8 +out: <PHASE NUMBER="1" OBJECTNAME="c1" OBJECTTYPE="MetaPlan.MetaClass">
1.9 out: <ATTRIBUTE NAME="Name">c1</ATTRIBUTE>
1.10 out: <ATTRIBUTE NAME="MethodArray">
1.11 out: <ARRAY>
1.12 @@ -113,7 +113,7 @@
1.13 out: </MYOBJECT>
1.14 out: </ARRAY>
1.15 out: </ATTRIBUTE>
1.16 -out: <ANNOTATION OBJECTTYPE="CrossRefInfo" NAME="cr1">
1.17 +out: <ANNOTATION NAME="cr1" OBJECTTYPE="CrossRefInfo">
1.18 out: <ATTRIBUTE NAME="InfoArray">
1.19 out: <ARRAY>
1.20 out: <MYOBJECT CLASS="infoItem">
2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass Sat Apr 09 19:26:56 2005 +0000
2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass Sat Apr 09 19:32:54 2005 +0000
2.3 @@ -276,6 +276,8 @@
2.4 out: TestMerge Merging attributes attr on chapter -> OK
2.5 out: TestMerge - creating the DOM document
2.6 out: TestMerge - creating the bean graph for memory test
2.7 +out: TestMerge - It seems that the last schema2beans code changes have increased the memory consumption by 282.65747%
2.8 +out: TestMerge - If this is expected and acceptable, change the memUsageReference value in TestMerge.java, to be 4435
2.9 out: TestMerge - memory test done
2.10 out: TestMerge - creating the DOM document
2.11 out: TestMerge - creating the DOM document
2.12 @@ -288,7 +290,7 @@
2.13 out: <author>
2.14 out: Mikey Mouse
2.15 out: </author>
2.16 -out: <index cross-ref="no" color="blue">
2.17 +out: <index color="blue" cross-ref="no">
2.18 out: <word>
2.19 out: Good book
2.20 out: </word>
2.21 @@ -353,7 +355,7 @@
2.22 out: </paragraph>
2.23 out: </chapter>
2.24 out: <!-- BLUE -->
2.25 -out: <summary size="12" length="123" lang="us">
2.26 +out: <summary lang="us" length="123" size="12">
2.27 out: This book is about the life of a book spent between books who dreamed
2.28 out: to meet a fairy who could transform it into an XML book and travel
2.29 out: in an electronic boundary-less world.
3.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass Sat Apr 09 19:26:56 2005 +0000
3.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass Sat Apr 09 19:32:54 2005 +0000
3.3 @@ -250,7 +250,7 @@
3.4 out: TestWebAppDelegatorBaseBean - creating the bean graph
3.5 out: TestWebAppDelegatorBaseBean - bean graph created
3.6 out: <?xml version="1.0" encoding="UTF-8"?>
3.7 -out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
3.8 +out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
3.9 out: <description>This is my Web App</description>
3.10 out: <display-name>MyWebApp</display-name>
3.11 out: <thing>
3.12 @@ -271,7 +271,7 @@
3.13 out: </web-app>
3.14 out: TestWebAppDelegatorBaseBean - making some minor changes
3.15 out: <?xml version="1.0" encoding="UTF-8"?>
3.16 -out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
3.17 +out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
3.18 out: <description>Changed the description</description>
3.19 out: <display-name>MyWebApp</display-name>
3.20 out: <thing>
3.21 @@ -297,7 +297,7 @@
3.22 out: TestWebAppDelegatorBaseBean null candidate 0 is good -> OK
3.23 out: TestWebAppDelegatorBaseBean null candidate 1 is not good -> OK
3.24 out: <?xml version="1.0" encoding="UTF-8"?>
3.25 -out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
3.26 +out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
3.27 out: <description>Changed the description</description>
3.28 out: <display-name>MyWebApp</display-name>
3.29 out: <thing>
3.30 @@ -328,7 +328,7 @@
3.31 out: TestWebAppDelegatorBaseBean null Got good validate exception: getWebResourceName() == null -> OK
3.32 out: TestWebAppDelegatorBaseBean null Got good validate exception: sizeUrlPattern() == 0 -> OK
3.33 out: <?xml version="1.0" encoding="UTF-8"?>
3.34 -out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
3.35 +out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
3.36 out: <description>Changed the description</description>
3.37 out: <display-name>MyWebApp</display-name>
3.38 out: <thing>
3.39 @@ -360,7 +360,7 @@
3.40 out: </web-app>
3.41 out: TestWebAppDelegatorBaseBean - Add some descriptions with xml:lang attributes.
3.42 out: <?xml version="1.0" encoding="UTF-8"?>
3.43 -out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
3.44 +out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
3.45 out: <description xml:lang="en">Changed the description</description>
3.46 out: <description xml:lang="de">Das ist mein App.</description>
3.47 out: <display-name>MyWebApp</display-name>
3.48 @@ -396,7 +396,7 @@
3.49 out: TestWebAppDelegatorBaseBean null thing2 -> OK
3.50 out: TestWebAppDelegatorBaseBean null thing3 -> OK
3.51 out: <?xml version="1.0" encoding="UTF-8"?>
3.52 -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">
3.53 +out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 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">
3.54 out: <description xml:lang="en">Changed the description</description>
3.55 out: <description xml:lang="de">Das ist mein App.</description>
3.56 out: <display-name>MyWebApp</display-name>