niclas 2004/04/24 02:39:38
Modified: . Tag: BETTER_MAVENIZATION maven.xml
project.properties
activation/impl Tag: BETTER_MAVENIZATION maven.xml
project.xml
composition/api Tag: BETTER_MAVENIZATION project.xml
composition/impl Tag: BETTER_MAVENIZATION maven.xml
project.properties project.xml
composition/spi Tag: BETTER_MAVENIZATION project.xml
framework Tag: BETTER_MAVENIZATION project.properties
framework/api Tag: BETTER_MAVENIZATION project.xml
framework/impl Tag: BETTER_MAVENIZATION project.xml
logging/api Tag: BETTER_MAVENIZATION project.xml
logging/impl Tag: BETTER_MAVENIZATION project.xml
logging/log4j Tag: BETTER_MAVENIZATION maven.xml project.xml
logging/logkit/api Tag: BETTER_MAVENIZATION project.xml
logging/logkit/impl Tag: BETTER_MAVENIZATION maven.xml
project.xml
logging/logkit/plugins/datagram Tag: BETTER_MAVENIZATION
maven.xml project.xml
logging/logkit/plugins/socket Tag: BETTER_MAVENIZATION
maven.xml project.xml
logging/logkit/plugins/syslog Tag: BETTER_MAVENIZATION
maven.xml project.xml
logging/spi Tag: BETTER_MAVENIZATION project.xml
logging/test Tag: BETTER_MAVENIZATION maven.xml project.xml
maven-plugins/artifact Tag: BETTER_MAVENIZATION maven.xml
plugin.jelly project.properties
maven-plugins/versioning Tag: BETTER_MAVENIZATION
project.properties
merlin Tag: BETTER_MAVENIZATION INSTALL.TXT
merlin/api Tag: BETTER_MAVENIZATION maven.xml project.xml
merlin/cli Tag: BETTER_MAVENIZATION maven.xml project.xml
merlin/impl Tag: BETTER_MAVENIZATION maven.xml project.xml
merlin/plugin Tag: BETTER_MAVENIZATION project.properties
project.xml
merlin/servlet Tag: BETTER_MAVENIZATION maven.xml
project.xml
merlin/site/installer Tag: BETTER_MAVENIZATION project.xml
merlin/unit Tag: BETTER_MAVENIZATION maven.xml project.xml
meta/api Tag: BETTER_MAVENIZATION maven.xml project.xml
meta/impl Tag: BETTER_MAVENIZATION maven.xml project.xml
meta/plugin Tag: BETTER_MAVENIZATION maven.xml
project.properties project.xml
meta/spi Tag: BETTER_MAVENIZATION project.xml
meta/tools Tag: BETTER_MAVENIZATION maven.xml project.xml
repository/api Tag: BETTER_MAVENIZATION maven.xml
project.xml
repository/cli Tag: BETTER_MAVENIZATION maven.xml
project.xml
repository/impl Tag: BETTER_MAVENIZATION maven.xml
project.properties project.xml
repository/main Tag: BETTER_MAVENIZATION project.properties
project.xml
repository/spi Tag: BETTER_MAVENIZATION project.xml
repository/test Tag: BETTER_MAVENIZATION maven.xml
project.xml
repository/util Tag: BETTER_MAVENIZATION maven.xml
project.xml
util/criteria Tag: BETTER_MAVENIZATION maven.xml project.xml
util/defaults Tag: BETTER_MAVENIZATION maven.xml project.xml
util/env Tag: BETTER_MAVENIZATION project.xml
util/exception Tag: BETTER_MAVENIZATION maven.xml
project.xml
util/extension/api Tag: BETTER_MAVENIZATION maven.xml
project.xml
util/extension/impl Tag: BETTER_MAVENIZATION maven.xml
project.xml
util/i18n Tag: BETTER_MAVENIZATION maven.xml project.xml
versioning Tag: BETTER_MAVENIZATION avalon-logging.ent
external.ent
Log:
Initial cut. Got problem in util/extension/impl testcase.
Revision Changes Path
No revision
No revision
1.18.2.1 +3 -143 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- maven.xml 23 Apr 2004 04:28:30 -0000 1.18
+++ maven.xml 24 Apr 2004 09:39:34 -0000 1.18.2.1
@@ -2,149 +2,7 @@
<!DOCTYPE project [
<!ENTITY % index SYSTEM "file:index.ent"> %index;
]>
-<project default="avalon:help" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
- <ant:property name="avalonTarget" value="avalon:build"/>
-
- <goal name="avalon:help">
- <echo>
-To build the avalon platform you need to invoke the following three goals:
-
- $ maven plugins --- builds the core plugins
- $ maven meta --- builds framework, utilities, meta and the meta api
- $ maven merlin --- builds repository, logging, composition, activation
and merlin
-
-Subsequent builds can be updated using:
-
- $ maven merlin
-
-A set of utility goals are also provided that build projects including the
building all dependent projects. These include:
-
- util
- framework
- meta
- repository
- logging
- composition
- activation
- merlin
-
-To build a project independnet of dependent project groups is possible using
any of the above targets by prepending the "x" character. For example, to
locally build the meta package without triggering dependent project builds,
just enter the following command:
-
- $ maven xmeta
-
- </echo>
- </goal>
-
- <!-- phase 1 targets -->
- <goal name="plugins" prereqs="xplugins"/>
-
- <!-- phase 2 targets -->
- <goal name="framework" prereqs="xframework"/>
- <goal name="meta" prereqs="framework,xutil,xmeta"/>
-
- <!-- phase 3 targets -->
- <goal name="util" prereqs="xutil"/>
- <goal name="repository" prereqs="xrepository"/>
- <goal name="logging" prereqs="repository,xlogging"/>
- <goal name="composition" prereqs="repository,logging,xcomposition"/>
- <goal name="activation" prereqs="composition,xactivation"/>
- <goal name="merlin" prereqs="activation,xmerlin"/>
-
- <!-- phase 4 targets -->
- <goal name="tutorials" prereqs="xtutorials"/>
-
- <!-- local goals -->
-
- <goal name="xframework">
- <maven:reactor basedir="${basedir}"
- includes="framework/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xutil">
- <maven:reactor basedir="${basedir}"
- includes="util/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xmeta">
- <maven:reactor basedir="${basedir}"
- includes="meta/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xrepository">
- <maven:reactor basedir="${basedir}"
- includes="repository/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xlogging">
- <maven:reactor basedir="${basedir}"
- includes="logging/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xcomposition">
- <maven:reactor basedir="${basedir}"
- includes="composition/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xactivation">
- <maven:reactor basedir="${basedir}"
- includes="activation/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xmerlin">
- <maven:reactor basedir="${basedir}"
- includes="merlin/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xplugins">
- <maven:reactor basedir="${basedir}"
- includes="maven-plugins/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
-
- <goal name="xtutorials">
- <maven:reactor basedir="${basedir}"
- includes="tutorials/project.xml"
- banner="Building:"
- goals="${avalonTarget}"
- ignoreFailures="false"
- postProcessing="false" />
- </goal>
+<project default="multiproject:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<!--
==============================================================================
@@ -161,6 +19,8 @@
value="&avalon-logging-logkit-artifact;"/>
<ant:filter token="STANDARD_RUNTIME"
value="&avalon-activation-artifact;"/>
+ <ant:filter token="REPOSITORY_MAIN"
+ value="&avalon-repository-artifact;"/>
</preGoal>
<postGoal name="java:compile">
1.4.2.1 +4 -1 avalon/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/project.properties,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.properties 23 Apr 2004 04:28:30 -0000 1.4
+++ project.properties 24 Apr 2004 09:39:34 -0000 1.4.2.1
@@ -15,4 +15,7 @@
# The Avalon Build System location.
avalon.buildsystem = ${basedir}/buildsystem
-maven.repo.remote =
http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
+maven.repo.remote =
http://www.apache.org/dist/java-repository,http://www.dpml.net,http://www.ibiblio.org/maven
+
+maven.multiproject.includes=**/project.xml
+maven.multiproject.excludes=**/target/**/project.xml
No revision
No revision
1.7.2.1 +2 -9 avalon/activation/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/activation/impl/maven.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- maven.xml 22 Apr 2004 05:23:28 -0000 1.7
+++ maven.xml 24 Apr 2004 09:39:34 -0000 1.7.2.1
@@ -12,15 +12,8 @@
<ant:property name="pom.specificationVersion"
value="&avalon-activation-spec;"/>
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
+ <preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
- </postGoal>
-
- <postGoal name="jar:install">
- <ant:copy verbose="yes"
-
file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta"
- toDir="${maven.repo.local}/${pom.groupId}/jars" />
- </postGoal>
+ </preGoal>
</project>
1.28.2.1 +13 -1 avalon/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/activation/impl/project.xml,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- project.xml 9 Apr 2004 12:11:48 -0000 1.28
+++ project.xml 24 Apr 2004 09:39:34 -0000 1.28.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-activation-id;</groupId>
<id>&avalon-activation-impl-id;</id>
@@ -57,6 +57,12 @@
<artifactId>&avalon-util-i18n-id;</artifactId>
<version>&avalon-util-i18n-version;</version>
</dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
<dependency>
<groupId>&avalon-framework-id;</groupId>
@@ -83,6 +89,12 @@
<groupId>&avalon-meta-id;</groupId>
<artifactId>&avalon-meta-impl-id;</artifactId>
<version>&avalon-meta-impl-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-plugin-id;</artifactId>
+ <version>&avalon-meta-plugin-version;</version>
+ <type>plugin</type>
</dependency>
<dependency>
No revision
No revision
1.23.2.1 +9 -1 avalon/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/composition/api/project.xml,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- project.xml 22 Apr 2004 06:58:19 -0000 1.23
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.23.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-composition-id;</groupId>
<id>&avalon-composition-api-id;</id>
@@ -57,6 +57,14 @@
<version>&avalon-meta-api-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
<!-- testcase dependencies -->
<dependency>
No revision
No revision
1.8.2.1 +2 -1 avalon/composition/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/maven.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- maven.xml 22 Apr 2004 05:53:43 -0000 1.8
+++ maven.xml 24 Apr 2004 09:39:35 -0000 1.8.2.1
@@ -8,7 +8,8 @@
xmlns:maven="jelly:maven"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
- xmlns:ant="jelly:ant">
+ xmlns:ant="jelly:ant"
+ xmlns:avalon="avalon">
<ant:property name="pom.specificationVersion"
value="&avalon-composition-spec;"/>
1.4.2.1 +1 -0 avalon/composition/impl/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/composition/impl/project.properties,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.properties 19 Apr 2004 06:15:42 -0000 1.4
+++ project.properties 24 Apr 2004 09:39:35 -0000 1.4.2.1
@@ -1,3 +1,4 @@
+
maven.junit.fork=false
maven.junit.sysproperties=java.security.policy
1.31.2.1 +36 -1 avalon/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/project.xml,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- project.xml 22 Apr 2004 06:58:19 -0000 1.31
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.31.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-composition-id;</groupId>
<id>&avalon-composition-impl-id;</id>
@@ -65,6 +65,17 @@
<artifactId>&avalon-util-env-id;</artifactId>
<version>&avalon-util-env-version;</version>
</dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-defaults-id;</artifactId>
+ <version>&avalon-util-defaults-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
<dependency>
<groupId>&avalon-meta-id;</groupId>
@@ -81,6 +92,12 @@
<artifactId>&avalon-meta-impl-id;</artifactId>
<version>&avalon-meta-impl-version;</version>
</dependency>
+ <dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-plugin-id;</artifactId>
+ <version>&avalon-meta-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
<!-- avalon dependecies -->
@@ -90,6 +107,24 @@
<version>&avalon-repository-main-version;</version>
</dependency>
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-spi-id;</artifactId>
+ <version>&avalon-repository-spi-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-impl-id;</artifactId>
+ <version>&avalon-repository-impl-version;</version>
+ </dependency>
+
<dependency>
<groupId>&avalon-logging-id;</groupId>
<artifactId>&avalon-logging-api-id;</artifactId>
No revision
No revision
1.24.2.1 +9 -1 avalon/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/composition/spi/project.xml,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- project.xml 22 Apr 2004 06:58:19 -0000 1.24
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.24.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-composition-id;</groupId>
<id>&avalon-composition-spi-id;</id>
@@ -63,6 +63,14 @@
<version>&avalon-logging-spi-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
</dependencies>
</project>
No revision
No revision
1.7.2.1 +1 -3 avalon/framework/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/framework/project.properties,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- project.properties 23 Apr 2004 04:28:30 -0000 1.7
+++ project.properties 24 Apr 2004 09:39:35 -0000 1.7.2.1
@@ -1,9 +1,7 @@
-maven.repo.remote =
http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
-maven.junit.fork = yes
-
avalon.buildsystem = ${basedir}/../buildsystem
+maven.multiproject.type=site
#
# Banner background and foreground colors.
No revision
No revision
1.3.2.1 +1 -6 avalon/framework/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/framework/api/project.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- project.xml 8 Apr 2004 13:03:43 -0000 1.3
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.3.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-framework-id;</groupId>
<id>&avalon-framework-api-id;</id>
@@ -21,9 +21,4 @@
<version>1.2</version>
</dependency>
</dependencies>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- </build>
-
</project>
No revision
No revision
1.4.2.1 +1 -27 avalon/framework/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/framework/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.xml 8 Apr 2004 13:03:43 -0000 1.4
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.4.2.1
@@ -4,7 +4,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-framework-id;</groupId>
<id>&avalon-framework-impl-id;</id>
@@ -57,11 +57,6 @@
</dependencies>
<build>
-
- <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
<sourceModifications>
<sourceModification>
<className>java.util.logging.Logger</className>
@@ -71,26 +66,6 @@
</sourceModification>
</sourceModifications>
- <!-- Unit test classes -->
-
- <unitTest>
- <includes>
- <include>**/*TestCase.*</include>
- </includes>
- <excludes>
- <exclude>**/DefaultNSConfigurationBuilderTestCase.java</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
<sourceModifications>
<sourceModification>
<className>java.util.logging.Logger</className>
@@ -99,7 +74,6 @@
</excludes>
</sourceModification>
</sourceModifications>
-
</build>
</project>
No revision
No revision
1.5.2.1 +1 -1 avalon/logging/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/api/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 9 Apr 2004 09:37:09 -0000 1.5
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.5.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-api-id;</id>
No revision
No revision
1.4.2.1 +8 -1 avalon/logging/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.xml 9 Apr 2004 09:37:09 -0000 1.4
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.4.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-impl-id;</id>
@@ -67,6 +67,13 @@
<version>1.2</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.4.2.1 +1 -7 avalon/logging/log4j/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/log4j/maven.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- maven.xml 22 Apr 2004 05:55:53 -0000 1.4
+++ maven.xml 24 Apr 2004 09:39:35 -0000 1.4.2.1
@@ -1,7 +1 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
-</project>
+<project default="jar:install" />
1.7.2.1 +9 -1 avalon/logging/log4j/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/log4j/project.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- project.xml 9 Apr 2004 09:37:09 -0000 1.7
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.7.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-log4j-id;</id>
@@ -69,6 +69,14 @@
<version>1.2.8</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
<!-- pre JDK 1.4 dependencies -->
<dependency>
No revision
No revision
1.7.2.1 +8 -1 avalon/logging/logkit/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/api/project.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- project.xml 9 Apr 2004 09:37:09 -0000 1.7
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.7.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-logkit-api-id;</id>
@@ -46,6 +46,13 @@
<groupId>&avalon-repository-id;</groupId>
<artifactId>&avalon-repository-spi-id;</artifactId>
<version>&avalon-repository-spi-version;</version>
+ </dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
No revision
No revision
1.5.2.1 +1 -7 avalon/logging/logkit/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/maven.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- maven.xml 22 Apr 2004 05:10:31 -0000 1.5
+++ maven.xml 24 Apr 2004 09:39:35 -0000 1.5.2.1
@@ -1,8 +1,2 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant"
xmlns:artifact="avalon:artifact">
+<project default="jar:install" />
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
-
-</project>
1.10.2.1 +8 -1 avalon/logging/logkit/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/project.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- project.xml 9 Apr 2004 09:37:09 -0000 1.10
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.10.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-logkit-impl-id;</id>
@@ -91,5 +91,12 @@
<version>2.4.0</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.3.2.1 +1 -6 avalon/logging/logkit/plugins/datagram/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/plugins/datagram/maven.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- maven.xml 22 Apr 2004 05:10:31 -0000 1.3
+++ maven.xml 24 Apr 2004 09:39:35 -0000 1.3.2.1
@@ -1,7 +1,2 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="jar:install" />
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
-</project>
1.8.2.1 +8 -1 avalon/logging/logkit/plugins/datagram/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/plugins/datagram/project.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- project.xml 9 Apr 2004 09:37:09 -0000 1.8
+++ project.xml 24 Apr 2004 09:39:35 -0000 1.8.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../../project.xml</extend>
+ <extend>${basedir}/../../../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-logkit-datagram-id;</id>
@@ -60,5 +60,12 @@
<version>&avalon-logkit-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.3.2.1 +1 -6 avalon/logging/logkit/plugins/socket/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/plugins/socket/maven.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- maven.xml 22 Apr 2004 05:10:31 -0000 1.3
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.3.2.1
@@ -1,7 +1,2 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="jar:install" />
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
-</project>
1.8.2.1 +8 -1 avalon/logging/logkit/plugins/socket/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/plugins/socket/project.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- project.xml 9 Apr 2004 09:37:10 -0000 1.8
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.8.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../../project.xml</extend>
+ <extend>${basedir}/../../../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-logkit-socket-id;</id>
@@ -60,5 +60,12 @@
<version>&avalon-logkit-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.3.2.1 +1 -6 avalon/logging/logkit/plugins/syslog/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/plugins/syslog/maven.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- maven.xml 22 Apr 2004 05:10:31 -0000 1.3
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.3.2.1
@@ -1,7 +1,2 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="jar:install" />
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
-</project>
1.8.2.1 +8 -1 avalon/logging/logkit/plugins/syslog/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/plugins/syslog/project.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- project.xml 9 Apr 2004 09:37:10 -0000 1.8
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.8.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../../project.xml</extend>
+ <extend>${basedir}/../../../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-logkit-syslog-id;</id>
@@ -60,6 +60,13 @@
<version>&avalon-logkit-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.6.2.1 +8 -1 avalon/logging/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/spi/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.xml 23 Apr 2004 01:23:42 -0000 1.6
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.6.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-spi-id;</id>
@@ -62,6 +62,13 @@
<version>1.2</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.2.2.1 +25 -2 avalon/logging/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/test/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- maven.xml 9 Apr 2004 09:37:10 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.2.2.1
@@ -1,3 +1,26 @@
-<project default="test:test">
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!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"
+ value="&avalon-logging-logkit-artifact-spec;"/>
+ <ant:filter token="AVALON-LOGGING-LOGKIT-DATAGRAM-SPEC"
+ value="&avalon-logging-logkit-datagram-artifact-spec;"/>
+ <ant:filter token="AVALON-LOGGING-LOGKIT-SYSLOG-SPEC"
+ value="&avalon-logging-logkit-syslog-artifact-spec;"/>
+ <ant:filter token="AVALON-LOGGING-LOGKIT-SOCKET-SPEC"
+ value="&avalon-logging-logkit-socket-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;"/>
+ </preGoal>
</project>
1.5.2.1 +8 -1 avalon/logging/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/test/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 9 Apr 2004 09:37:10 -0000 1.5
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.5.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-logging-id;</groupId>
<id>&avalon-logging-test-id;</id>
@@ -46,6 +46,13 @@
<groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-i18n-id;</artifactId>
<version>&avalon-util-i18n-version;</version>
+ </dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
</project>
No revision
No revision
1.1.2.1 +4 -0 avalon/maven-plugins/artifact/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- maven.xml 22 Apr 2004 00:55:57 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.1.2.1
@@ -1,5 +1,9 @@
<project default="plugin:install" xmlns:ant="jelly:ant">
+ <postGoal name="plugin:install" >
+ <attainGoal name="plugin:deploy" />
+ </postGoal>
+
<preGoal name="jar:jar">
<attainGoal name="avalon:generate"/>
</preGoal>
1.4.2.1 +30 -15 avalon/maven-plugins/artifact/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- plugin.jelly 22 Apr 2004 05:10:31 -0000 1.4
+++ plugin.jelly 24 Apr 2004 09:39:36 -0000 1.4.2.1
@@ -4,14 +4,31 @@
xmlns:define="jelly:define"
xmlns:util="jelly:util"
xmlns:maven="jelly:maven"
- xmlns:ant="jelly:ant" >
+ xmlns:ant="jelly:ant"
+ xmlns:artifact="avalon-artifact" >
- <define:taglib uri="avalon:artifact"/>
+ <define:taglib uri="avalon-artifact"/>
+
+ <postGoal name="java:prepare-filesystem">
+ <attainGoal name="artifact:install" />
+ </postGoal>
+
+ <postGoal name="jar:install">
+ <util:file var="metaFile"
name="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta" />
+ <j:if test="${metaFile.exists()}" >
+ <ant:copy verbose="yes"
+
file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta"
+ toDir="${maven.repo.local}/${pom.groupId}/jars" />
+ </j:if>
+ </postGoal>
<goal name="artifact:install" prereqs="artifact:create">
- <ant:copy toDir="${maven.repo.local}/${pom.groupId}/jars"
-
file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta"
- verbose="yes"/>
+ <util:file var="metaFile"
name="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta" />
+ <j:if test="${metaFile.exists()}" >
+ <ant:copy toDir="${maven.repo.local}/${pom.groupId}/jars"
+
file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta"
+ verbose="yes"/>
+ </j:if>
</goal>
<!--
@@ -22,7 +39,6 @@
#
-->
<goal name="artifact:create">
-
<maven:snapshot project="${pom}"/>
<ant:property name="filename"
@@ -137,15 +153,14 @@
#
</ant:echo>
- <ant:property name="avalonArtifactDestination"
- value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
- <ant:mkdir dir="${avalonArtifactDestination}"/>
- <ant:copy
- file="${filename}"
- todir="${avalonArtifactDestination}"
- overwrite="true"
- />
-
+ <ant:property name="avalonArtifactDestination"
+ value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
+ <ant:mkdir dir="${avalonArtifactDestination}"/>
+ <ant:copy
+ file="${filename}"
+ todir="${avalonArtifactDestination}"
+ overwrite="true"
+ />
</goal>
</project>
1.1.2.1 +3 -0 avalon/maven-plugins/artifact/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/project.properties,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- project.properties 22 Apr 2004 00:55:57 -0000 1.1
+++ project.properties 24 Apr 2004 09:39:36 -0000 1.1.2.1
@@ -2,3 +2,6 @@
project.name=avalon-util-plugin
avalon.buildsystem = ${basedir}/../../buildsystem
+
+maven.artifact.type=plugin
+maven.multiproject.type=plugin
No revision
No revision
1.5.2.1 +2 -1 avalon/maven-plugins/versioning/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/versioning/project.properties,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.properties 18 Apr 2004 15:52:10 -0000 1.5
+++ project.properties 24 Apr 2004 09:39:36 -0000 1.5.2.1
@@ -29,6 +29,7 @@
maven.license.licenseFile=${basedir}/../../LICENSE.txt
maven.artifact.type=plugin
+maven.multiproject.type=plugin
maven.increment.enable=true
-maven.increment.central.entities=${basedir}/../../versioning
\ No newline at end of file
+maven.increment.central.entities=${basedir}/../../versioning
No revision
No revision
1.20.2.1 +96 -96 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- INSTALL.TXT 19 Apr 2004 10:50:42 -0000 1.20
+++ INSTALL.TXT 24 Apr 2004 09:39:36 -0000 1.20.2.1
@@ -1,96 +1,96 @@
-
-PROJECT: Merlin @VERSION@
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /system
- README.TXT
- LICENSE.TXT
- INSTALL.TXT
-
-Available development tools related to the maven build system include:
-
- @META_PLUGIN_JAR@
- @MERLIN_PLUGIN_JAR@
-
-
-Installing Merlin.
-------------------
-
-To use Merlin command line support or the Merlin NT Service
-you will need to define the MERLIN_HOME environment
-variable for your system and include MERLIN_HOME/bin in
-your system path. The MERLIN_HOME environment variable
-should point to the merlin directory.
-
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-Under Lunix you can do this as follows:
-
- $ echo '
- > # set location of merlin
- > export MERLIN_HOME=/opt/merlin
- > # include it in the path
- > export PATH=$PATH:$MERLIN_HOME/bin
- > ' >> ~/.bash_profile
- $ source ~/.bash_profile
-
-Versions of Merlin prior to the 3.2-dev 20031210 build maintained
-a local repository of jar files under the %MERLIN_HOME%/repository
-directory. As of the 20031210 build the repository is maintained
-under AVALON_HOME/repository where AVALON_HOME defaults to
-${user.home}/.avalon. To override the AVALON_HOME location you can
-either define a AVALON_HOME environment variable or you can add a
-merlin.properties file to ${user.home} containing the
-"merlin.repository" property key and a value point to you preferred
-repository location.
-
-To confirm that your environment variables are correct, you
-should open a new command window and invoke the Merlin
-CLI application.
-
- $ merlin -version
-
-The installation of Merlin is now complete, however, two plugins are
-provided with the installation supporting merlin development under the
-Maven platform. These plugins should be placed in the Maven plugin
-directory (${maven.home.local}\plugins).
-
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
-
-Please note that if you are upgrading an existing installation you must
-delete the following two directories:
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
-
-Replace the existing avalon-meta and merlin plugin jar files with the
supplied
-versions. Finally, delete all *.cache files in the Maven plugin directory.
-
-You now have everything in place to start using the Merlin Tutorial or
-building you own components. If you have any problems, please subscribe
-and post a message to [EMAIL PROTECTED]
-
-Special Note for JRE 1.3 and earlier.
--------------------------------------
-
-Some applications assume that XML parsing classes are available withing
-the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
-you can copy the following files to the JAVAHOME/lib/ext directory or
-declare an alternative directory as a JVM argument under the
-MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
-
- system/xml-apis/jars/xml-apis-2.0.2.jar
- system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
- system/xerces/jars/xerces-2.4.0.jar
-
+
+PROJECT: Merlin @VERSION@
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.TXT
+
+Available development tools related to the maven build system include:
+
+ @META_PLUGIN_JAR@
+ @MERLIN_PLUGIN_JAR@
+
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Under Lunix you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME/repository where AVALON_HOME defaults to
+${user.home}/.avalon. To override the AVALON_HOME location you can
+either define a AVALON_HOME environment variable or you can add a
+merlin.properties file to ${user.home} containing the
+"merlin.repository" property key and a value point to you preferred
+repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+ $ merlin -version
+
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the
+Maven platform. These plugins should be placed in the Maven plugin
+directory (${maven.home.local}\plugins).
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
+
+Replace the existing avalon-meta and merlin plugin jar files with the
supplied
+versions. Finally, delete all *.cache files in the Maven plugin directory.
+
+You now have everything in place to start using the Merlin Tutorial or
+building you own components. If you have any problems, please subscribe
+and post a message to [EMAIL PROTECTED]
+
+Special Note for JRE 1.3 and earlier.
+-------------------------------------
+
+Some applications assume that XML parsing classes are available withing
+the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
+you can copy the following files to the JAVAHOME/lib/ext directory or
+declare an alternative directory as a JVM argument under the
+MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
+
+ system/xml-apis/jars/xml-apis-2.0.2.jar
+ system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
+ system/xerces/jars/xerces-2.4.0.jar
+
No revision
No revision
1.1.8.1 +1 -3 avalon/merlin/api/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/api/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- maven.xml 8 Dec 2003 15:37:12 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.1.8.1
@@ -1,3 +1 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
-</project>
+<project default="jar:install" />
1.11.2.1 +8 -1 avalon/merlin/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/api/project.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- project.xml 9 Apr 2004 06:52:01 -0000 1.11
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.11.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&merlin-id;</groupId>
<id>&merlin-api-id;</id>
@@ -40,6 +40,13 @@
<version>&avalon-repository-api-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.4.2.1 +1 -15 avalon/merlin/cli/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/maven.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- maven.xml 22 Apr 2004 02:25:02 -0000 1.4
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.4.2.1
@@ -1,16 +1,2 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
- <preGoal name="jar:jar">
- <j:forEach var="dep" items="${pom.dependencies}">
- <unzip src="${pom.getDependencyPath( dep.getId() )}"
- dest="${maven.build.dir}/classes">
- <patternset>
- <exclude name="META-INF/**"/>
- <exclude name="*.meta"/>
- </patternset>
- </unzip>
- </j:forEach>
- </preGoal>
-
-</project>
+<project default="jar:install" />
1.12.2.1 +8 -1 avalon/merlin/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/project.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- project.xml 9 Apr 2004 06:52:01 -0000 1.12
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.12.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&merlin-id;</groupId>
<id>&merlin-cli-id;</id>
@@ -35,6 +35,13 @@
<version>1.0</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.13.2.1 +1 -29 avalon/merlin/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/impl/maven.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- maven.xml 22 Apr 2004 05:10:31 -0000 1.13
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.13.2.1
@@ -1,30 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
- <!ENTITY % index SYSTEM "file:index.ent"> %index;
-]>
-
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
- <ant:property name="pom.specificationVersion" value="&merlin-spec;"/>
-
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
- <!--
- Create the default merlin.properties containing the
- implementation identifier. This is subsequently copied
- into the maven repository under the path
- ${maven.repo.local}/${pom.groupId}/properties/merlin.properties
- and is used by the embedding applications such as cli, plugin,
- unit test, etc.
- -->
- <postGoal name="java:jar-resources">
- <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/properties"/>
- <ant:copy toDir="${maven.repo.local}/${pom.groupId}/properties"
- file="${maven.build.dir}/classes/merlin.properties"
- verbose="yes"
- overwrite="yes"/>
- </postGoal>
-
-</project>
+<project default="jar:install" />
1.35.2.1 +9 -1 avalon/merlin/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/impl/project.xml,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- project.xml 9 Apr 2004 12:11:49 -0000 1.35
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.35.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&merlin-id;</groupId>
<id>&merlin-impl-id;</id>
@@ -183,6 +183,14 @@
<version>1.2</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
<!-- pre JDK 1.4 dependencies -->
<dependency>
No revision
No revision
1.3.2.1 +3 -0 avalon/merlin/plugin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/plugin/project.properties,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- project.properties 22 Apr 2004 01:21:24 -0000 1.3
+++ project.properties 24 Apr 2004 09:39:36 -0000 1.3.2.1
@@ -18,3 +18,6 @@
#
project.name = merlin-plugin
avalon.buildsystem = ${basedir}/../../buildsystem
+
+maven.artifact.type=plugin
+maven.multiproject.type=plugin
1.26.2.1 +8 -1 avalon/merlin/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/plugin/project.xml,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -r1.26 -r1.26.2.1
--- project.xml 23 Apr 2004 07:29:20 -0000 1.26
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.26.2.1
@@ -21,7 +21,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&merlin-id;</groupId>
<id>&merlin-plugin-id;</id>
@@ -47,6 +47,13 @@
</properties>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
<build>
No revision
No revision
1.2.2.1 +1 -3 avalon/merlin/servlet/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/servlet/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- maven.xml 22 Apr 2004 02:25:02 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:36 -0000 1.2.2.1
@@ -1,3 +1 @@
-<project default="war:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
-</project>
+<project default="war:install" />
1.12.2.1 +8 -1 avalon/merlin/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/servlet/project.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.12
+++ project.xml 24 Apr 2004 09:39:36 -0000 1.12.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&merlin-id;</groupId>
<id>&merlin-servlet-id;</id>
@@ -73,6 +73,13 @@
<version>2.3</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.1.8.1 +1 -1 avalon/merlin/site/installer/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/installer/project.xml,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- project.xml 28 Dec 2003 10:14:46 -0000 1.1
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.1.8.1
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project-common.xml</extend>
<groupId>merlin</groupId>
<id>merlin-installer</id>
No revision
No revision
1.9.2.1 +1 -21 avalon/merlin/unit/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/unit/maven.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- maven.xml 22 Apr 2004 02:25:02 -0000 1.9
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.9.2.1
@@ -1,22 +1,2 @@
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
- <!--
- Aggregate dependent jars into the jar created by this project so that we
- has a single reference jar file for convinient deployment.
- -->
- <preGoal name="jar:jar">
- <j:forEach var="dep" items="${pom.dependencies}">
- <j:if test="${dep.getId() != 'junit:junit'}">
- <unzip src="${pom.getDependencyPath( dep.getId() )}"
- dest="${maven.build.dir}/classes">
- <patternset>
- <exclude name="META-INF/**"/>
- <exclude name="*.meta"/>
- </patternset>
- </unzip>
- </j:if>
- </j:forEach>
- </preGoal>
-
-</project>
+<project default="jar:install" />
1.32.2.1 +8 -1 avalon/merlin/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/unit/project.xml,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- project.xml 22 Apr 2004 07:18:06 -0000 1.32
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.32.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&merlin-id;</groupId>
<id>&merlin-unit-id;</id>
@@ -30,6 +30,13 @@
<version>3.8.1</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.1.4.1 +1 -2 avalon/meta/api/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/meta/api/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- maven.xml 10 Dec 2003 09:52:35 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.1.4.1
@@ -1,2 +1 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
1.8.2.1 +8 -1 avalon/meta/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/api/project.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- project.xml 8 Apr 2004 14:16:27 -0000 1.8
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.8.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-api-id;</id>
@@ -55,6 +55,13 @@
<version>2.4.0</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.1.4.1 +2 -2 avalon/meta/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/meta/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- maven.xml 10 Dec 2003 09:52:35 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.1.4.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.10.2.1 +9 -1 avalon/meta/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/impl/project.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- project.xml 8 Apr 2004 14:16:27 -0000 1.10
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.10.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-impl-id;</id>
@@ -55,6 +55,14 @@
<version>1.2</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
<!-- pre JDK 1.4 dependencies -->
<dependency>
No revision
No revision
1.2.2.1 +4 -0 avalon/meta/plugin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- maven.xml 12 Apr 2004 15:43:22 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.2.2.1
@@ -1,5 +1,9 @@
<project default="plugin:install" xmlns:ant="jelly:ant">
+ <postGoal name="plugin:install" >
+ <attainGoal name="plugin:deploy" />
+ </postGoal>
+
<preGoal name="jar:jar">
<attainGoal name="avalon:generate"/>
</preGoal>
1.1.2.1 +3 -0 avalon/meta/plugin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/project.properties,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- project.properties 17 Mar 2004 08:46:57 -0000 1.1
+++ project.properties 24 Apr 2004 09:39:37 -0000 1.1.2.1
@@ -2,3 +2,6 @@
project.name=avalon-meta-plugin
avalon.buildsystem = ${basedir}/../../buildsystem
+
+maven.artifact.type=plugin
+maven.multiproject.type=plugin
1.13.2.1 +9 -2 avalon/meta/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- project.xml 12 Apr 2004 15:43:22 -0000 1.13
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.13.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-plugin-id;</id>
@@ -60,8 +60,15 @@
<version>1.3</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
<!-- pre JDK 1.4 dependencies -->
-
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
No revision
No revision
1.7.2.1 +8 -1 avalon/meta/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/spi/project.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- project.xml 8 Apr 2004 14:16:27 -0000 1.7
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.7.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-spi-id;</id>
@@ -34,6 +34,13 @@
<version>&avalon-meta-api-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.1.4.1 +2 -2 avalon/meta/tools/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/meta/tools/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- maven.xml 10 Dec 2003 09:52:35 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.1.4.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.11.2.1 +9 -10 avalon/meta/tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/tools/project.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- project.xml 8 Apr 2004 14:16:27 -0000 1.11
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.11.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-tools-id;</id>
@@ -20,14 +20,6 @@
Component meta info and meta data tools.
</description>
- <developers>
- <developer>
- <name>Stephen McConnell</name>
- <id>mcconnell</id>
- <email>[EMAIL PROTECTED]</email>
- </developer>
- </developers>
-
<dependencies>
<dependency>
@@ -72,8 +64,15 @@
<version>1.3</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
+
<!-- pre JDK 1.4 dependencies -->
-
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
No revision
No revision
1.2.6.1 +2 -2 avalon/repository/api/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/api/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- maven.xml 5 Dec 2003 02:03:59 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.2.6.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.5.2.1 +1 -1 avalon/repository/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/api/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.5
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.5.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-api-id;</id>
No revision
No revision
1.2.4.1 +1 -28 avalon/repository/cli/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/cli/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- maven.xml 17 Feb 2004 11:06:16 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.2.4.1
@@ -1,28 +1 @@
-
-<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
- <preGoal name="jar:jar">
- <j:forEach var="dep" items="${pom.dependencies}">
- <unzip src="${pom.getDependencyPath( dep.getId() )}"
- dest="${maven.build.dir}/classes">
- <patternset>
- <exclude name="META-INF/**"/>
- <exclude name="*.meta"/>
- </patternset>
- </unzip>
- </j:forEach>
- </preGoal>
-
- <ant:property environment="env"/>
- <ant:property name="merlinEnvironment" value="${env.MERLIN_HOME}"/>
- <j:if test="${merlinEnvironment != ''}">
- <ant:property name="merlin.home" value="${merlinEnvironment}"/>
- </j:if>
- <ant:property name="merlin.home" value="${user.home}/.merlin"/>
-
- <goal name="update" prereqs="jar:install">
- <copy
file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar"
- toDir="${merlin.home}/system/${pom.groupId}/jars"/>
- </goal>
-
-</project>
+<project default="jar:install" />
1.4.2.1 +8 -1 avalon/repository/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/cli/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.4
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.4.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-cli-id;</id>
@@ -35,6 +35,13 @@
<version>1.0</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.6.2.1 +0 -4 avalon/repository/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/maven.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- maven.xml 22 Apr 2004 05:10:31 -0000 1.6
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.6.2.1
@@ -3,8 +3,4 @@
<ant:property name="criteriaClass"
value="org/apache/avalon/repository/impl/DefaultRepositoryCriteria"/>
- <postGoal name="test:test">
- <attainGoal name="artifact:install"/>
- </postGoal>
-
</project>
1.5.2.1 +1 -0 avalon/repository/impl/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.properties,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.properties 22 Apr 2004 01:24:49 -0000 1.5
+++ project.properties 24 Apr 2004 09:39:37 -0000 1.5.2.1
@@ -13,3 +13,4 @@
#
project.name=avalon-repository-impl
avalon.buildsystem = ${basedir}/../../buildsystem
+
1.9.2.1 +8 -1 avalon/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.9
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.9.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-impl-id;</id>
@@ -60,6 +60,13 @@
<version>&avalon-util-i18n-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
</project>
No revision
No revision
1.8.2.1 +0 -1 avalon/repository/main/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.properties,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- project.properties 22 Apr 2004 01:24:49 -0000 1.8
+++ project.properties 24 Apr 2004 09:39:37 -0000 1.8.2.1
@@ -1,7 +1,6 @@
avalon.repository.implementation =
artifact:avalon-repository/avalon-repository-impl#2.0-SNAPSHOT
-
avalon.repository.hosts = http://www.dpml.net,http://www.ibiblio.org/maven
#
1.8.2.1 +9 -1 avalon/repository/main/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.8
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.8.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-main-id;</id>
@@ -56,6 +56,14 @@
<groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-i18n-id;</artifactId>
<version>&avalon-util-i18n-version;</version>
+ </dependency>
+
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
No revision
No revision
1.6.2.1 +9 -1 avalon/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/spi/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.6
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.6.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-spi-id;</id>
@@ -21,6 +21,14 @@
<groupId>&avalon-repository-id;</groupId>
<artifactId>&avalon-repository-api-id;</artifactId>
<version>&avalon-repository-api-version;</version>
+ </dependency>
+
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
No revision
No revision
1.1.1.1.6.1 +1 -4 avalon/repository/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/test/maven.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -r1.1.1.1 -r1.1.1.1.6.1
--- maven.xml 4 Dec 2003 19:34:57 -0000 1.1.1.1
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.1.1.1.6.1
@@ -1,4 +1 @@
-<project default="test:test" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
-
-
-</project>
+<project default="test:test" />
1.6.2.1 +9 -1 avalon/repository/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/test/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.6
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.6.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-test-id;</id>
@@ -32,6 +32,14 @@
<groupId>&avalon-framework-id;</groupId>
<artifactId>&avalon-framework-impl-id;</artifactId>
<version>&avalon-framework-impl-version;</version>
+ </dependency>
+
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
No revision
No revision
1.2.6.1 +2 -2 avalon/repository/util/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/util/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- maven.xml 5 Dec 2003 02:03:59 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:37 -0000 1.2.6.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.5.2.1 +9 -1 avalon/repository/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/util/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 9 Apr 2004 06:52:02 -0000 1.5
+++ project.xml 24 Apr 2004 09:39:37 -0000 1.5.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-util-id;</id>
@@ -21,6 +21,14 @@
<groupId>&avalon-repository-id;</groupId>
<artifactId>&avalon-repository-api-id;</artifactId>
<version>&avalon-repository-api-version;</version>
+ </dependency>
+
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
No revision
No revision
1.2.2.1 +1 -3 avalon/util/criteria/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/criteria/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- maven.xml 11 Apr 2004 13:31:45 -0000 1.2
+++ maven.xml 24 Apr 2004 09:39:38 -0000 1.2.2.1
@@ -1,3 +1 @@
-<project default="jar:install">
-
-</project>
+<project default="jar:install" />
1.5.2.1 +1 -1 avalon/util/criteria/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/criteria/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 8 Apr 2004 12:57:19 -0000 1.5
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.5.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-criteria-id;</id>
No revision
No revision
1.1.4.1 +2 -2 avalon/util/defaults/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/defaults/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- maven.xml 8 Dec 2003 09:33:28 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:38 -0000 1.1.4.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.6.2.1 +8 -1 avalon/util/defaults/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/defaults/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.xml 8 Apr 2004 12:57:19 -0000 1.6
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.6.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-defaults-id;</id>
@@ -24,6 +24,13 @@
<version>&avalon-util-env-version;</version>
</dependency>
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
<build>
No revision
No revision
1.6.2.1 +1 -1 avalon/util/env/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/env/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.xml 8 Apr 2004 12:57:19 -0000 1.6
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.6.2.1
@@ -4,7 +4,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-env-id;</id>
No revision
No revision
1.1.4.1 +2 -2 avalon/util/exception/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/exception/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- maven.xml 8 Dec 2003 09:33:28 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:38 -0000 1.1.4.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.4.2.1 +1 -1 avalon/util/exception/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/exception/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.xml 8 Apr 2004 12:57:19 -0000 1.4
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.4.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-exception-id;</id>
No revision
No revision
1.1.1.1.2.1 +2 -2 avalon/util/extension/api/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/extension/api/maven.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- maven.xml 4 Feb 2004 17:24:05 -0000 1.1.1.1
+++ maven.xml 24 Apr 2004 09:39:38 -0000 1.1.1.1.2.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.4.2.1 +1 -1 avalon/util/extension/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/extension/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.xml 8 Apr 2004 13:41:29 -0000 1.4
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.4.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-extension-api-id;</id>
No revision
No revision
1.1.1.1.4.1 +2 -2 avalon/util/extension/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/extension/impl/maven.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- maven.xml 4 Feb 2004 17:24:15 -0000 1.1.1.1
+++ maven.xml 24 Apr 2004 09:39:38 -0000 1.1.1.1.4.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.4.4.1 +9 -1 avalon/util/extension/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/extension/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- project.xml 8 Apr 2004 13:41:29 -0000 1.4
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.4.4.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-extension-impl-id;</id>
@@ -25,6 +25,14 @@
<groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-extension-api-id;</artifactId>
<version>&avalon-util-extension-api-version;</version>
+ </dependency>
+
+ <!-- Building Dependencies -->
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-plugin-id;</artifactId>
+ <version>&avalon-util-plugin-version;</version>
+ <type>plugin</type>
</dependency>
</dependencies>
No revision
No revision
1.1.2.1 +2 -2 avalon/util/i18n/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/i18n/maven.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- maven.xml 8 Mar 2004 11:23:04 -0000 1.1
+++ maven.xml 24 Apr 2004 09:39:38 -0000 1.1.2.1
@@ -1,2 +1,2 @@
-<project default="jar:install">
-</project>
+<project default="jar:install" />
+
1.2.2.1 +1 -1 avalon/util/i18n/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/i18n/project.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- project.xml 8 Apr 2004 12:57:19 -0000 1.2
+++ project.xml 24 Apr 2004 09:39:38 -0000 1.2.2.1
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-i18n-id;</id>
No revision
No revision
1.6.2.1 +4 -0 avalon/versioning/avalon-logging.ent
Index: avalon-logging.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logging.ent,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- avalon-logging.ent 23 Apr 2004 04:28:31 -0000 1.6
+++ avalon-logging.ent 24 Apr 2004 09:39:38 -0000 1.6.2.1
@@ -23,6 +23,9 @@
<!ENTITY avalon-logging-impl-id "avalon-logging-impl">
<!ENTITY avalon-logging-impl-version "1.0.dev-0">
+<!ENTITY avalon-logging-site-id "avalon-logging-site">
+<!ENTITY avalon-logging-site-version "1.0.dev-0">
+
<!ENTITY avalon-logging-spi-id "avalon-logging-spi">
<!ENTITY avalon-logging-spi-version "1.0.dev-0">
@@ -50,4 +53,5 @@
<!ENTITY avalon-logging-logkit-artifact
"artifact:&avalon-logging-logkit-artifact-spec;">
<!ENTITY avalon-logging-logkit-datagram-artifact-spec
"&avalon-logging-id;/&avalon-logging-logkit-datagram-id;#&avalon-logging-logkit-datagram-version;">
<!ENTITY avalon-logging-logkit-syslog-artifact-spec
"&avalon-logging-id;/&avalon-logging-logkit-syslog-id;#&avalon-logging-logkit-syslog-version;">
+<!ENTITY avalon-logging-logkit-socket-artifact-spec
"&avalon-logging-id;/&avalon-logging-logkit-socket-id;#&avalon-logging-logkit-socket-version;">
1.1.2.1 +4 -0 avalon/versioning/external.ent
Index: external.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/external.ent,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- external.ent 6 Apr 2004 07:33:09 -0000 1.1
+++ external.ent 24 Apr 2004 09:39:38 -0000 1.1.2.1
@@ -6,3 +6,7 @@
<!ENTITY xerces-id "xerces">
<!ENTITY xerces-group "xerces">
<!ENTITY xerces-version "2.4.0">
+
+<!ENTITY xalan-id "xerces">
+<!ENTITY xalan-group "xerces">
+<!ENTITY xalan-version "2.5.1">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
