Fix a bug with validation where mutually exclusive properties were no longer being checked if any of them existed.
Fix a bug where parent refs weren't always being kept up to date.
Add an ensureCapacity on ArrayList sets; hopefully will speed things up.
Add missing writeNode(Writer) method.
For George, fix DDParser so that something is not claimed to be a match when it's value is null.
1.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegator.java Sun Oct 26 21:55:03 2003 +0000
1.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegator.java Mon Oct 27 20:34:54 2003 +0000
1.3 @@ -108,6 +108,15 @@
1.4 check(true, "Got good validate exception: "+e.getMessage());
1.5 }
1.6 sc.getWebResourceCollection(0).addUrlPattern("*.html");
1.7 + ErrorPageType errorPage = new ErrorPageType("over there");
1.8 + webApp.addErrorPage(errorPage);
1.9 + try {
1.10 + webApp.validate();
1.11 + check(false, "Failed to get validate exception");
1.12 + } catch (webapp.WebApp.ValidateException e) {
1.13 + check(true, "Got good validate exception: "+e.getMessage());
1.14 + }
1.15 + errorPage.setErrorCode(new Long(3l));
1.16 webApp.write(out);
1.17 webApp.validate();
1.18
2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBook.pass Sun Oct 26 21:55:03 2003 +0000
2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBook.pass Mon Oct 27 20:34:54 2003 +0000
2.3 @@ -411,9 +411,7 @@
2.4 out: in an electronic boundary-less world.
2.5 out:
2.6 out: TestBook - Parsing Summary
2.7 -out: TestBook - null
2.8 out: TestBook - Parsing Available
2.9 -out: TestBook - null
2.10 out: TestBook - Parsing Extra
2.11 out: TestBook - Extra
2.12 out:
2.13 @@ -478,7 +476,6 @@
2.14 out: TestBook -
2.15 out: First chapter.
2.16 out:
2.17 -out: TestBook - null
2.18 out: TestBook -
2.19 out: Empty chapter
2.20 out:
3.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBookXMLSchema.pass Sun Oct 26 21:55:03 2003 +0000
3.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBookXMLSchema.pass Mon Oct 27 20:34:54 2003 +0000
3.3 @@ -419,9 +419,7 @@
3.4 out: in an electronic boundary-less world.
3.5 out:
3.6 out: TestBookXMLSchema - Parsing Summary
3.7 -out: TestBookXMLSchema - null
3.8 out: TestBookXMLSchema - Parsing Available
3.9 -out: TestBookXMLSchema - null
3.10 out: TestBookXMLSchema - Parsing Extra
3.11 out: TestBookXMLSchema - Extra
3.12 out:
3.13 @@ -486,7 +484,6 @@
3.14 out: TestBookXMLSchema -
3.15 out: First chapter.
3.16 out:
3.17 -out: TestBookXMLSchema - null
3.18 out: TestBookXMLSchema -
3.19 out: Empty chapter
3.20 out:
4.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMergeExtendBaseBean.pass Sun Oct 26 21:55:03 2003 +0000
4.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMergeExtendBaseBean.pass Mon Oct 27 20:34:54 2003 +0000
4.3 @@ -257,21 +257,21 @@
4.4 out: TestMergeExtendBaseBean - creating the bean graph1
4.5 out: TestMergeExtendBaseBean - creating the DOM document
4.6 out: TestMergeExtendBaseBean - creating the bean graph2
4.7 -out: TestMergeExtendBaseBean - <Chapter title='First'>
4.8 +out: TestMergeExtendBaseBean - <chapter title='First'>
4.9 out: <number></number>
4.10 out: <paragraph>
4.11 out: And the book lived a never ending happy life, read, copied
4.12 out: and enjoyed by so many readers.
4.13 out: </paragraph>
4.14 -out: </Chapter>
4.15 +out: </chapter>
4.16 out:
4.17 -out: TestMergeExtendBaseBean - <Chapter title='First'>
4.18 +out: TestMergeExtendBaseBean - <chapter title='First'>
4.19 out: <number></number>
4.20 out: <paragraph>
4.21 out: And the book lived a never ending happy life, read, copied
4.22 out: and enjoyed by so many readers.
4.23 out: </paragraph>
4.24 -out: </Chapter>
4.25 +out: </chapter>
4.26 out:
4.27 out: TestMergeExtendBaseBean - new listener for Book
4.28 out: TestMergeExtendBaseBean - new listener for Book
5.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass Sun Oct 26 21:55:03 2003 +0000
5.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass Mon Oct 27 20:34:54 2003 +0000
5.3 @@ -244,6 +244,7 @@
5.4 out: TestWebAppDelegator null Got good validate exception: sizeWebResourceCollection() == 0 -> OK
5.5 out: TestWebAppDelegator null Got good validate exception: sizeUrlPattern() == 0 -> OK
5.6 out: TestWebAppDelegator null Got good validate exception: sizeUrlPattern() == 0 -> OK
5.7 +out: TestWebAppDelegator null Got good validate exception: required properties: getErrorCode() == null && getExceptionType() == null -> OK
5.8 out: <?xml version='1.0' encoding='UTF-8' ?>
5.9 out: <web-app xmlns='http://java.sun.com/xml/ns/j2ee' version='2.4'>
5.10 out: <description>Changed the description</description>
5.11 @@ -252,6 +253,10 @@
5.12 out: <filter-name>Bob</filter-name>
5.13 out: <filter-class>foo</filter-class>
5.14 out: </filter>
5.15 +out: <error-page>
5.16 +out: <error-code>3</error-code>
5.17 +out: <location>over there</location>
5.18 +out: </error-page>
5.19 out: <security-constraint>
5.20 out: <web-resource-collection>
5.21 out: <web-resource-name>blue</web-resource-name>
5.22 @@ -277,6 +282,10 @@
5.23 out: <servlet-name>Bob</servlet-name>
5.24 out: <dispatcher>FORWARD</dispatcher>
5.25 out: </filter-mapping>
5.26 +out: <error-page>
5.27 +out: <error-code>3</error-code>
5.28 +out: <location>over there</location>
5.29 +out: </error-page>
5.30 out: <security-constraint>
5.31 out: <web-resource-collection>
5.32 out: <web-resource-name>blue</web-resource-name>