djencks 2005/01/10 14:07:49
Modified: etc maven.xml project.xml
Log:
Filter geronimo-service.xml files and include them automatically when present
Revision Changes Path
1.5 +27 -1 openejb/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 12 Dec 2004 04:03:30 -0000 1.4
+++ maven.xml 10 Jan 2005 19:07:48 -0000 1.5
@@ -8,6 +8,7 @@
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:define="jelly:define"
+ xmlns:velocity="jelly:velocity"
>
<!-- ================= -->
@@ -66,6 +67,31 @@
</ant:depend>
</j:if>
</preGoal>
+
+ <!-- Copy and filter dependency lists for inclusion in generated jar. -->
+ <postGoal name="java:compile">
+ <u:available file="${basedir}/src/etc/META-INF/geronimo-service.xml">
+ <j:set var="geronimo.service.file.exists" value="true"/>
+ </u:available>
+ <j:if test="${context.getVariable('geronimo.service.file.exists')}">
+ <!-- Preprocess all plans using velocity -->
+ <ant:mkdir dir="${basedir}/target/etc/META-INF"/>
+ <fileScanner var="plans">
+ <fileset dir="${basedir}/src/etc/META-INF">
+ <include name="geronimo-service.xml"/>
+ </fileset>
+ </fileScanner>
+
+ <j:forEach var="plan" items="${plans.iterator()}">
+ <j:set var="planName" value="${plan.name}"/>
+ <echo>Preprocessing ${planName}</echo>
+ <velocity:merge
+ basedir="${basedir}/src/etc/META-INF"
+ template="${planName}"
+ name="${basedir}/target/etc/META-INF/${planName}"/>
+ </j:forEach>
+ </j:if>
+ </postGoal>
<!-- Remove the log files -->
<goal name="clobber"
1.8 +218 -190 openejb/etc/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 12 Dec 2004 04:03:30 -0000 1.7
+++ project.xml 10 Jan 2005 19:07:48 -0000 1.8
@@ -3,197 +3,225 @@
<!-- $Revision$ $Date$ -->
<project>
-
- <pomVersion>3</pomVersion>
-
- <!-- ============== -->
- <!-- Identification -->
- <!-- ============== -->
-
- <name>OpenEJB</name>
- <id>openejb</id>
- <groupId>openejb</groupId>
- <package>org.openejb</package>
- <organization>
+ <pomVersion>3</pomVersion>
+
+ <!-- ============== -->
+ <!-- Identification -->
+ <!-- ============== -->
+
<name>OpenEJB</name>
- <url>http://www.openejb.org/</url>
+ <id>openejb</id>
+ <groupId>openejb</groupId>
+ <package>org.openejb</package>
+
+ <organization>
+ <name>OpenEJB</name>
+ <url>http://www.openejb.org/</url>
+ <logo>http://www.openejb.org/images/logo_ejb2.gif</logo>
+ </organization>
+
+ <inceptionYear>1999</inceptionYear>
<logo>http://www.openejb.org/images/logo_ejb2.gif</logo>
- </organization>
+ <description>OpenEJB EJB Container</description>
+ <shortDescription>OpenEJB EJB Container</shortDescription>
+ <url>http://www.openejb.org/</url>
+
<issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10401</issueTrackingUrl>
+
+ <siteAddress>openejb.org</siteAddress>
+ <siteDirectory>/www/openejb.org</siteDirectory>
+ <distributionDirectory>/www/openejb.org/builds</distributionDirectory>
+
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:openejb</connection>
+ <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]/home/cvs:openejb</developerConnection>
+ <url>http://cvs.openejb.org/viewcvs/openejb/</url>
+ </repository>
+
+ <mailingLists>
+ <mailingList>
+ <name>OpenEJB User List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>OpenEJB Developer List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>OpenEJB Source Control List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ </mailingList>
+ </mailingLists>
+
+
+ <!-- ======== -->
+ <!-- Versions -->
+ <!-- ======== -->
+
+ <currentVersion>${openejb_version}</currentVersion>
+
+ <versions>
+ <version>
+ <id>2.0-alpha-1</id>
+ <name>2.0-alpha-1</name>
+ <tag>OPENEJB_2_0_ALPHA_1</tag>
+ </version>
+ <version>
+ <id>2.0-alpha-2</id>
+ <name>2.0-alpha-2</name>
+ <tag>HEAD</tag>
+ </version>
+ </versions>
+
+
+ <!-- ========== -->
+ <!-- Developers -->
+ <!-- ========== -->
+
+ <developers>
+
+ <developer>
+ <name>Dain Sundstrom</name>
+ <id>dain</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>David Blevins</name>
+ <id>dblevins</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>David Jencks</name>
+ <id>djencks</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>Jeremy Boynes</name>
+ <id>jboynes</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>Richard Monson-Haefel</name>
+ <id>rmonson</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>Remigio Chirino</name>
+ <id>chirino</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>Aaron Mulder</name>
+ <id>ammulder</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+
+ <developer>
+ <name>Alan D. Cabrera</name>
+ <id>adc</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+ </developers>
+
+
+ <dependencies>
+ <!-- Used for preprocessing our plans -->
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-velocity</artifactId>
+ <version>${jelly_velocity_tags_version}</version>
+ </dependency>
+ <dependency>
+ <groupId> velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity_version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+
<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/target/xmlbeans</directory>
+ <includes>
+ <include>schema/**/*.xsb</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/target/etc</directory>
+ <includes>
+ <include>META-INF/geronimo-service.xml</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ </unitTest>
+ </build>
+
+
+ <!-- ======= -->
+ <!-- Reports -->
+ <!-- ======= -->
+
+ <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-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>
+ <report>maven-clover-plugin</report>
+ </reports>
- <inceptionYear>1999</inceptionYear>
- <logo>http://www.openejb.org/images/logo_ejb2.gif</logo>
- <description>OpenEJB EJB Container</description>
- <shortDescription>OpenEJB EJB Container</shortDescription>
- <url>http://www.openejb.org/</url>
-
<issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10401</issueTrackingUrl>
-
- <siteAddress>openejb.org</siteAddress>
- <siteDirectory>/www/openejb.org</siteDirectory>
- <distributionDirectory>/www/openejb.org/builds</distributionDirectory>
-
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:openejb</connection>
- <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]/home/cvs:openejb</developerConnection>
- <url>http://cvs.openejb.org/viewcvs/openejb/</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>OpenEJB User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- </mailingList>
- <mailingList>
- <name>OpenEJB Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- </mailingList>
- <mailingList>
- <name>OpenEJB Source Control List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- </mailingList>
- </mailingLists>
-
-
- <!-- ======== -->
- <!-- Versions -->
- <!-- ======== -->
-
- <currentVersion>${openejb_version}</currentVersion>
-
- <versions>
- <version>
- <id>2.0-alpha-1</id>
- <name>2.0-alpha-1</name>
- <tag>OPENEJB_2_0_ALPHA_1</tag>
- </version>
- <version>
- <id>2.0-alpha-2</id>
- <name>2.0-alpha-2</name>
- <tag>HEAD</tag>
- </version>
- </versions>
-
-
- <!-- ========== -->
- <!-- Developers -->
- <!-- ========== -->
-
- <developers>
-
- <developer>
- <name>Dain Sundstrom</name>
- <id>dain</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>David Blevins</name>
- <id>dblevins</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>David Jencks</name>
- <id>djencks</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Jeremy Boynes</name>
- <id>jboynes</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Richard Monson-Haefel</name>
- <id>rmonson</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Remigio Chirino</name>
- <id>chirino</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Aaron Mulder</name>
- <id>ammulder</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Alan D. Cabrera</name>
- <id>adc</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
- </developers>
-
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
-
- <build>
- <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- </unitTest>
- </build>
-
-
- <!-- ======= -->
- <!-- Reports -->
- <!-- ======= -->
-
- <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-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>
- <report>maven-clover-plugin</report>
- </reports>
-
</project>
