mcconnell 2003/06/24 06:36:10
Modified: merlin/merlin-platform/examples/afs/simple project.xml
merlin/merlin-platform/examples/afs/simple-servlet
project.xml
merlin/merlin-platform/examples/james README.TXT
merlin/merlin-plugin plugin.jelly
Log:
Doc updates and a couple of tricks concerning repository management.
Revision Changes Path
1.4 +8 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 20 Jun 2003 05:25:26 -0000 1.3
+++ project.xml 24 Jun 2003 13:36:09 -0000 1.4
@@ -106,7 +106,14 @@
</dependency>
<dependency>
- <id>excalibur-extension</id>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-impl</artifactId>
<version>1.0</version>
</dependency>
1.4 +11 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 20 Jun 2003 05:25:26 -0000 1.3
+++ project.xml 24 Jun 2003 13:36:10 -0000 1.4
@@ -165,7 +165,17 @@
</dependency>
<dependency>
- <id>excalibur-extension</id>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-api</artifactId>
+ <version>1.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-impl</artifactId>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
1.3 +5 -0 avalon-sandbox/merlin/merlin-platform/examples/james/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/README.TXT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.TXT 24 Jun 2003 07:31:04 -0000 1.2
+++ README.TXT 24 Jun 2003 13:36:10 -0000 1.3
@@ -54,6 +54,11 @@
</kernel>
+Note: the above reposity switching can be bypassed if you make sure
+the necessary jar files are included in the [MERLIN-HOME]/repository.
+Keep in mind that the repository directives are very likely to
+change in the near future.
+
Run James
---------
1.13 +1 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 20 Jun 2003 19:02:17 -0000 1.12
+++ plugin.jelly 24 Jun 2003 13:36:10 -0000 1.13
@@ -107,7 +107,7 @@
</goal>
- <goal name="merlin:simulate" prereqs="test:test"
+ <goal name="merlin:simulate"
description="Simulate the deployment of a block based on a supplied block.xml
directive and a base directory contining classes are related artifacts.">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
