jdillon 2003/08/24 14:44:02
Modified: modules/core maven.xml project.xml
Log:
o The castor plugin is broken... so invoke the generator by hand
Revision Changes Path
1.13 +25 -5 incubator-geronimo/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 24 Aug 2003 21:25:40 -0000 1.12
+++ maven.xml 24 Aug 2003 21:44:02 -0000 1.13
@@ -13,10 +13,30 @@
</preGoal>
<preGoal name="java:compile">
- <castor:generate schema="${basedir}/src/schema/geronimo-ejb-jar.xsd"
- package="org.apache.geronimo.twiddle.config"
- marshal="false"
- types="j2"/>
+ <attainGoal name="castor:prepare-filesystem"/>
+
+ <j:set var="schema" value="${basedir}/src/schema/geronimo-ejb-jar.xsd"/>
+ <j:set var="gen"
value="${pom.getPluginContext('maven-castor-plugin').getVariable('maven.castor.dest')}"/>
+
+ <ant:path id="castor.classpath">
+ <ant:path refid="maven.dependency.classpath"/>
+ </ant:path>
+
+ <ant:java className="org.exolab.castor.builder.SourceGenerator"
+ failonerror="true" fork="yes">
+ <ant:classpath refid="castor.classpath"/>
+ <ant:arg value="-i"/>
+ <ant:arg value="${schema}"/>
+ <ant:arg value="-package"/>
+ <ant:arg value="org.apache.geronimo.enterprise.deploy.common"/>
+ <ant:arg value="-types"/>
+ <ant:arg value="j2"/>
+ <ant:arg value="-nomarshall"/>
+ <ant:arg value="-f"/>
+ <ant:arg value="-dest"/>
+ <ant:arg value="${gen}"/>
+ </ant:java>
+
</preGoal>
<postGoal name="java:compile">
1.13 +19 -2 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 24 Aug 2003 11:23:14 -0000 1.12
+++ project.xml 24 Aug 2003 21:44:02 -0000 1.13
@@ -162,7 +162,24 @@
<version>0.9.5</version>
<url>http://castor.exolab.org</url>
</dependency>
-
+
+ <dependency>
+ <id>xerces</id>
+ <version>2.4.0</version>
+ <url>http://xml.apache.org</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
<dependency>
<id>dom4j</id>
<version>1.4</version>
