You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2003/12/10 11:54:07 UTC
cvs commit: incubator-geronimo/modules/web project.xml
gdamour 2003/12/10 02:54:07
Modified: modules/kernel project.xml maven.xml
modules/core project.xml
modules/common project.xml
etc maven.xml
modules/web project.xml
Log:
Adding geronimo-tools dependence for integration of the XDoclet task
"geronimo".
Revision Changes Path
1.11 +26 -1 incubator-geronimo/modules/kernel/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 17 Nov 2003 10:57:40 -0000 1.10
+++ project.xml 10 Dec 2003 10:54:07 -0000 1.11
@@ -70,6 +70,14 @@
</dependency>
<!-- Module Dependencies -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-tools</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
<dependency>
<groupId>geronimo-spec</groupId>
@@ -170,6 +178,23 @@
</includes>
</resource>
</resources>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/test-xdoclet/jmx/org/apache/geronimo/tools/xdoclet</directory>
+ <targetPath>org/apache/geronimo/tools/xdoclet</targetPath>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
</build>
</project>
1.3 +5 -1 incubator-geronimo/modules/kernel/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 8 Sep 2003 04:54:12 -0000 1.2
+++ maven.xml 10 Dec 2003 10:54:07 -0000 1.3
@@ -11,6 +11,10 @@
<attainGoal name="xdoclet:jmxdoclet:compile"/>
</preGoal>
+ <preGoal name="test:compile">
+ <attainGoal name="xdoclet:jmxdoclet:test-compile"/>
+ </preGoal>
+
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
1.30 +11 -2 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 18 Nov 2003 05:19:23 -0000 1.29
+++ project.xml 10 Dec 2003 10:54:07 -0000 1.30
@@ -68,9 +68,18 @@
</properties>
</dependency>
- <!-- Module Dependencies -->
+ <!-- Module Dependencies -->
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-tools</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>DEV</version>
1.16 +10 -1 incubator-geronimo/modules/common/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/common/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 24 Oct 2003 22:58:39 -0000 1.15
+++ project.xml 10 Dec 2003 10:54:07 -0000 1.16
@@ -65,6 +65,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-tools</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>DEV</version>
<properties>
1.23 +61 -6 incubator-geronimo/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 25 Nov 2003 04:19:29 -0000 1.22
+++ maven.xml 10 Dec 2003 10:54:07 -0000 1.23
@@ -210,10 +210,8 @@
targetfile="${uptodateFile}">
<srcfiles dir="${srcdir}" includes="**/*.java"/>
</uptodate>
-
+
<j:if test="${context.getVariable(uptodatePropName) == null}">
- <echo>Generating MBean interfaces...</echo>
-
<!-- Load the jmxdoclet task -->
<taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask">
<classpath>
@@ -224,7 +222,8 @@
<!-- Where sources will be generated -->
<mkdir dir="${destdir}"/>
- <!-- Generate MBean interfaces -->
+ <echo>Generating MBean interfaces...</echo>
+ <!-- Generate MBean interfaces -->
<jmxdoclet destDir="${destdir}" verbose="false">
<fileset dir="${srcdir}">
@@ -233,11 +232,59 @@
<mbeaninterface templateFile="${project.root}/etc/xdoclet/template/jmx/mbean.xdt"/>
</jmxdoclet>
+
+ <touch file="${uptodateFile}"/>
+ </j:if>
+
+ </define:tag>
+
+ <define:tag name="geronimodoclet" xmlns="jelly:ant">
+ <j:if test="${srcdir == null}">
+ <fail>Missing required attribute: srcdir</fail>
+ </j:if>
+ <j:if test="${destdir == null}">
+ <fail>Missing required attribute: destdir</fail>
+ </j:if>
+
+ <!-- Inlcude the generated sources in the Javac compile -->
+ <j:if test="${appendSet != null}">
+ <path id="xdoclet.geronimo.compile.src.set" location="${destdir}"/>
+ <maven:addPath id="${appendSet}" refid="xdoclet.geronimo.compile.src.set"/>
+ </j:if>
+
+ <j:set var="uptodatePropName" value="xdoclet.geronimo.uptodate"/>
+ <j:expr value="${context.setVariable(uptodatePropName, null)}"/>
+ <j:set var="uptodateFile" value="${destdir}/tstampGeronimoDoclet"/>
+
+ <uptodate property="${uptodatePropName}"
+ targetfile="${uptodateFile}">
+ <srcfiles dir="${srcdir}" includes="**/*.java"/>
+ </uptodate>
+
+ <j:if test="${context.getVariable(uptodatePropName) == null}">
+ <!-- Load the geronimodoclet task -->
+ <taskdef name="geronimodoclet" classname="org.apache.geronimo.tools.xdoclet.GeronimoDocletTask">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </taskdef>
+
+ <!-- Where sources will be generated -->
+ <mkdir dir="${destdir}"/>
+ <echo>Generating GeronimoMBeanInfo XML...</echo>
+ <geronimodoclet destDir="${destdir}" verbose="false">
+ <fileset dir="${srcdir}">
+ <include name="**/*.java"/>
+ </fileset>
+ <mbeaninfo/>
+ </geronimodoclet>
+
<touch file="${uptodateFile}"/>
</j:if>
</define:tag>
+
</define:taglib>
<goal name="xdoclet:jmxdoclet:compile">
@@ -245,6 +292,10 @@
srcdir="${basedir}/src/java"
destdir="${basedir}/target/xdoclet/jmx"
appendSet="maven.compile.src.set"/>
+ <xdoclet:geronimodoclet
+ srcdir="${basedir}/src/java"
+ destdir="${basedir}/target/classes"
+ appendSet="maven.compile.src.set"/>
</goal>
<goal name="xdoclet:jmxdoclet:test-compile">
@@ -252,6 +303,10 @@
srcdir="${basedir}/src/test"
destdir="${basedir}/target/test-xdoclet/jmx"
appendSet="maven.test.compile.src.set"/>
+ <xdoclet:geronimodoclet
+ srcdir="${basedir}/src/test"
+ destdir="${basedir}/target/test-classes"
+ appendSet="maven.test.compile.src.set"/>
</goal>
@@ -339,4 +394,4 @@
</define:tag>
</define:taglib>
-</project>
\ No newline at end of file
+</project>
1.11 +10 -2 incubator-geronimo/modules/web/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 24 Nov 2003 04:42:10 -0000 1.10
+++ project.xml 10 Dec 2003 10:54:07 -0000 1.11
@@ -27,6 +27,14 @@
<dependencies>
<!-- Module Dependencies -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-tools</artifactId>
+ <version>DEV</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -237,7 +245,7 @@
</properties>
</dependency>
- <!-- Required by Jasper to compile .jsp files... lame -->
+ <!-- Required by Jasper to compile .jsp files... lame -->
<dependency>
<id>ant</id>
<version>1.5.2</version>