mcconnell 2004/04/08 12:48:45
Modified: merlin/kernel/api index.ent
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultCriteria.java
Log:
Update the factory criteria so that the logging configuration is retured as a
string pror to resolvution as a url - the resolution now takes into account the
base directory as the anchor for a relative path.
Revision Changes Path
1.4 +1 -0 avalon/merlin/kernel/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 14:51:44 -0000 1.3
+++ index.ent 8 Apr 2004 19:48:45 -0000 1.4
@@ -1,3 +1,4 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
1.32 +5 -3
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DefaultCriteria.java 1 Apr 2004 04:06:52 -0000 1.31
+++ DefaultCriteria.java 8 Apr 2004 19:48:45 -0000 1.32
@@ -154,7 +154,7 @@
MERLIN_KERNEL, String.class, null ),
new Parameter(
MERLIN_LOGGING_CONFIG,
- URL.class, null ),
+ String.class, null ),
new Parameter(
MERLIN_LOGGING_IMPLEMENTATION,
String.class, null ),
@@ -418,7 +418,9 @@
*/
public URL getLoggingConfiguration()
{
- return (URL) get( MERLIN_LOGGING_CONFIG );
+ String path = (String) get( MERLIN_LOGGING_CONFIG );
+ File base = getWorkingDirectory();
+ return resolveURL( base, path );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
