mcconnell 2003/11/24 14:09:13
Modified: kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultCriteria.java
Log:
Fix the default resolution sequence.
Revision Changes Path
1.5 +1 -1
avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultCriteria.java
Index: DefaultCriteria.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultCriteria.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultCriteria.java 24 Nov 2003 21:26:36 -0000 1.4
+++ DefaultCriteria.java 24 Nov 2003 22:09:13 -0000 1.5
@@ -136,7 +136,7 @@
final DefaultsFinder[] finders =
new DefaultsFinder[]{
new SimpleDefaultsFinder(
- new Properties[] { avalon, merlin },
+ new Properties[] { avalon, merlin, env },
false ),
new SystemDefaultsFinder()
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
