mcconnell 2004/04/18 04:27:17
Modified: . maven.xml project.xml
Added: . index.ent
Log:
Updates to handle activation build.
Revision Changes Path
1.2 +0 -8 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 18 Apr 2004 11:13:19 -0000 1.1
+++ maven.xml 18 Apr 2004 11:27:16 -0000 1.2
@@ -6,14 +6,6 @@
<!--
==============================================================================
- switches
- ==============================================================================
- -->
-
- <ant:property name="merlin.snapshot" value="true"/>
-
- <!--
- ==============================================================================
dependent properties
==============================================================================
-->
1.6 +2 -0 avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 15 Mar 2004 17:51:54 -0000 1.5
+++ project.xml 18 Apr 2004 11:27:16 -0000 1.6
@@ -262,6 +262,7 @@
</includes>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/src/test/conf</directory>
<includes>
<include>**/*</include>
@@ -306,6 +307,7 @@
</includes>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/conf</directory>
<includes>
<include>**/*.properties</include>
1.1 avalon/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:versioning/avalon-merlin.ent">
%merlin-entities;
<!ENTITY % util-entities SYSTEM "file:versioning/avalon-util.ent"> %util-entities;
<!ENTITY % framework-entities SYSTEM "file:versioning/avalon-framework.ent">
%framework-entities;
<!ENTITY % meta-entities SYSTEM "file:versioning/avalon-meta.ent"> %meta-entities;
<!ENTITY % repo-entities SYSTEM "file:versioning/avalon-repository.ent">
%repo-entities;
<!ENTITY % logging-entities SYSTEM "file:versioning/avalon-logging.ent">
%logging-entities;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]