mcconnell 2004/04/09 05:11:49
Modified: merlin/activation/impl index.ent project.xml
merlin/activation/impl/src/test/conf/system kernel.xml
merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test
AbstractTestCase.java
merlin/composition/api index.ent project.xml
merlin/composition/impl index.ent project.xml
merlin/composition/impl/src/test/conf/system kernel.xml
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
AbstractTestCase.java
merlin/composition/spi index.ent project.xml
merlin external.xml index.ent maven.xml project.xml
merlin/kernel/impl/conf kernel.xml
merlin/kernel/impl index.ent maven.xml project.xml
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultCriteria.java
Added: merlin/kernel/impl/conf merlin.properties
Removed: merlin/kernel/impl/conf merlin.template
Log:
Synchrnize all of merlin with the common version repository taking into account repo
and logging.
Revision Changes Path
1.6 +1 -0 avalon/merlin/activation/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 06:52:01 -0000 1.5
+++ index.ent 9 Apr 2004 12:11:48 -0000 1.6
@@ -3,3 +3,4 @@
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
1.28 +6 -6 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 9 Apr 2004 06:52:01 -0000 1.27
+++ project.xml 9 Apr 2004 12:11:48 -0000 1.28
@@ -92,14 +92,14 @@
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-api-id;</artifactId>
+ <version>&avalon-logging-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-spi-id;</artifactId>
+ <version>&avalon-logging-spi-version;</version>
</dependency>
<dependency>
1.3 +1 -1 avalon/merlin/activation/impl/src/test/conf/system/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/test/conf/system/kernel.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel.xml 29 Feb 2004 22:25:25 -0000 1.2
+++ kernel.xml 9 Apr 2004 12:11:48 -0000 1.3
@@ -6,7 +6,7 @@
<kernel>
<system>
- <artifact spec="avalon-logging/avalon-logkit-impl#1.0-SNAPSHOT"/>
+ <artifact spec="@AVALON-LOGGING-LOGKIT-SPEC@"/>
</system>
<security>
1.8 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/impl/test/AbstractTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractTestCase.java 4 Mar 2004 03:42:30 -0000 1.7
+++ AbstractTestCase.java 9 Apr 2004 12:11:49 -0000 1.8
@@ -63,7 +63,7 @@
new File( System.getProperty( "basedir" ) );
public static final File SYS_CONF =
- new File( BASEDIR, "src/test/conf/system/kernel.xml" );
+ new File( BASEDIR, "target/test-classes/system/kernel.xml" );
private static final XMLSecurityProfileBuilder SECURITY_BUILDER =
new XMLSecurityProfileBuilder();
1.6 +1 -0 avalon/merlin/composition/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 06:52:01 -0000 1.5
+++ index.ent 9 Apr 2004 12:11:49 -0000 1.6
@@ -3,3 +3,4 @@
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
1.21 +6 -6 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 9 Apr 2004 06:52:01 -0000 1.20
+++ project.xml 9 Apr 2004 12:11:49 -0000 1.21
@@ -41,14 +41,14 @@
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-api-id;</artifactId>
+ <version>&avalon-logging-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-spi-id;</artifactId>
+ <version>&avalon-logging-spi-version;</version>
</dependency>
<dependency>
1.6 +1 -0 avalon/merlin/composition/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 06:52:01 -0000 1.5
+++ index.ent 9 Apr 2004 12:11:49 -0000 1.6
@@ -3,3 +3,4 @@
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
1.28 +6 -6 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 9 Apr 2004 06:52:01 -0000 1.27
+++ project.xml 9 Apr 2004 12:11:49 -0000 1.28
@@ -86,14 +86,14 @@
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-api-id;</artifactId>
+ <version>&avalon-logging-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-spi-id;</artifactId>
+ <version>&avalon-logging-spi-version;</version>
</dependency>
<!-- excalibur dependecies -->
1.3 +1 -1 avalon/merlin/composition/impl/src/test/conf/system/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/conf/system/kernel.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel.xml 29 Feb 2004 22:25:26 -0000 1.2
+++ kernel.xml 9 Apr 2004 12:11:49 -0000 1.3
@@ -6,7 +6,7 @@
<kernel>
<system>
- <artifact spec="avalon-logging/avalon-logkit-impl#1.0-SNAPSHOT"/>
+ <artifact spec="@AVALON-LOGGING-LOGKIT-SPEC@"/>
</system>
<security>
1.9 +1 -1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTestCase.java 17 Mar 2004 10:39:09 -0000 1.8
+++ AbstractTestCase.java 9 Apr 2004 12:11:49 -0000 1.9
@@ -63,7 +63,7 @@
new File( System.getProperty( "basedir" ) );
public static final File SYS_CONF =
- new File( BASEDIR, "src/test/conf/system/kernel.xml" );
+ new File( BASEDIR, "target/test-classes/system/kernel.xml" );
private static final XMLSecurityProfileBuilder SECURITY_BUILDER =
new XMLSecurityProfileBuilder();
1.6 +1 -0 avalon/merlin/composition/spi/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 06:52:01 -0000 1.5
+++ index.ent 9 Apr 2004 12:11:49 -0000 1.6
@@ -3,3 +3,4 @@
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
1.22 +6 -6 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 9 Apr 2004 06:52:01 -0000 1.21
+++ project.xml 9 Apr 2004 12:11:49 -0000 1.22
@@ -53,14 +53,14 @@
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-api-id;</artifactId>
+ <version>&avalon-logging-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-spi-id;</artifactId>
+ <version>&avalon-logging-spi-version;</version>
</dependency>
</dependencies>
1.10 +12 -12 avalon/merlin/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/external.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- external.xml 9 Apr 2004 06:52:01 -0000 1.9
+++ external.xml 9 Apr 2004 12:11:49 -0000 1.10
@@ -30,24 +30,24 @@
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-api-id;</artifactId>
+ <version>&avalon-logging-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logkit-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-impl-id;</artifactId>
+ <version>&avalon-logging-impl-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logkit-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-logkit-impl-id;</artifactId>
+ <version>&avalon-logging-logkit-impl-version;</version>
</dependency>
<dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>2.0</version>
+ <groupId>&avalon-logkit-group;</groupId>
+ <artifactId>&avalon-logkit-id;</artifactId>
+ <version>&avalon-logkit-version;</version>
</dependency>
</dependencies>
1.6 +2 -0 avalon/merlin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 06:52:01 -0000 1.5
+++ index.ent 9 Apr 2004 12:11:49 -0000 1.6
@@ -3,3 +3,5 @@
<!ENTITY % framework-entities SYSTEM "file:../versioning/avalon-framework.ent">
%framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % repo-entities SYSTEM "file:../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../versioning/avalon-logkit.ent">
%logkit-entities;
1.64 +16 -4 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- maven.xml 8 Apr 2004 14:51:44 -0000 1.63
+++ maven.xml 9 Apr 2004 12:11:49 -0000 1.64
@@ -24,10 +24,12 @@
value="&merlin-cli-version;"/>
<ant:property name="merlin.plugin.version"
value="&merlin-plugin-version;"/>
+ <ant:property name="merlin.impl.version"
+ value="&merlin-impl-version;"/>
<ant:property name="meta.plugin.version"
value="&avalon-meta-plugin-version;"/>
-
- <ant:property name="repository.cli.version" value="2.0-SNAPSHOT"/>
+ <ant:property name="repository.cli.version"
+ value="&avalon-repository-cli-version;"/>
<!--
==============================================================================
@@ -87,6 +89,17 @@
<attainGoal name="avalon:package"/>
</goal>
+ <preGoal name="java:jar-resources">
+ <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;"/>
+ </preGoal>
+
<!--
==============================================================================
build the merlin system
@@ -300,11 +313,10 @@
</ant:copy>
<ant:copy toDir="${merlin.build.inst.dir}">
<fileset dir="${basedir}/platform/src">
- <include name="config/**/*"/>
- <include name="system/**/*"/>
<include name="bin/**/*.jar"/>
<include name="bin/**/*.exe"/>
<include name="bin/**/*.dll"/>
+ <include name="config/**/*"/>
</fileset>
<fileset dir="${basedir}">
<include name="LICENSE.txt"/>
1.32 +2 -6 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 4 Apr 2004 15:59:06 -0000 1.31
+++ project.xml 9 Apr 2004 12:11:49 -0000 1.32
@@ -312,6 +312,7 @@
</includes>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/src/test/conf</directory>
<includes>
<include>**/*</include>
@@ -356,16 +357,11 @@
</includes>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/conf</directory>
<includes>
<include>**/*.properties</include>
<include>kernel.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>snapshot.properties</include>
</includes>
</resource>
</resources>
1.8 +1 -1 avalon/merlin/kernel/impl/conf/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/conf/kernel.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kernel.xml 7 Mar 2004 00:00:59 -0000 1.7
+++ kernel.xml 9 Apr 2004 12:11:49 -0000 1.8
@@ -3,7 +3,7 @@
<kernel>
<system>
- <artifact spec="avalon-logging/avalon-logkit-impl#1.0-SNAPSHOT"/>
+ <artifact spec="@AVALON-LOGGING-LOGKIT-SPEC@"/>
</system>
<security>
1.6 +12 -52 avalon/merlin/kernel/impl/conf/merlin.properties
1.5 +2 -0 avalon/merlin/kernel/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/index.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 14:51:44 -0000 1.4
+++ index.ent 9 Apr 2004 12:11:49 -0000 1.5
@@ -2,3 +2,5 @@
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.11 +4 -18 avalon/merlin/kernel/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 6 Apr 2004 06:36:08 -0000 1.10
+++ maven.xml 9 Apr 2004 12:11:49 -0000 1.11
@@ -22,26 +22,12 @@
and is used by the embedding applications such as cli, plugin,
unit test, etc.
-->
-
- <postGoal name="java:compile">
-
- <ant:copy toFile="${maven.build.dir}/classes/merlin.properties">
- <fileset dir="${basedir}/conf">
- <include name="merlin.template"/>
- </fileset>
- <filterset>
- <filter token="MERLIN_IMPLEMENTATION"
- value="artifact:${pom.groupId}/${pom.artifactId}#${pom.currentVersion}"/>
- <filter token="LOGGING_IMPLEMENTATION"
- value="${merlin.logging.implementation}"/>
- <filter token="STANDARD_RUNTIME"
- value="&avalon-activation-artifact;"/>
- </filterset>
- </ant:copy>
-
+ <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"/>
+ file="${maven.build.dir}/classes/merlin.properties"
+ verbose="yes"
+ overwrite="yes"/>
</postGoal>
</project>
1.35 +9 -6 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 9 Apr 2004 06:52:01 -0000 1.34
+++ project.xml 9 Apr 2004 12:11:49 -0000 1.35
@@ -151,17 +151,17 @@
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-api-id;</artifactId>
+ <version>&avalon-logging-api-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-spi-id;</artifactId>
+ <version>&avalon-logging-spi-version;</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -177,6 +177,7 @@
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
+
<dependency>
<id>excalibur-configuration</id>
<version>1.2</version>
@@ -192,6 +193,7 @@
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
+
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId>
@@ -200,6 +202,7 @@
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
+
<dependency>
<groupId>xerces</groupId>
<artifactId>xerces</artifactId>
1.33 +2 -1
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DefaultCriteria.java 8 Apr 2004 19:48:45 -0000 1.32
+++ DefaultCriteria.java 9 Apr 2004 12:11:49 -0000 1.33
@@ -419,6 +419,7 @@
public URL getLoggingConfiguration()
{
String path = (String) get( MERLIN_LOGGING_CONFIG );
+ if( null == path ) return null;
File base = getWorkingDirectory();
return resolveURL( base, path );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
