dain 2004/02/16 23:26:48
Modified: . maven.xml project.xml
modules/clustering project.xml
modules/common project.xml
modules/connector project.xml
modules/console-web maven.xml project.xml
modules/core project.xml
modules/deployment project.xml
modules/jetty project.xml
modules/kernel project.xml
modules/kernel/src/java/org/apache/geronimo Geronimo.java
modules/maven-plugin maven.xml project.xml
modules/maven-xmlbeans-plugin maven.xml project.xml
modules/naming project.xml
modules/remoting project.xml
modules/security project.xml
modules/system project.xml
modules/transaction project.xml
sandbox/explorer project.xml
sandbox/twiddle project.xml
sandbox/webdav project.xml
sandbox/xbeans project.xml
specs/j2ee maven.xml
specs/jms project.xml
specs/schema project.xml
Log:
Build system cleanup... now we only need to run "maven" to get the entire
server to build
Revision Changes Path
1.66 +143 -92 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- maven.xml 11 Feb 2004 07:36:44 -0000 1.65
+++ maven.xml 17 Feb 2004 07:26:46 -0000 1.66
@@ -13,6 +13,64 @@
<j:set var="release.id"
value="${pom.standardToLegacyId(pom.id)}-${pom.currentVersion}"/>
+ <goal name="run">
+ <attainGoal name="run:server"/>
+ </goal>
+
+ <goal name="run:server">
+ <j:set var="run.dir" value="target/bin"/>
+ <ant:echo message="Running in ${run.dir}"/>
+
+ <j:jelly xmlns="jelly:ant">
+
+ <property environment="env"/>
+ <java jar="target/bin/server.jar"
+ fork="true"
+ maxmemory="256m"
+ failonerror="true"
+ dir="${run.dir}">
+
+ <jvmarg value="-ea"/>
+
+ <arg value="../config-store"/>
+ <arg value="org/apache/geronimo/System"/>
+ <arg value="org/apache/geronimo/Server"/>
+ </java>
+ </j:jelly>
+ </goal>
+
+ <goal name="debug">
+ <attainGoal name="debug:server"/>
+ </goal>
+
+ <goal name="debug:server">
+ <j:set var="run.dir" value="target/bin"/>
+ <ant:echo message="Running in ${run.dir}"/>
+
+ <j:jelly xmlns="jelly:ant">
+
+ <property environment="env"/>
+ <java jar="target/bin/server.jar"
+ fork="true"
+ maxmemory="256m"
+ failonerror="true"
+ dir="${run.dir}">
+
+ <jvmarg value="-ea"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg
value="-Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/>
+
+ <sysproperty key="java.compiler" value="NONE"/>
+
+ <arg value="../config-store"/>
+ <arg value="org/apache/geronimo/System"/>
+ <arg value="org/apache/geronimo/Server"/>
+ </java>
+ </j:jelly>
+ </goal>
+
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
@@ -217,6 +275,90 @@
</goal>
+
+ <!-- =============================== -->
+ <!-- Documentation & Site Generation -->
+ <!-- =============================== -->
+
+ <goal name="javadoc">
+ <attainGoal name="modules:javadoc"/>
+ </goal>
+
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ <attainGoal name="faq"/>
+ </preGoal>
+
+ <!-- Turn off reports for the top-level project -->
+ <postGoal name="xdoc:register-reports">
+ <attainGoal name="maven-license-plugin:deregister"/>
+ <attainGoal name="maven-checkstyle-plugin:deregister"/>
+ <attainGoal name="maven-pmd-plugin:deregister"/>
+ <attainGoal name="maven-simian-plugin:deregister"/>
+ <attainGoal name="maven-jdepend-plugin:deregister"/>
+ <attainGoal name="maven-statcvs-plugin:deregister"/>
+ <attainGoal name="maven-jxr-plugin:deregister"/>
+ <attainGoal name="maven-javadoc-plugin:deregister"/>
+ <attainGoal name="maven-junit-report-plugin:deregister"/>
+ <attainGoal name="maven-clover-plugin:deregister"/>
+
+ <!-- Run some useful top-level reports -->
+ <!--<attainGoal name="maven-changelog-plugin:deregister"/>-->
+ <!--<attainGoal name="maven-file-activity-plugin:deregister"/>-->
+ <!--<attainGoal
name="maven-developer-activity-plugin:deregister"/>-->
+ </postGoal>
+
+ <preGoal name="site">
+ <attainGoal name="modules:aggregate:site"/>
+ </preGoal>
+
+ <goal name="modules:aggregate:site" prereqs="modules:site"
+ description="Copy the generated websites of all the modules into the
root project">
+
+ <ant:echo>Aggregating module site documentation...</ant:echo>
+
+ <!-- Setup the target aggregation directory -->
+ <j:set var="aggregate.dir" value="${basedir}/target/docs"/>
+ <ant:mkdir dir="${aggregate.dir}"/>
+
+ <j:forEach var="module" items="${reactorProjects}">
+ <ant:echo>Processing ${module.id}...</ant:echo>
+
+ <!-- Get the modules root directory -->
+ <j:set var="module.root" value="${module.file.parent}"/>
+
+ <!-- Setup the target dir under docs -->
+ <j:set var="moduleDirName">${module.file.parentFile.name}</j:set>
+ <j:set
var="moduleTypeDirName">${module.file.parentFile.parentFile.name}</j:set>
+ <j:set
var="outputDir">${aggregate.dir}/${moduleTypeDirName}/${moduleDirName}</j:set>
+
+ <!-- Copy module docs -->
+ <ant:echo>Copying docs to ${outputDir}...</ant:echo>
+ <ant:mkdir dir="${outputDir}"/>
+ <ant:copy todir="${outputDir}">
+ <ant:fileset dir="${module.root}/target/docs"/>
+ </ant:copy>
+ </j:forEach>
+ </goal>
+
+ <goal name="site:tocvs"
+ description="Creates the entire website and copies it to the local
CVS repository so that it can be checked in to update the Incubator site">
+
+ <j:jelly xmlns="jelly:ant">
+
+ <j:if test="${empty(geronimo.cvs.docdir)}">
+ <j:set var="geronimo.cvs.docdir"
value="../incubator-site/build/site/projects/geronimo"/>
+ </j:if>
+
+ <mkdir dir="${geronimo.cvs.docdir}"/>
+ <copy todir="${geronimo.cvs.docdir}">
+ <fileset dir="${basedir}/target/docs"/>
+ </copy>
+
+ </j:jelly>
+ </goal>
+
+
<!-- ========================= -->
<!-- Module Output Aggregation -->
<!-- ========================= -->
@@ -367,96 +509,5 @@
</fixcrlf>
</u:available>
</goal>
-
-
- <!-- =============================== -->
- <!-- Module Output Aggregation Hooks -->
- <!-- =============================== -->
-
-
-
- <!-- =============================== -->
- <!-- Documentation & Site Generation -->
- <!-- =============================== -->
-
- <goal name="javadoc">
- <attainGoal name="modules:javadoc"/>
- </goal>
-
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- <attainGoal name="faq"/>
- </preGoal>
-
- <!-- Turn off reports for the top-level project -->
- <postGoal name="xdoc:register-reports">
- <attainGoal name="maven-license-plugin:deregister"/>
- <attainGoal name="maven-checkstyle-plugin:deregister"/>
- <attainGoal name="maven-pmd-plugin:deregister"/>
- <attainGoal name="maven-simian-plugin:deregister"/>
- <attainGoal name="maven-jdepend-plugin:deregister"/>
- <attainGoal name="maven-statcvs-plugin:deregister"/>
- <attainGoal name="maven-jxr-plugin:deregister"/>
- <attainGoal name="maven-javadoc-plugin:deregister"/>
- <attainGoal name="maven-junit-report-plugin:deregister"/>
- <attainGoal name="maven-clover-plugin:deregister"/>
-
- <!-- Run some useful top-level reports -->
- <!--<attainGoal name="maven-changelog-plugin:deregister"/>-->
- <!--<attainGoal name="maven-file-activity-plugin:deregister"/>-->
- <!--<attainGoal
name="maven-developer-activity-plugin:deregister"/>-->
- </postGoal>
-
- <preGoal name="site">
- <attainGoal name="modules:aggregate:site"/>
- </preGoal>
-
- <goal name="modules:aggregate:site" prereqs="modules:site"
- description="Copy the generated websites of all the modules into the
root project">
-
- <ant:echo>Aggregating module site documentation...</ant:echo>
-
- <!-- Setup the target aggregation directory -->
- <j:set var="aggregate.dir" value="${basedir}/target/docs"/>
- <ant:mkdir dir="${aggregate.dir}"/>
-
- <j:forEach var="module" items="${reactorProjects}">
- <ant:echo>Processing ${module.id}...</ant:echo>
-
- <!-- Get the modules root directory -->
- <j:set var="module.root" value="${module.file.parent}"/>
-
- <!-- Setup the target dir under docs -->
- <j:set var="moduleDirName">${module.file.parentFile.name}</j:set>
- <j:set
var="moduleTypeDirName">${module.file.parentFile.parentFile.name}</j:set>
- <j:set
var="outputDir">${aggregate.dir}/${moduleTypeDirName}/${moduleDirName}</j:set>
-
- <!-- Copy module docs -->
- <ant:echo>Copying docs to ${outputDir}...</ant:echo>
- <ant:mkdir dir="${outputDir}"/>
- <ant:copy todir="${outputDir}">
- <ant:fileset dir="${module.root}/target/docs"/>
- </ant:copy>
- </j:forEach>
- </goal>
-
- <goal name="site:tocvs"
- description="Creates the entire website and copies it to the local
CVS repository so that it can be checked in to update the Incubator site">
-
- <j:jelly xmlns="jelly:ant">
-
- <j:if test="${empty(geronimo.cvs.docdir)}">
- <j:set var="geronimo.cvs.docdir"
value="../incubator-site/build/site/projects/geronimo"/>
- </j:if>
-
- <mkdir dir="${geronimo.cvs.docdir}"/>
- <copy todir="${geronimo.cvs.docdir}">
- <fileset dir="${basedir}/target/docs"/>
- </copy>
-
- </j:jelly>
- </goal>
-
-
</project>
1.22 +11 -92 incubator-geronimo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 31 Jan 2004 16:16:13 -0000 1.21
+++ project.xml 17 Feb 2004 07:26:46 -0000 1.22
@@ -4,96 +4,15 @@
<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/etc/project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/etc/project.xml</extend>
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
- <developers>
- <developer>
- <name>Jan Bartel</name>
- <id>janb</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Jeremy Boynes</name>
- <id>jboynes</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Alan Cabrera</name>
- <id>adc</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Hiram Chirino</name>
- <id>chirino</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Gianni Damour</name>
- <id>gdamour</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Jason Dillon</name>
- <id>jdillon</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Jules Gosnell</name>
- <id>jules</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>David Jencks</name>
- <id>djencks</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Richard Monson-Haefel</name>
- <id></id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Aaron Mulder</name>
- <id>ammulder</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Bruce Snyder</name>
- <id>bsnyder</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>James Strachan</name>
- <id>jstrachan</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Dain Sundstrom</name>
- <id>dain</id>
- <role>committer</role>
- </developer>
- <developer>
- <name>Greg Wilkins</name>
- <id>gregw</id>
- <role>committer</role>
- </developer>
- </developers>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 1.1</name>
- <url>http://www.apache.org/licenses/LICENSE</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <build>
- <sourceDirectory></sourceDirectory>
- <unitTestSourceDirectory></unitTestSourceDirectory>
- </build>
+ <build>
+ <sourceDirectory></sourceDirectory>
+ <unitTestSourceDirectory></unitTestSourceDirectory>
+ </build>
</project>
1.4 +5 -3 incubator-geronimo/modules/clustering/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/clustering/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 22 Jan 2004 20:24:38 -0000 1.3
+++ project.xml 17 Feb 2004 07:26:46 -0000 1.4
@@ -28,7 +28,8 @@
<dependencies>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -37,7 +38,8 @@
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>false</runtime>
1.19 +12 -7 incubator-geronimo/modules/common/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/common/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 23 Jan 2004 00:34:10 -0000 1.18
+++ project.xml 17 Feb 2004 07:26:46 -0000 1.19
@@ -27,9 +27,9 @@
<dependencies>
<!-- Thirdparty Dependencies -->
-
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging</url>
<properties>
@@ -38,7 +38,8 @@
</dependency>
<dependency>
- <id>commons-lang</id>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/lang</url>
<properties>
@@ -47,7 +48,8 @@
</dependency>
<dependency>
- <id>commons-collections</id>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/collections</url>
<properties>
@@ -56,7 +58,8 @@
</dependency>
<dependency>
- <id>commons-jexl</id>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/jexl</url>
<properties>
@@ -65,7 +68,8 @@
</dependency>
<dependency>
- <id>log4j</id>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
@@ -86,6 +90,7 @@
<!-- =================== -->
+ <!-- Build Specification -->
<!-- Build Specification -->
<!-- =================== -->
1.10 +15 -34 incubator-geronimo/modules/connector/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 16 Feb 2004 21:21:44 -0000 1.9
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.10
@@ -26,14 +26,18 @@
<!-- ============ -->
<dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-xmlbeans-plugin</artifactId>
+ <version>DEV</version>
+ <type>plugin</type>
+ </dependency>
<!-- needed for xmlbeans runtime-->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- </properties>
</dependency>
<!-- real stuff -->
@@ -41,56 +45,42 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
@@ -115,16 +105,12 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
@@ -139,35 +125,30 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>concurrent</id>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
<version>1.3.2</version>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
- <properties>
- </properties>
</dependency>
<!-- needed for passwordcredential realm-->
<dependency>
- <id>regexp</id>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
<version>1.3-dev</version>
<url>http://jakarta.apache.org/regexp</url>
- <properties>
- </properties>
</dependency>
-
</dependencies>
</project>
1.3 +18 -1 incubator-geronimo/modules/console-web/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/console-web/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 29 Jan 2004 22:42:47 -0000 1.2
+++ maven.xml 17 Feb 2004 07:26:47 -0000 1.3
@@ -38,4 +38,21 @@
</j:if>
</postGoal>
+ <!-- Remove the log files -->
+ <goal name="clobber"
+ description="Removes all (non-repository installed) build generated
files">
+
+ <!-- Let clean:clean do some work first -->
+ <attainGoal name="clean:clean"/>
+
+ <j:jelly xmlns="jelly:ant">
+ <delete quiet="false" failonerror="false">
+ <fileset dir="${basedir}">
+ <include name="maven.log"/>
+ <include name="velocity.log*"/>
+ <include name="junit*.properties"/>
+ </fileset>
+ </delete>
+ </j:jelly>
+ </goal>
</project>
1.2 +3 -2 incubator-geronimo/modules/console-web/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/console-web/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 18 Sep 2003 04:45:26 -0000 1.1
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.2
@@ -62,7 +62,8 @@
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging</url>
<properties>
1.46 +19 -20 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- project.xml 16 Feb 2004 21:21:44 -0000 1.45
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.46
@@ -31,13 +31,12 @@
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -131,7 +130,8 @@
<!-- Thirdparty -->
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -140,7 +140,8 @@
</dependency>
<dependency>
- <id>commons-jxpath</id>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jxpath/</url>
<properties>
@@ -149,7 +150,8 @@
</dependency>
<dependency>
- <id>log4j</id>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
@@ -158,7 +160,8 @@
</dependency>
<dependency>
- <id>concurrent</id>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
<version>1.3.2</version>
<properties>
<runtime>true</runtime>
@@ -166,7 +169,8 @@
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>false</runtime>
@@ -184,7 +188,8 @@
</dependency>
<dependency>
- <id>xml-apis</id>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
<properties>
<runtime>false</runtime>
@@ -192,7 +197,8 @@
</dependency>
<dependency>
- <id>dom4j</id>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
<version>1.4</version>
<properties>
<runtime>true</runtime>
@@ -200,7 +206,8 @@
</dependency>
<dependency>
- <id>cglib+full</id>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sourceforge.net</url>
<properties>
@@ -226,14 +233,6 @@
<!-- =================== -->
<build>
-<!-- <resources>-->
-<!-- <resource>-->
-<!-- <directory>${basedir}/src/conf</directory>-->
-<!-- <includes>-->
-<!-- <include>*.properties</include>-->
-<!-- </includes>-->
-<!-- </resource>-->
-<!-- </resources>-->
<unitTest>
<includes>
<include>**/*Test.java</include>
1.11 +16 -27 incubator-geronimo/modules/deployment/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/deployment/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 12 Feb 2004 18:27:39 -0000 1.10
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.11
@@ -25,73 +25,67 @@
<!-- ============ -->
<dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-xmlbeans-plugin</artifactId>
+ <version>DEV</version>
+ <type>plugin</type>
+ </dependency>
<!-- needed for xmlbeans runtime-->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>cglib+full</id>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sf.net/</url>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>commons-cli</id>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/cli/</url>
</dependency>
@@ -101,8 +95,6 @@
<artifactId>xml-commons-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons</url>
- <properties>
- </properties>
</dependency>
<!-- uncomment to verify XML loading with DOM
@@ -110,15 +102,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.0</version>
- <properties>
- </properties>
</dependency>
+
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.2.1</version>
- <properties>
- </properties>
</dependency>
-->
</dependencies>
1.18 +19 -42 incubator-geronimo/modules/jetty/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/jetty/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 16 Feb 2004 21:21:44 -0000 1.17
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.18
@@ -25,94 +25,78 @@
<!-- ============ -->
<dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-xmlbeans-plugin</artifactId>
+ <version>DEV</version>
+ <type>plugin</type>
+ </dependency>
<!-- needed for xmlbeans runtime-->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
@@ -134,10 +118,9 @@
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
- <properties>
- </properties>
</dependency>
<!-- these are just needed to run the unit tests -->
@@ -160,15 +143,14 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>tomcat</id>
+ <groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>5.0.16</version>
<properties>
@@ -177,7 +159,7 @@
</dependency>
<dependency>
- <id>tomcat</id>
+ <groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>5.0.16</version>
<properties>
@@ -186,7 +168,7 @@
</dependency>
<dependency>
- <id>commons-el</id>
+ <groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/el/</url>
@@ -196,7 +178,7 @@
</dependency>
<dependency>
- <id>ant</id>
+ <groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.5</version>
<properties>
@@ -205,27 +187,22 @@
</dependency>
<dependency>
- <id>xerces</id>
+ <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.0</version>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>xerces</id>
+ <groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.2.1</version>
- <properties>
- </properties>
</dependency>
<dependency>
- <id>cglib+full</id>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sf.net/</url>
- <properties>
- </properties>
</dependency>
</dependencies>
1.17 +8 -4 incubator-geronimo/modules/kernel/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 28 Jan 2004 23:05:38 -0000 1.16
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.17
@@ -11,6 +11,7 @@
<!-- ===================== -->
<name>Geronimo :: Kernel</name>
+ <groupId>geronimo</groupId>
<id>geronimo-kernel</id>
<shortDescription>Geronimo Kernel</shortDescription>
<description>Geronimo Kernel</description>
@@ -59,7 +60,8 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -69,7 +71,8 @@
</dependency>
<dependency>
- <id>log4j</id>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
@@ -79,7 +82,8 @@
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>true</runtime>
1.10 +2 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/Geronimo.java
Index: Geronimo.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/Geronimo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Geronimo.java 13 Feb 2004 07:22:22 -0000 1.9
+++ Geronimo.java 17 Feb 2004 07:26:47 -0000 1.10
@@ -94,7 +94,7 @@
*/
public static void main(String[] args) {
if (args.length < 2) {
- System.err.println("usage: " + Geronimo.class.getName() + "
<config-store-dir> <config-id>...");
+ System.err.println("usage: " + Geronimo.class.getName() + "
<config-store-dir> <config-artifactId>...");
System.exit(1);
}
String storeDirName = args[0];
1.3 +27 -7 incubator-geronimo/modules/maven-plugin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 29 Jan 2004 02:43:41 -0000 1.2
+++ maven.xml 17 Feb 2004 07:26:47 -0000 1.3
@@ -3,12 +3,8 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:define="jelly:define"
- xmlns:deploy="geronimo:deploy">
+ xmlns:j="jelly:core">
<!-- ================= -->
<!-- Global Properties -->
@@ -26,7 +22,14 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="plugin:install"/>
+ <attainGoal name="jar:jar"/>
+ <ant:property name="pluginsDir"
value="${maven.repo.local}/${pom.artifactDirectory}/plugins"/>
+ <ant:mkdir dir="${pluginsDir}"/>
+ <ant:copy
+
file="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"
+ todir="${pluginsDir}"
+ overwrite="true"
+ />
</goal>
<goal name="build">
@@ -43,4 +46,21 @@
<!--attainGoal name="clover"/-->
</goal>
+ <!-- Remove the log files -->
+ <goal name="clobber"
+ description="Removes all (non-repository installed) build generated
files">
+
+ <!-- Let clean:clean do some work first -->
+ <attainGoal name="clean:clean"/>
+
+ <j:jelly xmlns="jelly:ant">
+ <delete quiet="false" failonerror="false">
+ <fileset dir="${basedir}">
+ <include name="maven.log"/>
+ <include name="velocity.log*"/>
+ <include name="junit*.properties"/>
+ </fileset>
+ </delete>
+ </j:jelly>
+ </goal>
</project>
1.5 +15 -58 incubator-geronimo/modules/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 12 Feb 2004 18:31:16 -0000 1.4
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.5
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<pomVersion>3</pomVersion>
- <id>geronimo-maven-plugin</id>
- <name>Geronimo maven deployment plugin</name>
<groupId>geronimo</groupId>
+ <id>geronimo-deployment-plugin</id>
+ <name>Geronimo maven deployment plugin</name>
<currentVersion>DEV</currentVersion>
<organization>
<name>Apache Software Foundation</name>
@@ -15,59 +15,40 @@
<logo></logo>
<dependencies>
-
<dependency>
<groupId>xml-commons-resolver</groupId>
<artifactId>xml-commons-resolver</artifactId>
<version>1.1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<!-- TODO remove this stupid dependency -->
@@ -75,44 +56,33 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
- <id>commons-cli</id>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/cli/</url>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- <url>http://jakarta.apache.org/log4j</url>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <url>http://jakarta.apache.org/log4j</url>
+ </dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
@@ -120,24 +90,18 @@
<artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sourceforge.net</url>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
</dependencies>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory></sourceDirectory>
+ <unitTestSourceDirectory></unitTestSourceDirectory>
<unitTest>
<includes>
@@ -147,10 +111,6 @@
<resources>
<resource>
- <directory>src/plugin-resources</directory>
- <targetPath>plugin-resources</targetPath>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.jelly</include>
@@ -160,8 +120,5 @@
</includes>
</resource>
</resources>
-
</build>
-
-
</project>
1.5 +27 -8
incubator-geronimo/modules/maven-xmlbeans-plugin/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 8 Feb 2004 19:37:00 -0000 1.4
+++ maven.xml 17 Feb 2004 07:26:47 -0000 1.5
@@ -3,12 +3,8 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:define="jelly:define"
- xmlns:deploy="geronimo:xmlbeans">
+ xmlns:j="jelly:core">
<!-- ================= -->
<!-- Global Properties -->
@@ -26,8 +22,14 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="plugin:install"/>
- <attainGoal name="plugin:deploy"/>
+ <attainGoal name="jar:jar"/>
+ <ant:property name="pluginsDir"
value="${maven.repo.local}/${pom.artifactDirectory}/plugins"/>
+ <ant:mkdir dir="${pluginsDir}"/>
+ <ant:copy
+
file="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"
+ todir="${pluginsDir}"
+ overwrite="true"
+ />
</goal>
<goal name="build">
@@ -44,4 +46,21 @@
<!--attainGoal name="clover"/-->
</goal>
+ <!-- Remove the log files -->
+ <goal name="clobber"
+ description="Removes all (non-repository installed) build generated
files">
+
+ <!-- Let clean:clean do some work first -->
+ <attainGoal name="clean:clean"/>
+
+ <j:jelly xmlns="jelly:ant">
+ <delete quiet="false" failonerror="false">
+ <fileset dir="${basedir}">
+ <include name="maven.log"/>
+ <include name="velocity.log*"/>
+ <include name="junit*.properties"/>
+ </fileset>
+ </delete>
+ </j:jelly>
+ </goal>
</project>
1.4 +2 -13
incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 16 Feb 2004 21:21:44 -0000 1.3
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.4
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<pomVersion>3</pomVersion>
- <id>geronimo-maven-xmlbeans-plugin</id>
+ <groupId>geronimo</groupId>
+ <id>geronimo-xmlbeans-plugin</id>
<name>Geronimo maven xmlbeans plugin</name>
- <groupId>maven</groupId>
<currentVersion>DEV</currentVersion>
<organization>
<name>Apache Software Foundation</name>
@@ -15,25 +15,17 @@
<logo></logo>
<dependencies>
-
<dependency>
<groupId>xml-commons-resolver</groupId>
<artifactId>xml-commons-resolver</artifactId>
<version>1.1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
-
</dependencies>
<build>
@@ -61,8 +53,5 @@
</includes>
</resource>
</resources>
-
</build>
-
-
</project>
1.3 +3 -3 incubator-geronimo/modules/naming/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/naming/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 16 Feb 2004 21:21:45 -0000 1.2
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.3
@@ -27,7 +27,6 @@
<!-- ============ -->
<dependencies>
-
<!-- needed for xmlbeans runtime-->
<dependency>
<groupId>xmlbeans</groupId>
@@ -86,7 +85,8 @@
<!-- Thirdparty Dependencies -->
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>false</runtime>
1.6 +11 -8 incubator-geronimo/modules/remoting/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 26 Jan 2004 06:50:47 -0000 1.5
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.6
@@ -27,9 +27,7 @@
<!-- ============ -->
<dependencies>
-
<!-- Module Dependencies -->
-
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
@@ -59,7 +57,8 @@
<!-- Thirdparty Dependencies -->
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -68,7 +67,8 @@
</dependency>
<dependency>
- <id>commons-lang</id>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/lang</url>
<properties>
@@ -77,7 +77,8 @@
</dependency>
<dependency>
- <id>concurrent</id>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
<version>1.3.2</version>
<properties>
<runtime>true</runtime>
@@ -85,7 +86,8 @@
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>false</runtime>
@@ -93,7 +95,8 @@
</dependency>
<dependency>
- <id>cglib+full</id>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sf.net/</url>
<properties>
1.7 +17 -9 incubator-geronimo/modules/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 17 Feb 2004 00:05:38 -0000 1.6
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.7
@@ -26,14 +26,18 @@
<!-- ============ -->
<dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-xmlbeans-plugin</artifactId>
+ <version>DEV</version>
+ <type>plugin</type>
+ </dependency>
<!-- needed for xmlbeans runtime-->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- </properties>
</dependency>
<dependency>
@@ -112,7 +116,8 @@
<!-- Thirdparty -->
<dependency>
- <id>cglib+full</id>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sf.net/</url>
<properties>
@@ -129,7 +134,8 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -138,7 +144,8 @@
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>false</runtime>
@@ -156,7 +163,8 @@
</dependency>
<dependency>
- <id>xml-apis</id>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
<properties>
<runtime>false</runtime>
@@ -175,7 +183,8 @@
</dependency>
<dependency>
- <id>hsqldb</id>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
<version>1.7.1</version>
<url>http://hsqldb.sourceforge.net</url>
<properties>
@@ -192,7 +201,6 @@
<runtime>true</runtime>
</properties>
</dependency>
-
</dependencies>
1.2 +7 -4 incubator-geronimo/modules/system/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/system/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 12 Feb 2004 18:12:52 -0000 1.1
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.2
@@ -35,19 +35,22 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
</dependency>
<dependency>
- <id>log4j</id>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j</url>
</dependency>
<dependency>
- <id>mx4j</id>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
</dependency>
</dependencies>
1.5 +3 -5 incubator-geronimo/modules/transaction/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/transaction/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 25 Jan 2004 17:55:35 -0000 1.4
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.5
@@ -25,9 +25,7 @@
<!-- ============ -->
<dependencies>
-
<!-- Module Dependencies -->
-
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
@@ -69,13 +67,13 @@
<!-- Thirdparty -->
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<runtime>false</runtime>
</properties>
</dependency>
-
</dependencies>
</project>
1.3 +8 -8 incubator-geronimo/sandbox/explorer/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/explorer/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Jan 2004 03:38:36 -0000 1.2
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.3
@@ -64,7 +64,7 @@
<!-- Thirdparty Dependencies -->
<dependency>
- <id>mx4j</id>
+ <artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<bootstrap>true</bootstrap>
@@ -72,7 +72,7 @@
</dependency>
<dependency>
- <id>groovy</id>
+ <artifactId>groovy</artifactId>
<version>1.0-alpha-1</version>
<url>http://groovy.codehaus.org</url>
<properties>
@@ -81,7 +81,7 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging</url>
<properties>
@@ -90,20 +90,20 @@
</dependency>
<dependency>
- <id>asm</id>
+ <artifactId>asm</artifactId>
<version>1.3.4</version>
</dependency>
<!-- temp hack - won't need this soon -->
<dependency>
- <id>asm+util</id>
+ <artifactId>asm+util</artifactId>
<version>1.3.4</version>
<url>http://asm.objectweb.org/</url>
</dependency>
<!-- Runtime dependencies due to remoting -->
<dependency>
- <id>commons-lang</id>
+ <artifactId>commons-lang</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/lang</url>
<properties>
@@ -112,7 +112,7 @@
</dependency>
<dependency>
- <id>concurrent</id>
+ <artifactId>concurrent</artifactId>
<version>1.3.2</version>
<properties>
<runtime>true</runtime>
1.3 +10 -10 incubator-geronimo/sandbox/twiddle/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/twiddle/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Jan 2004 03:38:36 -0000 1.2
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.3
@@ -43,7 +43,7 @@
<!-- Thirdparty Dependencies -->
<dependency>
- <id>classworlds</id>
+ <artifactId>classworlds</artifactId>
<version>SNAPSHOT</version>
<url>http://classworlds.codehaus.org</url>
<properties>
@@ -52,7 +52,7 @@
</dependency>
<dependency>
- <id>castor</id>
+ <artifactId>castor</artifactId>
<version>0.9.5</version>
<url>http://castor.exolab.org</url>
<properties>
@@ -71,7 +71,7 @@
</dependency>
<dependency>
- <id>xml-apis</id>
+ <artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
<properties>
<runtime>false</runtime>
@@ -79,7 +79,7 @@
</dependency>
<dependency>
- <id>log4j</id>
+ <artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
@@ -88,7 +88,7 @@
</dependency>
<dependency>
- <id>commons-beanutils</id>
+ <artifactId>commons-beanutils</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/beanutils</url>
<properties>
@@ -97,7 +97,7 @@
</dependency>
<dependency>
- <id>commons-collections</id>
+ <artifactId>commons-collections</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/collections</url>
<properties>
@@ -106,7 +106,7 @@
</dependency>
<dependency>
- <id>commons-lang</id>
+ <artifactId>commons-lang</artifactId>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/lang</url>
<properties>
@@ -115,7 +115,7 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging</url>
<properties>
@@ -124,7 +124,7 @@
</dependency>
<dependency>
- <id>commons-cli</id>
+ <artifactId>commons-cli</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/cli</url>
<properties>
1.4 +3 -3 incubator-geronimo/sandbox/webdav/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/webdav/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 29 Jan 2004 03:38:36 -0000 1.3
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.4
@@ -38,7 +38,7 @@
</dependency>
<dependency>
- <id>commons-logging</id>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
@@ -47,7 +47,7 @@
</dependency>
<dependency>
- <id>jetty</id>
+ <artifactId>jetty</artifactId>
<version>SNAPSHOT</version>
<properties>
<runtime>true</runtime>
1.3 +13 -13 incubator-geronimo/sandbox/xbeans/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/sandbox/xbeans/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Jan 2004 03:38:36 -0000 1.2
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.3
@@ -34,42 +34,42 @@
<!-- For XMLBeans -->
<dependency>
- <id>xmlbeans</id>
+ <artifactId>xmlbeans</artifactId>
<version>1.0</version>
</dependency>
<!-- For JAXB -->
<!--
<dependency>
- <id>jaxb+api</id>
+ <artifactId>jaxb+api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <id>jaxb+impl</id>
+ <artifactId>jaxb+impl</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <id>jaxb+libs</id>
+ <artifactId>jaxb+libs</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <id>jaxb+xjc</id>
+ <artifactId>jaxb+xjc</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <id>jaxb+qname</id>
+ <artifactId>jaxb+qname</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <id>jaxb+namespace</id>
+ <artifactId>jaxb+namespace</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <id>relaxngDatatype</id>
+ <artifactId>relaxngDatatype</artifactId>
<version>20020414</version>
</dependency>
<dependency>
- <id>xsdlib</id>
+ <artifactId>xsdlib</artifactId>
<version>20030225</version>
</dependency>
-->
@@ -77,7 +77,7 @@
<!-- for castor -->
<!--
<dependency>
- <id>castor</id>
+ <artifactId>castor</artifactId>
<version>0.9.5</version>
<url>http://castor.exolab.org</url>
</dependency>
@@ -89,12 +89,12 @@
</dependency>
<dependency>
- <id>xml-apis</id>
+ <artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
</dependency>
<dependency>
- <id>commons-logging</id>
+ <artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
</dependency>
1.2 +3 -12 incubator-geronimo/specs/j2ee/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/specs/j2ee/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 12 Feb 2004 03:17:54 -0000 1.1
+++ maven.xml 17 Feb 2004 07:26:47 -0000 1.2
@@ -6,9 +6,7 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
- <goal name="jar" prereqs="jar:jar"/>
-
- <goal name="jar:jar">
+ <goal name="default">
<ant:available property="jarExsts"
file="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"/>
<j:if test="${jarExsts}">
<j:forEach var="artifact" items="${pom.artifacts}">
@@ -33,9 +31,8 @@
</j:forEach>
</ant:jar>
</j:if>
- </goal>
- <goal name="jar:install" prereqs="jar:jar">
+ <!-- install jar -->
<ant:property name="jardir__"
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
<ant:mkdir dir="${jardir__}"/>
<ant:copy
@@ -45,8 +42,6 @@
/>
</goal>
- <goal name="test:test"/>
-
<!-- ================= -->
<!-- Global Properties -->
<!-- ================= -->
@@ -61,10 +56,6 @@
<!-- ==================== -->
<!-- Default Global Goals -->
<!-- ==================== -->
-
- <goal name="default">
- <attainGoal name="jar:install"/>
- </goal>
<goal name="build">
<attainGoal name="default"/>
1.4 +5 -9 incubator-geronimo/specs/jms/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/specs/jms/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 7 Dec 2003 16:28:07 -0000 1.3
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.4
@@ -10,19 +10,14 @@
<id>geronimo-spec-jms</id>
<shortDescription>J2EE JMS Specification</shortDescription>
<description>J2EE Java Message Service Specification</description>
- <siteDirectory>
- </siteDirectory>
- <distributionDirectory>
- </distributionDirectory>
<package>javax.jms</package>
<currentVersion>DEV</currentVersion>
<dependencies>
-
<!-- Plugin Dependencies -->
-
<dependency>
- <id>mockobjects+jdk1.4-j2ee1.3</id>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
<version>0.09</version>
<properties>
<runtime>false</runtime>
@@ -30,7 +25,8 @@
</dependency>
<dependency>
- <id>mockobjects+core</id>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
<version>0.09</version>
<properties>
<runtime>false</runtime>
1.4 +8 -4 incubator-geronimo/specs/schema/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/specs/schema/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 8 Feb 2004 19:37:00 -0000 1.3
+++ project.xml 17 Feb 2004 07:26:47 -0000 1.4
@@ -27,17 +27,21 @@
<!-- ============ -->
<dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-xmlbeans-plugin</artifactId>
+ <version>DEV</version>
+ <type>plugin</type>
+ </dependency>
<!-- needed for xmlbeans runtime-->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
- <properties>
- </properties>
</dependency>
-
</dependencies>
+
<build>
<sourceDirectory>${basedir}/src</sourceDirectory>
</build>
