mcconnell 2003/08/20 09:59:17
Modified: merlin/merlin-platform/tutorials project.xml maven.xml
Log:
Updated to provide generic base.
Revision Changes Path
1.3 +4 -20 avalon-sandbox/merlin/merlin-platform/tutorials/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 18 Aug 2003 11:26:06 -0000 1.2
+++ project.xml 20 Aug 2003 16:59:17 -0000 1.3
@@ -2,8 +2,8 @@
<project>
- <groupId>merlin</groupId>
- <id>merlin-tutorials</id>
+ <groupId>merlin-tutorials</groupId>
+ <id>merlin-tutorials-home</id>
<name>Merlin Tutorials</name>
<package>tutorial</package>
@@ -37,12 +37,7 @@
<includes>
<include>**/*.dtd</include>
<include>**/*.properties</include>
- <include>**/*.xinfo</include>
- <include>**/*.xtype</include>
- <include>**/*.xprofile</include>
- <include>**/*.xconfig</include>
- <include>**/*.xml</include>
- <include>**/*.xservice</include>
+ <include>**/*.x*</include>
<include>**/*.mf</include>
<include>**/*.jar</include>
</includes>
@@ -56,18 +51,7 @@
<includes>
<include>**/*.dtd</include>
<include>**/*.properties</include>
- <include>**/*.xinfo</include>
- <include>**/*.xtype</include>
- <include>**/*.xprofile</include>
- <include>**/*.xconfig</include>
- <include>**/*.xml</include>
- <include>**/*.xservice</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../merlin-platform/src/etc</directory>
- <includes>
- <include>LICENSE.txt</include>
+ <include>**/*.x*</include>
</includes>
</resource>
<resource>
1.2 +9 -0 avalon-sandbox/merlin/merlin-platform/tutorials/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 24 Jun 2003 13:23:53 -0000 1.1
+++ maven.xml 20 Aug 2003 16:59:17 -0000 1.2
@@ -1,3 +1,12 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+ <preGoal name="java:compile">
+ <attainGoal name="avalon:meta"/>
+ </preGoal>
+
+ <goal name="demo">
+ <attainGoal name="test:test"/>
+ <attainGoal name="merlin:simulate"/>
+ </goal>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
