niclas 2004/04/27 02:04:42
Modified: logging/test Tag: BETTER_MAVENIZATION maven.xml
merlin/cli Tag: BETTER_MAVENIZATION maven.xml
Added: merlin/site Tag: BETTER_MAVENIZATION index.ent maven.xml
project.xml
Log:
Site is a project.
Revision Changes Path
No revision
No revision
1.2.2.2 +1 -2 avalon/logging/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/test/maven.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- maven.xml 24 Apr 2004 09:39:36 -0000 1.2.2.1
+++ maven.xml 27 Apr 2004 09:04:42 -0000 1.2.2.2
@@ -3,7 +3,6 @@
<!ENTITY % index SYSTEM "file:index.ent"> %index;
]>
<project default="test:test" xmlns:ant="jelly:ant">
- <preGoal name="java:jar-resources">
<ant:filter token="AVALON-LOGGING-LOG4J-SPEC"
value="&avalon-logging-log4j-artifact-spec;"/>
<ant:filter token="AVALON-LOGGING-LOGKIT-SPEC"
@@ -22,5 +21,5 @@
value="&avalon-activation-artifact;"/>
<ant:filter token="REPOSITORY_MAIN"
value="&avalon-repository-artifact;"/>
- </preGoal>
+
</project>
No revision
No revision
1.4.2.2 +19 -1 avalon/merlin/cli/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/maven.xml,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- maven.xml 24 Apr 2004 09:39:36 -0000 1.4.2.1
+++ maven.xml 27 Apr 2004 09:04:42 -0000 1.4.2.2
@@ -1,2 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
-<project default="jar:install" />
+
+<project default="jar:install" xmlns:ant="jelly:ant" >
+
+ <ant:filter token="AVALON-LOGGING-LOGKIT-SPEC"
+ value="&avalon-logging-logkit-artifact-spec;"/>
+ <ant:filter token="MERLIN_IMPLEMENTATION"
+ value="artifact:merlin/merlin-impl#&merlin-impl-version;"/>
+ <ant:filter token="LOGGING_IMPLEMENTATION"
+ value="&avalon-logging-logkit-artifact;"/>
+ <ant:filter token="STANDARD_RUNTIME"
+ value="&avalon-activation-artifact;"/>
+ <ant:filter token="REPOSITORY_MAIN"
+ value="&avalon-repository-artifact;"/>
+
+</project>
No revision
No revision
1.1.2.1 +1 -0 avalon/merlin/site/Attic/index.ent
1.1.2.1 +1 -0 avalon/merlin/site/Attic/maven.xml
1.1.2.1 +23 -0 avalon/merlin/site/Attic/project.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
