You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2004/01/29 04:38:36 UTC
cvs commit: incubator-geronimo/sandbox/xbeans maven.xml project.xml
dain 2004/01/28 19:38:36
Modified: sandbox/explorer maven.xml project.xml
sandbox/twiddle maven.xml project.xml
sandbox/webdav project.xml
sandbox/xbeans maven.xml project.xml
Log:
Changed sandbox projects to be in the geronimo-sandbox group
Revision Changes Path
1.2 +33 -33 incubator-geronimo/sandbox/explorer/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/explorer/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 23 Jan 2004 03:47:02 -0000 1.1
+++ maven.xml 29 Jan 2004 03:38:36 -0000 1.2
@@ -3,36 +3,36 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant">
-
- <goal name="setclasspath">
- <path id="test.classpath">
- <pathelement path="${maven.build.dest}"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/test-classes"/>
- <path refid="maven.dependency.classpath"/>
- </path>
- </goal>
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant">
+
+ <goal name="setclasspath">
+ <path id="test.classpath">
+ <pathelement path="${maven.build.dest}"/>
+ <pathelement path="target/classes"/>
+ <pathelement path="target/test-classes"/>
+ <path refid="maven.dependency.classpath"/>
+ </path>
+ </goal>
+
+ <postGoal name="java:compile">
+ <attainGoal name="groovy:compile"/>
+ </postGoal>
+
+ <!-- this will move into the groovy plugin soon -->
+ <goal name="groovy:compile" prereqs="setclasspath"
+ description="Compiles the Groovy source files">
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="test.classpath"/>
+ <groovyc destdir="${basedir}/target/classes" srcdir="${basedir}/src/java" listfiles="false">
+ <classpath refid="test.classpath"/>
+ </groovyc>
+ </goal>
+
+ <goal name="run" prereqs="test:compile"
+ description="Runs the JMX explorer">
+ <java classname="org.apache.geronimo.explorer.ExplorerMain" fork="yes">
+ <classpath refid="test.classpath"/>
+ </java>
+ </goal>
- <postGoal name="java:compile">
- <attainGoal name="groovy:compile"/>
- </postGoal>
-
- <!-- this will move into the groovy plugin soon -->
- <goal name="groovy:compile" prereqs="setclasspath"
- description="Compiles the Groovy source files">
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="test.classpath"/>
- <groovyc destdir="${basedir}/target/classes" srcdir="${basedir}/src/java" listfiles="false">
- <classpath refid="test.classpath"/>
- </groovyc>
- </goal>
-
- <goal name="run" prereqs="test:compile"
- description="Runs the JMX explorer">
- <java classname="org.apache.geronimo.explorer.ExplorerMain" fork="yes">
- <classpath refid="test.classpath"/>
- </java>
- </goal>
-
</project>
1.2 +145 -144 incubator-geronimo/sandbox/explorer/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/explorer/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 23 Jan 2004 03:47:02 -0000 1.1
+++ project.xml 29 Jan 2004 03:38:36 -0000 1.2
@@ -3,148 +3,149 @@
<!-- $Revision$ $Date$ -->
<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
-
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
-
- <name>Geronimo :: Explorer</name>
- <id>geronimo-explorer</id>
- <shortDescription></shortDescription>
- <description></description>
- <siteDirectory></siteDirectory>
- <distributionDirectory></distributionDirectory>
-
- <package>org.apache.geronimo.explorer</package>
- <currentVersion>DEV</currentVersion>
-
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
-
- <!-- Module Dependencies -->
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>DEV</version>
- <properties>
- <module>true</module>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>DEV</version>
- <properties>
- <module>true</module>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-remoting</artifactId>
- <version>DEV</version>
- <properties>
- <module>true</module>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <!-- Thirdparty Dependencies -->
-
- <dependency>
- <id>mx4j</id>
- <version>SNAPSHOT</version>
- <properties>
- <bootstrap>true</bootstrap>
- </properties>
- </dependency>
-
- <dependency>
- <id>groovy</id>
- <version>1.0-alpha-1</version>
- <url>http://groovy.codehaus.org</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>asm</id>
- <version>1.3.4</version>
- </dependency>
-
- <!-- temp hack - won't need this soon -->
- <dependency>
- <id>asm+util</id>
- <version>1.3.4</version>
- <url>http://asm.objectweb.org/</url>
- </dependency>
-
- <!-- Runtime dependencies due to remoting -->
- <dependency>
- <id>commons-lang</id>
- <version>SNAPSHOT</version>
- <url>http://jakarta.apache.org/commons/lang</url>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>concurrent</id>
- <version>1.3.2</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
-
- </dependencies>
-
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
-
- <build>
- <unitTest>
- <!-- For some reason this is not pulled from the global project -->
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
-
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- </build>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Explorer</name>
+ <groupId>geronimo-sandbox</groupId>
+ <id>geronimo-sandbox-explorer</id>
+ <shortDescription></shortDescription>
+ <description></description>
+ <siteDirectory></siteDirectory>
+ <distributionDirectory></distributionDirectory>
+
+ <package>org.apache.geronimo.explorer</package>
+ <currentVersion>DEV</currentVersion>
+
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+
+ <!-- Module Dependencies -->
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-core</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-remoting</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <!-- Thirdparty Dependencies -->
+
+ <dependency>
+ <id>mx4j</id>
+ <version>SNAPSHOT</version>
+ <properties>
+ <bootstrap>true</bootstrap>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>groovy</id>
+ <version>1.0-alpha-1</version>
+ <url>http://groovy.codehaus.org</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>asm</id>
+ <version>1.3.4</version>
+ </dependency>
+
+ <!-- temp hack - won't need this soon -->
+ <dependency>
+ <id>asm+util</id>
+ <version>1.3.4</version>
+ <url>http://asm.objectweb.org/</url>
+ </dependency>
+
+ <!-- Runtime dependencies due to remoting -->
+ <dependency>
+ <id>commons-lang</id>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/lang</url>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>concurrent</id>
+ <version>1.3.2</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <unitTest>
+ <!-- For some reason this is not pulled from the global project -->
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
</project>
1.2 +17 -17 incubator-geronimo/sandbox/twiddle/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/twiddle/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 23 Jan 2004 02:57:16 -0000 1.1
+++ maven.xml 29 Jan 2004 03:38:36 -0000 1.2
@@ -3,21 +3,21 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:castor="common:castor">
-
- <!-- ================================= -->
- <!-- Compile XML->Java Binding Sources -->
- <!-- ================================= -->
-
- <preGoal name="java:compile">
- <castor:generate
- schema="${basedir}/src/schema/twiddle-configuration.xsd"
- binding="${basedir}/src/etc/twiddle-configuration-binding.xml"
- package="org.apache.geronimo.twiddle.config"
- marshal="false"
- types="j2"/>
- </preGoal>
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:castor="common:castor">
+
+ <!-- ================================= -->
+ <!-- Compile XML->Java Binding Sources -->
+ <!-- ================================= -->
+
+ <preGoal name="java:compile">
+ <castor:generate
+ schema="${basedir}/src/schema/twiddle-configuration.xsd"
+ binding="${basedir}/src/etc/twiddle-configuration-binding.xml"
+ package="org.apache.geronimo.twiddle.config"
+ marshal="false"
+ types="j2"/>
+ </preGoal>
</project>
1.2 +155 -164 incubator-geronimo/sandbox/twiddle/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/twiddle/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 23 Jan 2004 02:57:16 -0000 1.1
+++ project.xml 29 Jan 2004 03:38:36 -0000 1.2
@@ -3,170 +3,161 @@
<!-- $Revision$ $Date$ -->
<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
-
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
-
- <name>Geronimo :: Twiddle</name>
- <id>geronimo-twiddle</id>
- <shortDescription></shortDescription>
- <description></description>
- <siteDirectory></siteDirectory>
- <distributionDirectory></distributionDirectory>
-
- <package>org.apache.geronimo.twiddle</package>
- <currentVersion>DEV</currentVersion>
-
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
-
- <!-- Module Dependencies -->
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>DEV</version>
- <properties>
- <module>true</module>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <!-- Thirdparty Dependencies -->
-
- <!-- Will need this for the expression parser generation
- <dependency>
- <id>javacc</id>
- <jar>JavaCC.zip</jar>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
- -->
-
- <dependency>
- <id>classworlds</id>
- <version>SNAPSHOT</version>
- <url>http://classworlds.codehaus.org</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>castor</id>
- <version>0.9.5</version>
- <url>http://castor.exolab.org</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Twiddle</name>
+ <groupId>geronimo-sandbox</groupId>
+ <id>geronimo-sandbox-twiddle</id>
+ <shortDescription></shortDescription>
+ <description></description>
+ <siteDirectory></siteDirectory>
+ <distributionDirectory></distributionDirectory>
+
+ <package>org.apache.geronimo.twiddle</package>
+ <currentVersion>DEV</currentVersion>
+
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+
+ <!-- Module Dependencies -->
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <!-- Thirdparty Dependencies -->
+
+ <dependency>
+ <id>classworlds</id>
+ <version>SNAPSHOT</version>
+ <url>http://classworlds.codehaus.org</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>castor</id>
+ <version>0.9.5</version>
+ <url>http://castor.exolab.org</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.6.0</version>
- <url>http://xml.apache.org</url>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- <url>http://jakarta.apache.org/log4j</url>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-beanutils</id>
- <version>SNAPSHOT</version>
- <url>http://jakarta.apache.org/commons/beanutils</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-collections</id>
- <version>SNAPSHOT</version>
- <url>http://jakarta.apache.org/commons/collections</url>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-lang</id>
- <version>SNAPSHOT</version>
- <url>http://jakarta.apache.org/commons/lang</url>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging</url>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-cli</id>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/cli</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- </dependencies>
-
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
-
- <build>
- <unitTest>
- <!-- For some reason this is not pulled from the global project -->
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
-
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- </build>
+ <version>2.6.0</version>
+ <url>http://xml.apache.org</url>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ <url>http://jakarta.apache.org/log4j</url>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/beanutils</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-collections</id>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-lang</id>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/lang</url>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging</url>
+ <properties>
+ <runtime>false</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-cli</id>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/cli</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <unitTest>
+ <!-- For some reason this is not pulled from the global project -->
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
</project>
1.3 +3 -2 incubator-geronimo/sandbox/webdav/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/webdav/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 23 Jan 2004 02:29:00 -0000 1.2
+++ project.xml 29 Jan 2004 03:38:36 -0000 1.3
@@ -11,7 +11,8 @@
<!-- ===================== -->
<name>Geronimo :: WebDav</name>
- <id>geronimo-webdav</id>
+ <groupId>geronimo-sandbox</groupId>
+ <id>geronimo-sandbox-webdav</id>
<shortDescription>Geronimo WebDav</shortDescription>
<description>Geronimo WebDav</description>
<url>http://incubator.apache.org/projects/geronimo/webdav/</url>
1.2 +103 -103 incubator-geronimo/sandbox/xbeans/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/xbeans/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 22 Jan 2004 21:39:55 -0000 1.1
+++ maven.xml 29 Jan 2004 03:38:36 -0000 1.2
@@ -3,108 +3,108 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:castor="common:castor">
-
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- </preGoal>
-
- <preGoal name="site">
- <attainGoal name="generate:xmlbeans"/>
- </preGoal>
-
- <preGoal name="java:compile">
- <attainGoal name="generate:xmlbeans"/>
- </preGoal>
-
-
- <!-- ================================= -->
- <!-- Compile XML->Java Binding Sources -->
- <!-- ================================= -->
-
- <goal name="generate:xmlbeans"
- description="Generates the XML beans using XMLBeans">
-
- <j:jelly xmlns="jelly:ant">
- <!-- 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" />
- -->
-
- <j:set var="uptodatePropName" value="xmlbeans.uptodate"/>
- <j:expr value="${context.setVariable(uptodatePropName, null)}"/>
- <j:set var="uptodateFile" value="${basedir}/target/xmlbeans/tstamp"/>
-
- <uptodate property="${uptodatePropName}"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven"
+ xmlns:castor="common:castor">
+
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ </preGoal>
+
+ <preGoal name="site">
+ <attainGoal name="generate:xmlbeans"/>
+ </preGoal>
+
+ <preGoal name="java:compile">
+ <attainGoal name="generate:xmlbeans"/>
+ </preGoal>
+
+
+ <!-- ================================= -->
+ <!-- Compile XML->Java Binding Sources -->
+ <!-- ================================= -->
+
+ <goal name="generate:xmlbeans"
+ description="Generates the XML beans using XMLBeans">
+
+ <j:jelly xmlns="jelly:ant">
+ <!-- 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" />
+ -->
+
+ <j:set var="uptodatePropName" value="xmlbeans.uptodate"/>
+ <j:expr value="${context.setVariable(uptodatePropName, null)}"/>
+ <j:set var="uptodateFile" value="${basedir}/target/xmlbeans/tstamp"/>
+
+ <uptodate property="${uptodatePropName}"
targetfile="${uptodateFile}">
- <srcfiles dir="${basedir}/target/xmlbeans/gen" includes="**/*.xsd*"/>
- </uptodate>
-
- <j:if test="${context.getVariable(uptodatePropName) == null}">
- <java classname="com.bea.xbean.tool.SchemaCompiler" fork="yes">
- <classpath refid="maven.dependency.classpath"/>
- <arg value="-src"/>
- <arg value="${basedir}/target/xmlbeans/gen"/>
- <arg value="-srconly"/>
- <arg value="-dl"/>
- <arg value="on"/>
- <arg value="${basedir}/src"/>
- </java>
-
- <touch file="${uptodateFile}"/>
- </j:if>
-
- </j:jelly>
- </goal>
-
- <goal name="generate:jaxb"
- description="Generates the XML beans using JAXB">
-
- <j:jelly xmlns="jelly:ant">
-
- <!-- <j:set var="schema" value="${basedir}/src/schema/j2ee_1_4.xsd"/> -->
- <j:set var="schema" value="${basedir}/src/schema/ejb-jar_2_1.xsd"/>
- <j:set var="dir" value="${basedir}/target/src"/>
-
- <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
- <classpath refid="maven.dependency.classpath" />
- </taskdef>
-
- <ant:mkdir dir="${dir}"/>
-
- <xjc target="${dir}" package="org.apache.geronimo.xmlbeans.ejb" extension="true">
- <arg value="-nv"/>
-
- <schema dir="${basedir}/src/schema" includes="j2ee_1*.xsd,ejb-jar*.xsd"/>
- <binding dir="${basedir}/src/etc" includes="*.xjb"/>
-
- <!--
- <produces dir="??" includes="* impl/*" />
- -->
- </xjc>
- </j:jelly>
- </goal>
-
- <goal name="generate:castor"
+ <srcfiles dir="${basedir}/target/xmlbeans/gen" includes="**/*.xsd*"/>
+ </uptodate>
+
+ <j:if test="${context.getVariable(uptodatePropName) == null}">
+ <java classname="com.bea.xbean.tool.SchemaCompiler" fork="yes">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg value="-src"/>
+ <arg value="${basedir}/target/xmlbeans/gen"/>
+ <arg value="-srconly"/>
+ <arg value="-dl"/>
+ <arg value="on"/>
+ <arg value="${basedir}/src"/>
+ </java>
+
+ <touch file="${uptodateFile}"/>
+ </j:if>
+
+ </j:jelly>
+ </goal>
+
+ <goal name="generate:jaxb"
+ description="Generates the XML beans using JAXB">
+
+ <j:jelly xmlns="jelly:ant">
+
+ <!-- <j:set var="schema" value="${basedir}/src/schema/j2ee_1_4.xsd"/> -->
+ <j:set var="schema" value="${basedir}/src/schema/ejb-jar_2_1.xsd"/>
+ <j:set var="dir" value="${basedir}/target/src"/>
+
+ <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
+ <classpath refid="maven.dependency.classpath"/>
+ </taskdef>
+
+ <ant:mkdir dir="${dir}"/>
+
+ <xjc target="${dir}" package="org.apache.geronimo.xmlbeans.ejb" extension="true">
+ <arg value="-nv"/>
+
+ <schema dir="${basedir}/src/schema" includes="j2ee_1*.xsd,ejb-jar*.xsd"/>
+ <binding dir="${basedir}/src/etc" includes="*.xjb"/>
+
+ <!--
+ <produces dir="??" includes="* impl/*" />
+ -->
+ </xjc>
+ </j:jelly>
+ </goal>
+
+ <goal name="generate:castor"
description="Generates the XML beans using Castor">
- <castor:generate
- schema="${basedir}/src/schema/ejb-jar_2_1.xsd"
- binding="${basedir}/src/etc/binding-configuration.xml"
- package="org.apache.geronimo.xbeans.ejb"
- marshal="false"
- types="j2"/>
- </goal>
+ <castor:generate
+ schema="${basedir}/src/schema/ejb-jar_2_1.xsd"
+ binding="${basedir}/src/etc/binding-configuration.xml"
+ package="org.apache.geronimo.xbeans.ejb"
+ marshal="false"
+ types="j2"/>
+ </goal>
</project>
1.2 +124 -123 incubator-geronimo/sandbox/xbeans/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/xbeans/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 22 Jan 2004 21:39:55 -0000 1.1
+++ project.xml 29 Jan 2004 03:38:36 -0000 1.2
@@ -3,128 +3,129 @@
<!-- $Revision$ $Date$ -->
<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
-
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
-
- <name>Geronimo :: XBeans</name>
- <id>geronimo-xbeans</id>
- <shortDescription></shortDescription>
- <description></description>
- <siteDirectory>/home/jstrachan/public_html/geronimo/modules/xbeans</siteDirectory>
- <distributionDirectory></distributionDirectory>
-
- <package>org.apache.geronimo.xbeans</package>
- <currentVersion>DEV</currentVersion>
-
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
-
- <!-- Module Dependencies -->
-
- <!-- Thirdparty Dependencies -->
-
- <!-- For XMLBeans -->
- <dependency>
- <id>xmlbeans</id>
- <version>1.0</version>
- </dependency>
-
- <!-- For JAXB -->
- <!--
- <dependency>
- <id>jaxb+api</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>jaxb+impl</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>jaxb+libs</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>jaxb+xjc</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>jaxb+qname</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>jaxb+namespace</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>relaxngDatatype</id>
- <version>20020414</version>
- </dependency>
- <dependency>
- <id>xsdlib</id>
- <version>20030225</version>
- </dependency>
- -->
-
- <!-- for castor -->
- <!--
- <dependency>
- <id>castor</id>
- <version>0.9.5</version>
- <url>http://castor.exolab.org</url>
- </dependency>
- <dependency>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: XBeans</name>
+ <groupId>geronimo-sandbox</groupId>
+ <id>geronimo-sandbox-xbeans</id>
+ <shortDescription></shortDescription>
+ <description></description>
+ <siteDirectory></siteDirectory>
+ <distributionDirectory></distributionDirectory>
+
+ <package>org.apache.geronimo.xbeans</package>
+ <currentVersion>DEV</currentVersion>
+
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+
+ <!-- Module Dependencies -->
+
+ <!-- Thirdparty Dependencies -->
+
+ <!-- For XMLBeans -->
+ <dependency>
+ <id>xmlbeans</id>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- For JAXB -->
+ <!--
+ <dependency>
+ <id>jaxb+api</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jaxb+impl</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jaxb+libs</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jaxb+xjc</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jaxb+qname</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jaxb+namespace</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>relaxngDatatype</id>
+ <version>20020414</version>
+ </dependency>
+ <dependency>
+ <id>xsdlib</id>
+ <version>20030225</version>
+ </dependency>
+ -->
+
+ <!-- for castor -->
+ <!--
+ <dependency>
+ <id>castor</id>
+ <version>0.9.5</version>
+ <url>http://castor.exolab.org</url>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.6.0</version>
- <url>http://xml.apache.org</url>
- </dependency>
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- </dependency>
-
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging.html</url>
- </dependency>
- -->
-
- </dependencies>
-
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
-
- <build>
- <sourceDirectory>${basedir}/target/xmlbeans/gen</sourceDirectory>
- </build>
-
- <reports>
- <report>maven-license-plugin</report>
-<!--
- <report>maven-checkstyle-plugin</report>
- <report>maven-pmd-plugin</report>
- <report>maven-simian-plugin</report>
- <report>maven-jdepend-plugin</report>
- <report>maven-clover-plugin</report>
--->
- <report>maven-changelog-plugin</report>
- <report>maven-statcvs-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-junit-report-plugin</report>
- </reports>
+ <version>2.6.0</version>
+ <url>http://xml.apache.org</url>
+ </dependency>
+
+ <dependency>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging.html</url>
+ </dependency>
+ -->
+
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <sourceDirectory>${basedir}/target/xmlbeans/gen</sourceDirectory>
+ </build>
+
+ <reports>
+ <report>maven-license-plugin</report>
+ <!--
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-pmd-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-clover-plugin</report>
+ -->
+ <report>maven-changelog-plugin</report>
+ <report>maven-statcvs-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ </reports>
</project>