Add a -useRuntime flag. For those who want the efficient javabeans, but have the schema2beans runtime laying around anyway.
Add a -extendBaseBean flag. For those who like -javabean's better performance, but can't seem to get away from BaseBean.
Fix a bug dealing with mutually exclusive properties where one is an array of primitive.
1.1 --- a/schema2beans/test/unit/src/TestMain.java Thu Sep 25 09:24:07 2003 +0000
1.2 +++ b/schema2beans/test/unit/src/TestMain.java Fri Sep 26 21:52:41 2003 +0000
1.3 @@ -417,8 +417,8 @@
1.4 System.out.println("dataDirName="+dataDirName);
1.5
1.6 theClassPath += classPathEntryFromURL(org.netbeans.modules.schema2beans.BaseBean.class);
1.7 - theClassPath += File.pathSeparator + classPathEntryFromURL(org.w3c.dom.Node.class);
1.8 - theClassPath += File.pathSeparator + classPathEntryFromURL(javax.xml.parsers.DocumentBuilderFactory.newInstance().getClass());
1.9 + //theClassPath += File.pathSeparator + classPathEntryFromURL(org.w3c.dom.Node.class);
1.10 + //theClassPath += File.pathSeparator + classPathEntryFromURL(javax.xml.parsers.DocumentBuilderFactory.newInstance().getClass());
1.11 //theClassPath += File.pathSeparator + classPathEntryFromURL(org.w3c.dom.ranges.DocumentRange.class);
1.12 System.out.println("classpath="+theClassPath);
1.13 }
2.1 --- a/schema2beans/test/unit/src/data/TestOr.dtd Thu Sep 25 09:24:07 2003 +0000
2.2 +++ b/schema2beans/test/unit/src/data/TestOr.dtd Fri Sep 26 21:52:41 2003 +0000
2.3 @@ -6,7 +6,9 @@
2.4 <!ELEMENT cache-helper-ref #PCDATA>
2.5 <!ELEMENT timeout #PCDATA>
2.6 <!ELEMENT http-method #PCDATA>
2.7 -<!ELEMENT key-field #PCDATA>
2.8 <!ELEMENT constraint-field #PCDATA>
2.9 <!ELEMENT a #PCDATA>
2.10 <!ELEMENT b #PCDATA>
2.11 +<!ELEMENT key-field EMPTY>
2.12 +<!ATTLIST key-field name CDATA #REQUIRED
2.13 + scope CDATA 'request.parameter'>
3.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testOr.pass Thu Sep 25 09:24:07 2003 +0000
3.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testOr.pass Fri Sep 26 21:52:41 2003 +0000
3.3 @@ -7,7 +7,10 @@
3.4 | cache-helper-ref : String
3.5 | timeout : String[0,1]
3.6 | http-method : String[0,n]
3.7 - | key-field : String[0,n]
3.8 + | key-field : boolean[0,n]
3.9 + | [attr: name CDATA #REQUIRED ]
3.10 + | [attr: scope CDATA request.parameter]
3.11 + | EMPTY : String
3.12 | | a : String
3.13 | | b : String
3.14 | constraint-field : String[0,n]