You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2003/08/12 16:48:56 UTC
cvs commit: incubator-geronimo/modules/core maven.xml project.xml
jdillon 2003/08/12 07:48:56
Modified: . maven.xml project.properties project.xml
modules/core maven.xml project.xml
Log:
o Using etc/* global files
o Reformatted
Revision Changes Path
1.6 +12 -6 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 12 Aug 2003 12:13:43 -0000 1.5
+++ maven.xml 12 Aug 2003 14:48:56 -0000 1.6
@@ -6,12 +6,20 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven">
-
+
+ <!-- ===================== -->
+ <!-- Module Initialization -->
+ <!-- ===================== -->
+
+ <ant:property file="${basedir}/etc/project.properties"/>
+
+
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
<attainGoal name="faq"/>
</preGoal>
-
+
+
<goal name="run" prereqs="set.classpath"
description="Runs the Geronimo Server using the current build">
<ant:java classname="org.apache.geronimo.Main" fork="yes">
@@ -59,10 +67,8 @@
<attainGoal name="modules:reactor"/>
</goal>
- <!-- Need to refactor project globals before this will function properly
<preGoal name="clean">
<attainGoal name="modules:clean"/>
</preGoal>
- -->
-
+
</project>
1.3 +4 -55 incubator-geronimo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 11 Aug 2003 09:37:20 -0000 1.2
+++ project.properties 12 Aug 2003 14:48:56 -0000 1.3
@@ -1,56 +1,5 @@
-maven.junit.fork=true
-#####################################################
-# Build and Deployment
-#####################################################
-maven.repo.remote = http://www.ibiblio.org/maven/
-maven.simian.linecount = 3
-maven.compile.source=1.4
-maven.compile.target=1.4
-#####################################################
-# Properties related to project-site
-#####################################################
-maven.xdoc.date=left
-maven.xdoc.version=${pom.currentVersion}
-maven.linkcheck.enable = true
-maven.javadoc.links = http://java.sun.com/j2se/1.4.1/docs/api/
-maven.javadoc.source = 1.4
+##
+## $Id$
+##
+
-#####################################################
-# Site Colors
-#####################################################
-#maven.ui.body.background = #FFFFFF
-#maven.ui.body.foreground = #1F354D
-#maven.ui.section.background = #A2B7C5
-#maven.ui.section.foreground = #FFFFFF
-#maven.ui.subsection.foreground = #1F354D
-#maven.ui.subsection.background = #F2F5F7
-#maven.ui.table.header.background = #E5E3DB
-#maven.ui.table.header.foreground = #686868
-#maven.ui.table.row.odd.foreground = #686868
-#maven.ui.table.row.even.background = #F5F4F1
-#maven.ui.table.row.odd.background = #F5F4F1
-#maven.ui.table.row.even.foreground = #686868
-#maven.ui.banner.background = #FFFFFF
-#maven.ui.banner.foreground = #FFFFFF
-#maven.ui.banner.border.top = #A2B7C5
-#maven.ui.banner.border.bottom = #A2B7C5
-#maven.ui.source.background = #FFFFFF
-#maven.ui.source.foreground = #000000
-#maven.ui.source.border.right = #A2B7C5
-#maven.ui.source.border.top = #A2B7C5
-#maven.ui.source.border.left = #A2B7C5
-#maven.ui.source.border.bottom = #A2B7C5
-#maven.ui.navcol.background = #F2F5F7
-#maven.ui.navcol.background.ns4 = #F2F5F7
-#maven.ui.navcol.foreground = #000000
-#maven.ui.navcol.foreground.ns4 = #555
-#maven.ui.navcol.border.top = #F2F5F7
-#maven.ui.navcol.border.right = #A2B7C5
-#maven.ui.navcol.border.bottom = #A2B7C5
-#maven.ui.breadcrumbs.background = #D5E1E9
-#maven.ui.breadcrumbs.foreground = #000000
-#maven.ui.breadcrumbs.border.bottom = #A2B7C5
-#maven.ui.breadcrumbs.border.top = #D5E1E9
-#maven.ui.href.link = #1F354D
-#maven.ui.href.link.active = #FF5A00
-#maven.ui.href.link.selfref = #1F354D
1.9 +36 -251 incubator-geronimo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 12 Aug 2003 10:57:40 -0000 1.8
+++ project.xml 12 Aug 2003 14:48:56 -0000 1.9
@@ -1,256 +1,41 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
- <pomVersion>3</pomVersion>
- <id>geronimo</id>
- <name>Geronimo</name>
- <currentVersion>1.0-alpha-1-SNAPSHOT</currentVersion>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://incubator.apache.org/</url>
- <logo>/images/group-logo.gif</logo>
- </organization>
-
- <inceptionYear>2003</inceptionYear>
- <package>org.apache.geronimo</package>
- <logo>/images/geronimo.jpg</logo>
- <description>Geronimo J2EE Application Server</description>
- <shortDescription>Geronimo J2EE Application Server</shortDescription>
- <url>http://incubator.apache.org/projects/geronimo/</url>
+<?xml version="1.0" encoding="UTF-8"?>
-<!--
- I hope we can use JIRA but will probably have to settle for bugzilla
-
- <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=XXXX</issueTrackingUrl>
--->
- <siteAddress>incubator.apache.org</siteAddress>
+<!-- $Id$ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo</name>
+ <id>geronimo</id>
+
+ <currentVersion>1.0-alpha-1-SNAPSHOT</currentVersion>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
<!--
- <siteDirectory>/www/incubator.apache.org/projects/geronimo</siteDirectory>
- -->
- <siteDirectory>/home/jstrachan/public_html/geronimo</siteDirectory>
-
- <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds</distributionDirectory>
- <repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:incubator-geronimo</connection>
- <developerConnection>scm:cvs:ext:${geronimo.username}@cvs.apache.org:/home/cvs:incubator-geronimo</developerConnection>
- <url>http://cvs.apache.org/viewcvs/incubator-geronimo/</url>
- </repository>
-
- <versions>
- <version>
- <id>1.0-alpha-1</id>
- <name>1.0-alpha-1</name>
- <tag>GERONIMO_1_0_ALPHA_1</tag>
- </version>
- <version>
- <id>1.0-alpha-2</id>
- <name>1.0-alpha-2</name>
- <tag>HEAD</tag>
- </version>
- </versions>
-
-
-
- <mailingLists>
-<!--
- <mailingList>
- <name>Geronimo User List</name>
- <subscribe>users-subscribe@geronimo-user.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@geronimo-user.apache.org</unsubscribe>
- <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=geronimo-user@jakarta.apache.org</archive>
- </mailingList>
--->
- <mailingList>
- <name>Geronimo Developer List</name>
- <subscribe>geronimo-dev-subscribe@geronimo.apache.org</subscribe>
- <unsubscribe>geronimo-dev-unsubscribe@incubator.apache.org</unsubscribe>
- <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listId=140</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Bruce Snyder</name>
- <id>bsnyder</id>
- <email>bsnyder@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Dain Sundstrom</name>
- <id>dain</id>
- <email>dain@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Blevins</name>
- <id>dblevins</id>
- <email>dblevins@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Jencks</name>
- <id>djencks</id>
- <email>djencks@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Geir Magnusson Jr.</name>
- <id>geirm</id>
- <email>geirm@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Greg Wilkins</name>
- <id>gregw</id>
- <email>gregw@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>James Strachan</name>
- <id>jstrachan</id>
- <email>jstrachan@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Jan Bartel</name>
- <id>janb</id>
- <email>janb@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Jason Dillon</name>
- <id>jdillon</id>
- <email>jdillon@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Jeremy Boynes</name>
- <id>jboynes</id>
- <email>jboynes@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Jim Jagielski</name>
- <id>jim</id>
- <email>jim@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Jules Golsnell</name>
- <id>jgosnell</id>
- <email>jgosnell@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Richard Monson-Haefel</name>
- <id>richardmf</id>
- <email>richardmf@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Remigio Chirino</name>
- <id>remigio</id>
- <email>remigio@apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Simone Bordet</name>
- <id>simone</id>
- <email>simone@apache.org</email>
- <organization></organization>
- </developer>
- </developers>
-
-
- <contributors>
- <contributor>
- <name>Ed Letifov</name>
- <email></email>
- </contributor>
- </contributors>
-
- <dependencies>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- </dependency>
-
- <dependency>
- <id>commons-httpclient</id>
- <version>2.0-beta1</version>
- <url>http://jakarta.apache.org/commons/httpclient/</url>
- </dependency>
-
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
-
- <dependency>
- <id>concurrent</id>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <id>javacc</id>
- <jar>JavaCC.zip</jar>
- </dependency>
-
- <dependency>
- <id>mx4j</id>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>mx4j+tools</id>
- <version>SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <nagEmailAddress>geronimo-dev@incubator.apache.org</nagEmailAddress>
-
- <!-- this is a quick hack as we've only got 1 module so far -->
- <!-- switching to a multi-project reactor based build real soon -->
-<!--
--->
- <sourceDirectory>${basedir}/modules/core/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/modules/core/src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- </unitTest>
- <resources>
- <resource>
- <directory>${basedir}/modules/core/src/conf</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </resource>
- </resources>
- </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-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>
+ | HACK: this is a quick hack as we've only got 1 module so far
+ | switching to a multi-project reactor based build real soon
+ -->
+ <sourceDirectory>${basedir}/modules/core/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/modules/core/src/test</unitTestSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/modules/core/src/conf</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
1.3 +11 -1 incubator-geronimo/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 11 Aug 2003 17:59:08 -0000 1.2
+++ maven.xml 12 Aug 2003 14:48:56 -0000 1.3
@@ -1,8 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Id$ -->
+
<project default="jar:install"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven">
-
+
+ <!-- ===================== -->
+ <!-- Module Initialization -->
+ <!-- ===================== -->
+
+ <ant:property file="${basedir}/../../etc/project.properties"/>
+
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
1.3 +78 -46 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 11 Aug 2003 17:59:08 -0000 1.2
+++ project.xml 12 Aug 2003 14:48:56 -0000 1.3
@@ -1,50 +1,82 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
- <extend>${basedir}/../../project.xml</extend>
-
- <pomVersion>3</pomVersion>
- <id>geronimo-core</id>
- <name>Geronimo Core</name>
- <currentVersion>1.0-alpha-1-SNAPSHOT</currentVersion>
-
- <description>Geronimo Core J2EE Container</description>
- <shortDescription>Geronimo Core J2EE Container</shortDescription>
- <url>http://incubator.apache.org/projects/geronimo/core/</url>
-<!--
- I hope we can use JIRA but will probably have to settle for bugzilla
-
- <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=XXXX</issueTrackingUrl>
--->
+<!-- $Id$ -->
- <siteAddress>incubator.apache.org</siteAddress>
- <siteDirectory>/www/incubator.apache.org/projects/geronimo/core</siteDirectory>
- <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/core</distributionDirectory>
- <repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:incubator-geronimo</connection>
- <developerConnection>scm:cvs:ext:${geronimo.username}@cvs.apache.org:/home/cvs:incubator-geronimo</developerConnection>
- <url>http://cvs.apache.org/viewcvs/incubator-geronimo/</url>
- </repository>
-
-
- <build>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- </unitTest>
- <resources>
- <resource>
- <directory>${basedir}/src/conf</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Core</name>
+ <id>geronimo-core</id>
+ <shortDescription>Geronimo Core J2EE Container</shortDescription>
+ <description>Geronimo Core J2EE Container</description>
+ <url>http://incubator.apache.org/projects/geronimo/core/</url>
+ <siteDirectory>/www/incubator.apache.org/projects/geronimo/core</siteDirectory>
+ <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/core</distributionDirectory>
+
+ <currentVersion>1.0-alpha-1-SNAPSHOT</currentVersion>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+
+ <dependency>
+ <id>commons-httpclient</id>
+ <version>2.0-beta1</version>
+ <url>http://jakarta.apache.org/commons/httpclient/</url>
+ </dependency>
+
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>
+
+ <dependency>
+ <id>concurrent</id>
+ <version>1.3.2</version>
+ </dependency>
+
+ <dependency>
+ <id>javacc</id>
+ <jar>JavaCC.zip</jar>
+ </dependency>
+
+ <dependency>
+ <id>mx4j</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <id>mx4j+tools</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/conf</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>