mcconnell 2003/08/25 16:39:58
Modified: merlin/merlin-platform/tutorials/composition/application/impl
maven.xml project.xml
merlin/merlin-platform/tutorials/composition/location/api
project.xml
merlin/merlin-platform/tutorials/composition/location/impl
project.xml
merlin/merlin-platform/tutorials/composition/publisher/api
project.xml
merlin/merlin-platform/tutorials/composition/publisher/impl
project.xml
Added: merlin/merlin-platform/tutorials/composition/location/api
maven.xml
merlin/merlin-platform/tutorials/composition/location/impl
maven.xml
merlin/merlin-platform/tutorials/composition/publisher/api
maven.xml
merlin/merlin-platform/tutorials/composition/publisher/impl
maven.xml
Log:
Update to work against top-level merlin:demo.
Revision Changes Path
1.3 +2 -3
avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 25 Aug 2003 16:41:05 -0000 1.2
+++ maven.xml 25 Aug 2003 23:39:58 -0000 1.3
@@ -5,14 +5,13 @@
</preGoal>
<preGoal name="merlin:simulate">
- <attainGoal name="build"/>
+ <attainGoal name="jar:install"/>
</preGoal>
-
+
<goal name="build">
<maven:reactor
basedir="${basedir}/../.."
includes="${basedir}/**/project.xml"
- excludes="${basedir}/composition/application/impl/project.xml"
goals="jar:install"
banner="Installing:"
ignoreFailures="false" />
1.3 +11 -0
avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Aug 2003 17:31:13 -0000 1.2
+++ project.xml 25 Aug 2003 23:39:58 -0000 1.3
@@ -6,6 +6,7 @@
<id>application-impl</id>
<name>Composition Application</name>
+ <currentVersion>1.0</currentVersion>
<dependencies>
<dependency>
@@ -25,7 +26,17 @@
</dependency>
<dependency>
<groupId>merlin-tutorial</groupId>
+ <artifactId>locator-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>merlin-tutorial</groupId>
<artifactId>publisher-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>merlin-tutorial</groupId>
+ <artifactId>publisher-impl</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
1.3 +1 -0
avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Aug 2003 17:31:13 -0000 1.2
+++ project.xml 25 Aug 2003 23:39:58 -0000 1.3
@@ -6,6 +6,7 @@
<id>locator-api</id>
<name>Composition Locator API</name>
+ <currentVersion>1.0</currentVersion>
<dependencies>
<dependency>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/maven.xml
Index: maven.xml
===================================================================
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
</project>
1.3 +1 -0
avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Aug 2003 17:31:13 -0000 1.2
+++ project.xml 25 Aug 2003 23:39:58 -0000 1.3
@@ -6,6 +6,7 @@
<id>locator-impl</id>
<name>Composition Locator Impl</name>
+ <currentVersion>1.0</currentVersion>
<dependencies>
<dependency>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/maven.xml
Index: maven.xml
===================================================================
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
</project>
1.3 +1 -0
avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Aug 2003 17:31:13 -0000 1.2
+++ project.xml 25 Aug 2003 23:39:58 -0000 1.3
@@ -6,6 +6,7 @@
<id>publisher-api</id>
<name>Composition Publisher API</name>
+ <currentVersion>1.0</currentVersion>
<dependencies>
<dependency>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/maven.xml
Index: maven.xml
===================================================================
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
</project>
1.3 +1 -0
avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Aug 2003 17:31:13 -0000 1.2
+++ project.xml 25 Aug 2003 23:39:58 -0000 1.3
@@ -6,6 +6,7 @@
<id>publisher-impl</id>
<name>Composition Publisher Impl</name>
+ <currentVersion>1.0</currentVersion>
<dependencies>
<dependency>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/maven.xml
Index: maven.xml
===================================================================
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
