mcconnell 2003/12/14 04:00:12
Modified: merlin/kernel/impl maven.xml
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultCriteria.java
Log:
Remove out-of-date jelly scripts and update to use improved handling of avalon home
resolution.
Revision Changes Path
1.3 +8 -40 avalon/merlin/kernel/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 13 Dec 2003 21:12:49 -0000 1.2
+++ maven.xml 14 Dec 2003 12:00:12 -0000 1.3
@@ -5,57 +5,25 @@
</postGoal>
<!--
- ###########################################################################
- # Create the target .meta metadata. #
- # This contains the information used by the factory to identify the #
- # the implementation artifact classpath, factory, and whatever else #
- # we need to include this jar as the implementation strategy. #
- ###########################################################################
+ Create the default merlin.properties containing the
+ implemebntation 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:compile">
-
- <ant:echo file="${maven.build.dir}/${pom.artifactId}.meta">
-#
-# Metadata identification.
-# This file if generated under the Avalon Repository Main build process.
-# It contains a target artifact reference and factory parameters using
-# during the bootstrapping of the repository implementation.
-#
-
-meta.domain = avalon
-meta.classifier = target
-meta.version = 1.0
-
-#
-# Merlin Implementation target description.
-#
-
-avalon.target.group = ${pom.groupId}
-avalon.target.name = ${pom.artifactId}
-avalon.target.version = ${pom.currentVersion}
-avalon.target.factory = org.apache.avalon.merlin.kernel.impl.DefaultFactory
-
-#
-# EOF
-#
-</ant:echo>
- <ant:mkdir dir="${maven.repo.local}/${pom.groupId}"/>
- <ant:copy toDir="${maven.repo.local}/${pom.groupId}"
- file="${maven.build.dir}/${pom.artifactId}.meta" verbose="yes"/>
-
- <ant:echo file="${maven.build.dir}/merlin.properties">
+ <ant:echo file="${maven.build.dir}/classes/merlin.properties">
#
# Merlin Implementation target specification.
#
merlin.implementation = ${pom.groupId}:${pom.artifactId};${pom.currentVersion}
-
</ant:echo>
<ant:mkdir dir="${maven.repo.local}/${pom.groupId}/properties"/>
<ant:copy toDir="${maven.repo.local}/${pom.groupId}/properties"
- file="${maven.build.dir}/merlin.properties" verbose="yes"/>
-
+ file="${maven.build.dir}/classes/merlin.properties" verbose="yes"/>
</postGoal>
</project>
1.9 +6 -2
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
Index: DefaultCriteria.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultCriteria.java 14 Dec 2003 10:54:50 -0000 1.8
+++ DefaultCriteria.java 14 Dec 2003 12:00:12 -0000 1.9
@@ -98,12 +98,16 @@
private static final File USER_DIR =
getBaseDirectory();
+
private static final File USER_HOME =
new File( System.getProperty( "user.home" ) );
+
private static final File TEMP_DIR =
new File( System.getProperty( "java.io.tmpdir" ) );
+
private static final File AVALON_HOME_DIR =
getAvalonHomeDirectory();
+
private static final File MERLIN_HOME_DIR =
getMerlinHomeDirectory();
@@ -153,7 +157,7 @@
return new Parameter[]{
new Parameter(
MERLIN_REPOSITORY,
- File.class, AVALON_HOME_DIR ),
+ File.class, new File( AVALON_HOME_DIR, "repository" ) ),
new Parameter(
MERLIN_HOME,
File.class, MERLIN_HOME_DIR ),
@@ -280,7 +284,7 @@
new Defaults(
Parameter.getKeys( super.getParameters() ), new String[0], finders );
- printProperties( defaults, "defaults" );
+ //printProperties( defaults, "defaults" );
//
// add ${merlin.dir} to assist in synbol expansion then expand
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
