You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/04/10 00:48:16 UTC
cvs commit: xml-xmlbeans/v2/xkit/schemas/s4s XML.xsd XMLSchema.xsd
daveremy 2004/04/09 15:48:16
Modified: v1 build.xml
v1/src/xsdschema/schema XMLSchema.xsd
v1/test/src/drt/drtcases CompilationTests.java
ValidationTests.java
v1/xkit README.txt
v2 build.xml
v2/src/typeimpl/org/apache/xmlbeans/impl/schema
SchemaTypeImpl.java
v2/src/xsdschema/schema XMLSchema.xsd
v2/test/src/drt/drtcases CompilationTests.java
ValidationTests.java
v2/xkit README.txt
Removed: v1/test/cases/schema/s4s XML.xsd XMLSchema.xsd
v1/xkit/bin dumpxsb dumpxsb.cmd scomp scomp.cmd scopy
scopy.cmd sdownload sdownload.cmd sfactor
sfactor.cmd validate validate.cmd xpretty
xpretty.cmd xsdtree xsdtree.cmd xstc xstc.cmd
v1/xkit/schemas/cyclone CycloneOrganizationProfile.xsd
InterchangePartnerConfig.xsd TPM.xsd
v1/xkit/schemas/cyclone/dsig xmldsig-core-schema.xsd
v1/xkit/schemas/easypo easypo.xsd easypo.xsdconfig
v1/xkit/schemas/j2ee XML.xsd application-client_1_4.xsd
application_1_4.xsd connector_1_5.xsd
ejb-jar_2_1.xsd exported_build.xml j2ee_1_4.xsd
jsp_2_0.xsd web-app_2_4.xsd
v1/xkit/schemas/s4s XML.xsd XMLSchema.xsd
v2/test/cases/schema/s4s XML.xsd XMLSchema.xsd
v2/xkit/bin dumpxsb dumpxsb.cmd scomp scomp.cmd scopy
scopy.cmd sdownload sdownload.cmd sfactor
sfactor.cmd validate validate.cmd xpretty
xpretty.cmd xsdtree xsdtree.cmd xstc xstc.cmd
v2/xkit/schemas/cyclone CycloneOrganizationProfile.xsd
InterchangePartnerConfig.xsd TPM.xsd
v2/xkit/schemas/cyclone/dsig xmldsig-core-schema.xsd
v2/xkit/schemas/easypo easypo.xsd easypo.xsdconfig
v2/xkit/schemas/j2ee XML.xsd application-client_1_4.xsd
application_1_4.xsd connector_1_5.xsd
ejb-jar_2_1.xsd exported_build.xml j2ee_1_4.xsd
jsp_2_0.xsd web-app_2_4.xsd
v2/xkit/schemas/s4s XML.xsd XMLSchema.xsd
Log:
- removing some duplicate files found in the xkit directory.
- added a change history to the XMLSchema.xsd for the minor modifications
that we've made to it.
- updated the version number in v1 to 1.0.2
DRTs: v1 and v2 pass
Revision Changes Path
1.21 +11 -41 xml-xmlbeans/v1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 9 Apr 2004 19:57:51 -0000 1.20
+++ build.xml 9 Apr 2004 22:48:12 -0000 1.21
@@ -14,7 +14,7 @@
<project name="Xbean" default="default" basedir=".">
<property name="build.compiler" value="javac1.4"/>
- <property name="product.version" value="1.0.1"/>
+ <property name="product.version" value="1.0.2"/>
<target name="usage">
<echo message="The following ant targets are defined:"/>
@@ -457,7 +457,16 @@
<mkdir dir="build/private/xmlbeans-${product.version}"/>
<copy todir="build/private/xmlbeans-${product.version}">
- <fileset dir="xkit" />
+ <fileset dir="xkit"/>
+ <fileset dir="." includes="bin/**"/>
+ </copy>
+ <copy todir="build/private/xmlbeans-${product.version}/schemas/s4s">
+ <fileset dir="src/xsdschema/schema" includes="XMLSchema.xsd"/>
+ <fileset dir="src/xmlschema/schema" includes="XML.xsd"/>
+ </copy>
+ <copy todir="build/private/xmlbeans-${product.version}/schemas">
+ <fileset dir="test/src" includes="easypo/*.xsd,easypo/*.xsdconfig"/>
+ <fileset dir="test/cases/schema" includes="cyclone/**/*.xsd,j2ee/*.xsd"/>
</copy>
<mkdir dir="build/private/xmlbeans-${product.version}/lib"/>
@@ -544,45 +553,6 @@
<fileset dir="src/license"/>
</jar>
</target>
-
- <!-- jaxb target =================================================== -->
-
- <path id="jaxb.compile.path">
- <pathelement location="external/lib/jaxb-1.0/jaxb-api.jar"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/typeimpl"/>
- <pathelement location="build/classes/common"/>
- <pathelement location="build/classes/typestore"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/jaxbschema"/>
- </path>
-
- <target name="jaxbschema.check">
- <condition property="jaxbschema.notRequired">
- <uptodate property="jaxbschema.notRequired" targetfile="build/classes/jaxbschema/schema/system/JAXBCONFIG/index.xsb">
- <srcfiles dir="src/jaxb/schema" includes="**/*.xsd;**/*.xsdconfig"/>
- </uptodate>
- </condition>
- </target>
-
- <target name="jaxbschema.classes" depends="jaxbschema.check, xmlpublic.classes, typeimpl.classes, common.classes, typestore.classes, xmlinputstream.classes" unless="jaxbschema.notRequired">
- <delete dir="build/classes/jaxbschema"/>
- <delete dir="build/src/jaxbschema"/>
- <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
- <jvmarg value="-ea"/>
- <arg line="${repackage_arg} -name JAXBCONFIG -cp ${bootstrap.compile.path} -srconly -d build/classes/jaxbschema -src build/src/jaxbschema src/jaxb/schema"/>
- </java>
- </target>
-
- <target name="jaxb.classes" depends="dirs, jaxbschema.classes, xmlpublic.classes, typeimpl.classes, common.classes, typestore.classes, xmlinputstream.classes">
- <mkdir dir="build/src/jaxb"/>
- <mkdir dir="build/classes/jaxb"/>
-
- <javac destdir="build/classes/jaxb" classpathref="jaxb.compile.path" source="1.4" debug="on">
- <src path="src/jaxb"/>
- <src path="build/src/jaxbschema"/>
- </javac>
- </target>
<!-- build XMLInputStream interface ============================================= -->
1.5 +15 -0 xml-xmlbeans/v1/src/xsdschema/schema/XMLSchema.xsd
Index: XMLSchema.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/xsdschema/schema/XMLSchema.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLSchema.xsd 30 Mar 2004 03:35:47 -0000 1.4
+++ XMLSchema.xsd 9 Apr 2004 22:48:12 -0000 1.5
@@ -75,6 +75,21 @@
Part 1 version: Id: XMLSchema.xsd,v 1.53 2003/02/24 17:40:07 ht Exp
Part 2 version: Id: datatypes.xsd,v 1.60 2003/04/05 11:02:30 ht Exp
</xs:documentation>
+ <xs:documentation>
+ Apache XMLBean changes:
+
+ 2003/05/14: The regular expressions that describe integrity constraint
+ xpaths has been modified to permit whitespaces in certain places, as
+ discussed in one of the errata.
+
+ 2003/05/28: the type of the <element> element in an <all> group has
+ been given a name so that it is legal to use the type in both a base type
+ and a restriction when using the allModel (otherwise it breaks one of the
+ particle-valid (restriction) rules).
+
+ 2003/09/15: finalDefault has been changed to permit "list" and "union"
+
+ </xs:documentation>
</xs:annotation>
1.5 +0 -17 xml-xmlbeans/v1/test/src/drt/drtcases/CompilationTests.java
Index: CompilationTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/src/drt/drtcases/CompilationTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompilationTests.java 27 Feb 2004 00:17:20 -0000 1.4
+++ CompilationTests.java 9 Apr 2004 22:48:13 -0000 1.5
@@ -62,23 +62,6 @@
}
- public void __testBuild()
- {
- TestEnv.deltree(TestEnv.xbeanOutput("schema/s4s"));
- File inputfile1 = TestEnv.xbeanCase("schema/s4s/XML.xsd");
- File inputfile2 = TestEnv.xbeanCase("schema/s4s/XMLSchema.xsd");
- File srcdir = TestEnv.xbeanOutput("schema/s4s/s4stypes/src");
- File classesdir = TestEnv.xbeanOutput("schema/s4s/s4stypes/classes");
- File outputjar = TestEnv.xbeanOutput("schema/s4s/s4stypes.jar");
- SchemaCompiler.Parameters params = new SchemaCompiler.Parameters();
- params.setXsdFiles(new File[] { inputfile1, inputfile2 });
- params.setSrcDir(srcdir);
- params.setClassesDir(classesdir);
- params.setOutputJar(outputjar);
- Assert.assertTrue("Build failed", SchemaCompiler.compile(params));
- Assert.assertTrue("Cannout find " + outputjar, outputjar.exists());
- }
-
/* test not needed because bootstrap build tests this better
public void testNewBuild()
{
1.6 +2 -2 xml-xmlbeans/v1/test/src/drt/drtcases/ValidationTests.java
Index: ValidationTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/src/drt/drtcases/ValidationTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValidationTests.java 12 Feb 2004 20:06:05 -0000 1.5
+++ ValidationTests.java 9 Apr 2004 22:48:13 -0000 1.6
@@ -263,8 +263,8 @@
//
File file = TestEnv.getRootFile();
- File schemeFile = new File( file, "test/cases/schema/s4s/XMLSchema.xsd" );
- File xmlFile = new File( file, "test/cases/schema/s4s/XML.xsd" );
+ File schemeFile = new File( file, "src/xsdschema/schema/XMLSchema.xsd" );
+ File xmlFile = new File( file, "src/xmlschema/schema/XML.xsd" );
File[] schemasF = { schemeFile, xmlFile };
1.5 +1 -1 xml-xmlbeans/v1/xkit/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/xkit/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.txt 14 Feb 2004 07:13:39 -0000 1.4
+++ README.txt 9 Apr 2004 22:48:14 -0000 1.5
@@ -50,7 +50,7 @@
is on your path and that JAVA_HOME/bin contains java[.exe],
javac[.exe], and jar[.exe].
- 2. set your XMLBEANDIR env variable to point to the directory
+ 2. set your XMLBEANS_HOME env variable to point to the directory
containing xbean.jar (i.e., ./lib).
3. put the scripts in ./bin on your path.
1.57 +9 -0 xml-xmlbeans/v2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- build.xml 29 Mar 2004 21:08:59 -0000 1.56
+++ build.xml 9 Apr 2004 22:48:15 -0000 1.57
@@ -567,6 +567,15 @@
<mkdir dir="build/private/xmlbeans-${product.version}"/>
<copy todir="build/private/xmlbeans-${product.version}">
<fileset dir="xkit"/>
+ <fileset dir="." includes="bin/**"/>
+ </copy>
+ <copy todir="build/private/xmlbeans-${product.version}/schemas/s4s">
+ <fileset dir="src/xsdschema/schema" includes="XMLSchema.xsd"/>
+ <fileset dir="src/xmlschema/schema" includes="XML.xsd"/>
+ </copy>
+ <copy todir="build/private/xmlbeans-${product.version}/schemas">
+ <fileset dir="test/src" includes="easypo/*.xsd,easypo/*.xsdconfig"/>
+ <fileset dir="test/cases/schema" includes="cyclone/**/*.xsd,j2ee/*.xsd"/>
</copy>
<mkdir dir="build/private/xmlbeans-${product.version}/lib"/>
1.9 +14 -8 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
Index: SchemaTypeImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SchemaTypeImpl.java 23 Mar 2004 02:42:45 -0000 1.8
+++ SchemaTypeImpl.java 9 Apr 2004 22:48:15 -0000 1.9
@@ -818,12 +818,14 @@
if (xsiType != null && wildcardTypeLoader != null)
{
SchemaType itype = wildcardTypeLoader.findType(xsiType);
- if (itype == null)
- return BuiltinSchemaTypeSystem.ST_NO_TYPE;
- if (type.isAssignableFrom(itype))
+
+ // NOTE: a previous version of XMLBeans used ST_NO_TYPE if the
+ // xsiType was not derived from 'type', but this results in a
+ // ClassCastException. Instead we ignore xsi:type if it's not
+ // found or a derived type.
+ if (itype != null && type.isAssignableFrom(itype)) {
return itype;
- else
- return BuiltinSchemaTypeSystem.ST_NO_TYPE;
+ }
}
return type;
@@ -884,10 +886,14 @@
if (xsiType != null)
{
SchemaType itype = wildcardTypeLoader.findType(xsiType);
- if (itype == null || !type.isAssignableFrom(itype))
- type = BuiltinSchemaTypeSystem.ST_NO_TYPE;
- else
+
+ // NOTE: a previous version of XMLBeans used ST_NO_TYPE if the
+ // xsiType was not derived from 'type', but this results in a
+ // ClassCastException. Instead we ignore xsi:type if it's not
+ // found or a derived type.
+ if (itype != null && type.isAssignableFrom(itype)) {
type = itype;
+ }
}
}
1.2 +15 -0 xml-xmlbeans/v2/src/xsdschema/schema/XMLSchema.xsd
Index: XMLSchema.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xsdschema/schema/XMLSchema.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLSchema.xsd 26 Sep 2003 21:23:37 -0000 1.1
+++ XMLSchema.xsd 9 Apr 2004 22:48:15 -0000 1.2
@@ -75,6 +75,21 @@
Part 1 version: Id: XMLSchema.xsd,v 1.53 2003/02/24 17:40:07 ht Exp
Part 2 version: Id: datatypes.xsd,v 1.60 2003/04/05 11:02:30 ht Exp
</xs:documentation>
+ <xs:documentation>
+ Apache XMLBean changes:
+
+ 2003/05/14: The regular expressions that describe integrity constraint
+ xpaths has been modified to permit whitespaces in certain places, as
+ discussed in one of the errata.
+
+ 2003/05/28: the type of the <element> element in an <all> group has
+ been given a name so that it is legal to use the type in both a base type
+ and a restriction when using the allModel (otherwise it breaks one of the
+ particle-valid (restriction) rules).
+
+ 2003/09/15: finalDefault has been changed to permit "list" and "union"
+
+ </xs:documentation>
</xs:annotation>
1.6 +0 -17 xml-xmlbeans/v2/test/src/drt/drtcases/CompilationTests.java
Index: CompilationTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/drt/drtcases/CompilationTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CompilationTests.java 16 Mar 2004 02:13:14 -0000 1.5
+++ CompilationTests.java 9 Apr 2004 22:48:15 -0000 1.6
@@ -62,23 +62,6 @@
}
- public void __testBuild()
- {
- TestEnv.deltree(TestEnv.xbeanOutput("schema/s4s"));
- File inputfile1 = TestEnv.xbeanCase("schema/s4s/XML.xsd");
- File inputfile2 = TestEnv.xbeanCase("schema/s4s/XMLSchema.xsd");
- File srcdir = TestEnv.xbeanOutput("schema/s4s/s4stypes/src");
- File classesdir = TestEnv.xbeanOutput("schema/s4s/s4stypes/classes");
- File outputjar = TestEnv.xbeanOutput("schema/s4s/s4stypes.jar");
- SchemaCompiler.Parameters params = new SchemaCompiler.Parameters();
- params.setXsdFiles(new File[] { inputfile1, inputfile2 });
- params.setSrcDir(srcdir);
- params.setClassesDir(classesdir);
- params.setOutputJar(outputjar);
- Assert.assertTrue("Build failed", SchemaCompiler.compile(params));
- Assert.assertTrue("Cannout find " + outputjar, outputjar.exists());
- }
-
/* test not needed because bootstrap build tests this better
public void testNewBuild()
{
1.7 +2 -2 xml-xmlbeans/v2/test/src/drt/drtcases/ValidationTests.java
Index: ValidationTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/drt/drtcases/ValidationTests.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValidationTests.java 9 Apr 2004 21:53:44 -0000 1.6
+++ ValidationTests.java 9 Apr 2004 22:48:15 -0000 1.7
@@ -264,8 +264,8 @@
//
File file = TestEnv.getRootFile();
- File schemeFile = new File( file, "test/cases/schema/s4s/XMLSchema.xsd" );
- File xmlFile = new File( file, "test/cases/schema/s4s/XML.xsd" );
+ File schemeFile = new File( file, "src/xsdschema/schema/XMLSchema.xsd" );
+ File xmlFile = new File( file, "src/xmlschema/schema/XML.xsd" );
File[] schemasF = { schemeFile, xmlFile };
1.2 +3 -3 xml-xmlbeans/v2/xkit/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/xkit/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.txt 26 Sep 2003 21:23:42 -0000 1.1
+++ README.txt 9 Apr 2004 22:48:15 -0000 1.2
@@ -20,7 +20,7 @@
(4) One bit of ant task documentation.
./anttask.html
-(5) A copy of the plain javadoc tree for com.bea.xml.*
+(5) A copy of the plain javadoc tree for org.apache.xmlbeans.*
./docs/reference
(6) A preliminary collection of nicely formatted user-level
@@ -40,7 +40,7 @@
is on your path and that JAVA_HOME/bin contains java[.exe],
javac[.exe], and jar[.exe].
- 2. set your XMLBEANDIR env variable to point to the directory
+ 2. set your XMLBEANS_HOME env variable to point to the directory
containing xbean.jar (i.e., ./lib).
3. put the scripts in ./bin on your path.
@@ -113,7 +113,7 @@
(Analogous to "obj.getClass()" and "Object.class".)
* A number of utility methods are avaliable on
- com.bea.xml.XmlBeans, including a function that can be
+ org.apache.xmlbeans.XmlBeans, including a function that can be
used to determine whether a Java class is an XmlBean and
functions to manage runtime-loading of schema type
systems.
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org