jstrachan 2003/08/22 03:24:06
Modified: modules/xmlbeans maven.xml
Added: modules/xmlbeans/src/schema j2ee_1_4.xsdconfig XML.xsdconfig
Removed: modules/xmlbeans/src/etc ejb-jar_2_1.xsdconfig
j2ee_1_4.xsdconfig application-client_1_4.xsdconfig
XML.xsdconfig web-app_2_4.xsdconfig
connector_1_5.xsdconfig application_1_4.xsdconfig
jsp_2_0.xsdconfig
Log:
fixed the XMLBeans generation mechanism so that it works nicely & creates all
the beans in the right package.
Next on the list is to split the j2ee namespace into modules, which is possible
on a QName by QName basis - we just need to generate the xsdconfig files from
the schema files using
Revision Changes Path
1.1
incubator-geronimo/modules/xmlbeans/src/schema/j2ee_1_4.xsdconfig
Index: j2ee_1_4.xsdconfig
===================================================================
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config";
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";>
<xb:namespace uri="http://java.sun.com/xml/ns/j2ee";>
<xb:package>org.apache.geronimo.xmlbeans.j2ee</xb:package>
</xb:namespace>
<!--
<xb:namespace uri="http://www.w3.org/XML/1998/namespace";>
<xb:package>org.apache.geronimo.xmlbeans.w3.namespace</xb:package>
</xb:namespace>
<xb:namespace uri="##any">
<xb:prefix>Xml</xb:prefix>
<xb:suffix>Bean</xb:suffix>
</xb:namespace>
-->
</xb:config>
1.1
incubator-geronimo/modules/xmlbeans/src/schema/XML.xsdconfig
Index: XML.xsdconfig
===================================================================
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config";>
<xb:namespace uri="http://www.w3.org/XML/1998/namespace";>
<xb:package>org.apache.geronimo.xmlbeans.xml.namespace</xb:package>
</xb:namespace>
</xb:config>
1.5 +24 -17 incubator-geronimo/modules/xmlbeans/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/xmlbeans/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 16 Aug 2003 15:14:13 -0000 1.4
+++ maven.xml 22 Aug 2003 10:24:06 -0000 1.5
@@ -28,22 +28,29 @@
<!-- a dummy scope tag to change XML namespace to ant -->
<j:scope xmlns="jelly:ant">
- <taskdef name="xmlbean" classname="com.bea.xbean.tool.XMLBean"
classpathref="maven.dependency.classpath"/>
-
- <ant:mkdir dir="${dir}"/>
- <!--
- destfile="${basedir}/target/xmlbeans.jar">
- typesystemname="org.apache.geronimo.xmlbeans"
- -->
- <xmlbean
-
- schema="${basedir}/src/schema"
- srcgendir="${basedir}/target/src"
- classpathref="maven.dependency.classpath"
- srconly="true"
- download="true"
- failonerror="true" />
-
+ <mkdir dir="${dir}"/>
+
+<!-- currently there's a classloader bug with xsdconfig files with Ant task
+ <taskdef name="xmlbean" classname="com.bea.xbean.tool.XMLBean"
classpathref="maven.dependency.classpath"/>
+
+ <xmlbean
+ schema="${basedir}/src/schema"
+ srcgendir="${basedir}/target/src"
+ classpathref="maven.dependency.classpath"
+ srconly="true"
+ download="true"
+ failonerror="true" />
+-->
+
+ <java classname="com.bea.xbean.tool.SchemaCompiler" fork="yes">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg value="-src"/>
+ <arg value="${basedir}/target/src/schema"/>
+ <arg value="-srconly"/>
+ <arg value="-dl"/>
+ <arg value="on"/>
+ <arg value="${basedir}/src"/>
+ </java>
</j:scope>
</goal>
