You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/15 20:30:51 UTC
cvs commit: avalon-sandbox/merlin/meta-tools project.xml
mcconnell 2003/06/15 11:30:51
Modified: merlin maven.xml
merlin/assembly project.xml
merlin/assembly-spi project.xml
merlin/merlin-cli maven.xml project.xml
merlin/merlin-cli/src/java Merlin.java
merlin/merlin-core project.xml
merlin/merlin-extensions/merlin-servlet project.xml
merlin/merlin-platform project.xml
merlin/merlin-platform/examples/afs/simple project.xml
merlin/merlin-platform/examples/afs/simple-servlet
project.xml
merlin/merlin-platform/tutorials/configuration/block
project.xml
merlin/merlin-platform/tutorials/configuration/defaults
project.xml
merlin/merlin-platform/tutorials/configuration/override
project.xml
merlin/merlin-platform/tutorials/configuration/simple
project.xml
merlin/merlin-platform/tutorials/meta project.xml
merlin/merlin-plugin plugin.jelly project.xml
merlin/merlin-spi project.xml
merlin/meta project.xml
merlin/meta-spi project.xml
merlin/meta-tools project.xml
Log:
Updating of the maven project defintions to sync with grouId/artifactId patterns.
Revision Changes Path
1.14 +8 -2 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maven.xml 10 Jun 2003 02:47:14 -0000 1.13
+++ maven.xml 15 Jun 2003 18:30:50 -0000 1.14
@@ -176,7 +176,7 @@
</goal>
<!--
- The update goal generates the merlin site and deploys it to locat site repository.
+ The update goal generates the merlin site and deploys it to local site repository.
-->
<goal name="merlin-update">
<attainGoal name="merlin-site"/>
@@ -261,7 +261,12 @@
<!--
Install the merlin plugin into the Maven plugin suite.
-->
- <goal name="merlin-install-plugin" prereqs="merlin-dist" description="Install Merlin Maven plugin.">
+ <goal name="merlin-install-plugin" prereqs="merlin-dist"
+ description="Install Merlin Maven plugin.">
+ <attainGoal name="merlinx-install-plugin"/>
+ </goal>
+
+ <goal name="merlinx-install-plugin">
<maven:reactor
basedir="${basedir}"
includes="merlin-plugin/project.xml"
@@ -269,6 +274,7 @@
banner="Installing plugin:"
ignoreFailures="false"/>
</goal>
+
<!--
==============================================================================
1.8 +17 -23 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 10 Jun 2003 02:47:14 -0000 1.7
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.8
@@ -19,20 +19,14 @@
<!-- avalon dependecies -->
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
- <version>1.0</version>
- </dependency>
+
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-assembly-spi</artifactId>
@@ -53,33 +47,33 @@
<dependency>
<groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <artifactId>excalibur-util-concurrent</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+
+ <dependency>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-pool</artifactId>
- <version>1.2</version>
+ <id>excalibur-extension</id>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-util-concurrent</artifactId>
- <version>1.3.1</version>
+ <id>excalibur-pool</id>
+ <version>1.2</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
</dependency>
<!-- commons dependencies -->
1.3 +1 -2 avalon-sandbox/merlin/assembly-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Mar 2003 06:56:46 -0000 1.2
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.3
@@ -19,8 +19,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
1.5 +1 -1 avalon-sandbox/merlin/merlin-cli/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 28 Apr 2003 21:19:43 -0000 1.4
+++ maven.xml 15 Jun 2003 18:30:50 -0000 1.5
@@ -15,7 +15,7 @@
<echo>Jar creation: ${maven.home}</echo>
<unzip src="${pom.getDependencyPath('commons-cli')}"
dest="${maven.build.dir}/classes"/>
- <unzip src="${pom.getDependencyPath('excalibur:excalibur-i18n')}"
+ <unzip src="${pom.getDependencyPath('excalibur-i18n:excalibur-i18n')}"
dest="${maven.build.dir}/classes"/>
</preGoal>
1.6 +1 -2 avalon-sandbox/merlin/merlin-cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Apr 2003 09:28:50 -0000 1.5
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.6
@@ -24,8 +24,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
1.13 +15 -4 avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Merlin.java 11 Jun 2003 17:48:28 -0000 1.12
+++ Merlin.java 15 Jun 2003 18:30:50 -0000 1.13
@@ -235,16 +235,22 @@
//
//
- // the the system directory that we use to build the
+ // get the the system directory that we use to build the
// classloaders
+ //
+
File system = getSystemPath( line );
//
- // the working home directory
+ // get the working home directory
+ //
+
File home = getHomePath( line );
//
- // the actual block base URL
+ // the root block base URL
+ //
+
URL block = null;
if( base.toString().endsWith(".jar") )
{
@@ -256,11 +262,15 @@
}
//
- // an optional configuration override
+ // get the optional configuration override
+ //
+
File config = getConfigPath( base.getParentFile(), line );
//
// the kernel configuration (used by the kernel loader)
+ //
+
File kernel = getKernelPath( system, line );
//
@@ -287,6 +297,7 @@
map.put( "urn:merlin:system", system );
map.put( "urn:merlin:kernel.profile", kernel );
map.put( "urn:merlin:block.url", block );
+
if( debug )
{
map.put( "urn:merlin:debug", "debug" );
1.7 +8 -14 avalon-sandbox/merlin/merlin-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 25 Apr 2003 07:10:57 -0000 1.6
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.7
@@ -39,20 +39,17 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
</dependency>
@@ -83,15 +80,14 @@
<!-- excalibur depedencies -->
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
<groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
</dependency>
<dependency>
@@ -101,14 +97,12 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-extension</id>
<version>1.0</version>
</dependency>
1.2 +9 -17 avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 Apr 2003 16:48:17 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -23,8 +23,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -32,8 +31,7 @@
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <id>servletapi</id>
<version>2.3</version>
</dependency>
@@ -54,8 +52,7 @@
<!-- unit test -->
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -63,8 +60,7 @@
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -108,8 +104,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -117,9 +112,8 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
@@ -135,8 +129,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -144,8 +137,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-extension</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
1.2 +14 -21 avalon-sandbox/merlin/merlin-platform/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Jun 2003 02:47:15 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -15,18 +15,15 @@
<!-- avalon dependencies -->
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
</dependency>
@@ -34,33 +31,29 @@
<dependency>
<groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
- <version>1.0</version>
+ <artifactId>excalibur-util-concurrent</artifactId>
+ <version>1.3.1</version>
</dependency>
+
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-pool</artifactId>
- <version>1.2</version>
+ <id>excalibur-extension</id>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-util-concurrent</artifactId>
- <version>1.3.1</version>
+ <id>excalibur-pool</id>
+ <version>1.2</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
</dependency>
<!-- commons dependencies -->
1.2 +8 -15 avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Jun 2003 02:09:39 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -23,8 +23,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
@@ -45,14 +44,12 @@
<!-- unit test -->
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
</dependency>
@@ -81,15 +78,13 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
</dependency>
<dependency>
@@ -99,14 +94,12 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-extension</id>
<version>1.0</version>
</dependency>
1.2 +9 -17 avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Jun 2003 02:09:51 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -41,8 +41,7 @@
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -50,8 +49,7 @@
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <id>servletapi</id>
<version>2.3</version>
</dependency>
@@ -72,8 +70,7 @@
<!-- unit test -->
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -81,8 +78,7 @@
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -126,8 +122,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -135,9 +130,8 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
@@ -153,8 +147,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -162,8 +155,7 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-extension</id>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Jun 2003 08:45:58 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -13,8 +13,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Jun 2003 08:45:58 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -13,8 +13,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Jun 2003 08:45:59 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:50 -0000 1.2
@@ -13,8 +13,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Jun 2003 08:45:59 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.2
@@ -13,8 +13,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 12 Jun 2003 07:44:41 -0000 1.1
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.2
@@ -25,8 +25,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
</dependencies>
1.9 +42 -0 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 9 Jun 2003 02:08:04 -0000 1.8
+++ plugin.jelly 15 Jun 2003 18:30:51 -0000 1.9
@@ -199,4 +199,46 @@
toDir="${env.MERLIN_HOME}/repository/${pom.artifactDirectory}/jars"/>
</goal>
+ <!--
+ JMX handling
+ -->
+ <goal name="merlin:jmx"
+ description="JMX stuff.">
+
+ <taskdef name="jmx" classname="xdoclet.modules.jmx.JMXDocletTask">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${plugin.getDependencyPath('xdoclet')}"/>
+ <pathelement path="${plugin.getDependencyPath('xdoclet+xjavadoc')}"/>
+ <pathelement path="${plugin.getDependencyPath('xdoclet+xdoclet-module')}"/>
+ <pathelement path="${plugin.getDependencyPath('xdoclet+jmx-module')}"/>
+ <pathelement path="${plugin.getDependencyPath('commons-collections')}"/>
+ <pathelement path="${plugin.getDependencyPath('commons-logging')}"/>
+ <pathelement path="${plugin.getDependencyPath('log4j')}"/>
+ </classpath>
+ </taskdef>
+
+ <echo> jmx stuff </echo>
+
+ <mkdir dir="${basedir}/temp"/>
+ <jmx destdir="${basedir}/temp"
+ excludedtags="@version,@author"
+ verbose="true"
+ force="true">
+ <fileset dir="${maven.src.dir}">
+ <include name="**/*.*"/>
+ </fileset>
+ <fileset dir="${basedir}/temp">
+ <include name="**/*.*"/>
+ </fileset>
+ <mbeaninterface/>
+ <!--
+ <mlet/>
+ <mx4jdescription/>
+ -->
+ </jmx>
+
+ </goal>
+
+
</project>
1.4 +41 -21 avalon-sandbox/merlin/merlin-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 8 May 2003 03:02:40 -0000 1.3
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.4
@@ -13,20 +13,17 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
+ <id>logkit</id>
<version>1.2</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-lifecycle</artifactId>
+ <id>excalibur-lifecycle</id>
<version>1.0</version>
</dependency>
@@ -63,21 +60,18 @@
<!-- excalibur -->
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-thread</artifactId>
+ <id>excalibur-thread</id>
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
</dependency>
<dependency>
@@ -87,14 +81,12 @@
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-extension</artifactId>
+ <id>excalibur-extension</id>
<version>1.0</version>
</dependency>
@@ -113,14 +105,12 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
+ <id>ant</id>
<version>1.5</version>
</dependency>
<dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
+ <id>qdox</id>
<version>1.1</version>
</dependency>
@@ -136,6 +126,36 @@
<id>xerces</id>
<version>2.2.1</version>
<url>http://xml.apache.org/xerces2-j/</url>
+ </dependency>
+
+ <!-- xdoclet -->
+ <dependency>
+ <id>commons-collections</id>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.1-dev</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.6</version>
+ </dependency>
+ <dependency>
+ <id>xdoclet</id>
+ <version>1.2b2</version>
+ </dependency>
+ <dependency>
+ <id>xdoclet+xdoclet-module</id>
+ <version>1.2b2</version>
+ </dependency>
+ <dependency>
+ <id>xdoclet+xjavadoc</id>
+ <version>1.2b2</version>
+ </dependency>
+ <dependency>
+ <id>xdoclet+jmx-module</id>
+ <version>1.2b2</version>
</dependency>
</dependencies>
1.6 +1 -2 avalon-sandbox/merlin/merlin-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Apr 2003 09:28:55 -0000 1.5
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.6
@@ -39,8 +39,7 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
1.4 +5 -6 avalon-sandbox/merlin/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 24 Apr 2003 12:43:31 -0000 1.3
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.4
@@ -26,23 +26,22 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
+
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
1.3 +3 -6 avalon-sandbox/merlin/meta-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Mar 2003 06:56:47 -0000 1.2
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.3
@@ -17,18 +17,15 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
1.3 +7 -10 avalon-sandbox/merlin/meta-tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Mar 2003 06:56:47 -0000 1.2
+++ project.xml 15 Jun 2003 18:30:51 -0000 1.3
@@ -27,20 +27,18 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-i18n</artifactId>
+ <id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-configuration</artifactId>
+ <id>excalibur-configuration</id>
<version>1.0</version>
</dependency>
+
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta</artifactId>
@@ -51,14 +49,13 @@
<artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
+ <id>ant</id>
<version>1.5</version>
</dependency>
<dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
+ <id>qdox</id>
<version>1.1</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org