mcconnell 2004/04/30 01:58:20
Modified: logging/test/src/test/org/apache/avalon/logging
LoggingManagerHelper.java
. maven.xml
Log:
add additional filters to the root maven.xml to handle the logging package
build
Revision Changes Path
1.6 +4 -3
avalon/logging/test/src/test/org/apache/avalon/logging/LoggingManagerHelper.java
Index: LoggingManagerHelper.java
===================================================================
RCS file:
/home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/LoggingManagerHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoggingManagerHelper.java 9 Apr 2004 10:27:42 -0000 1.5
+++ LoggingManagerHelper.java 30 Apr 2004 08:58:20 -0000 1.6
@@ -56,7 +56,8 @@
public static LoggingManager setUpLoggingManager(
String id, String filename ) throws Exception
{
- InitialContext context = setUpInitialContext(
"target/test-classes/system.xml" );
+ InitialContext context =
+ setUpInitialContext( "target/test-classes/conf/system.xml" );
Artifact[] candidates =
context.getRepository().getCandidates( LoggingManager.class );
Artifact artifact = selectArtifact( candidates, id );
@@ -71,7 +72,7 @@
File basedir = getBaseDir();
File target = new File( basedir, "target" );
- File conf = new File( target, "test-classes" );
+ File conf = new File( target, "test-classes/conf" );
File file = new File( conf, filename );
criteria.put( "avalon.logging.configuration", file );
1.21 +6 -0 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- maven.xml 30 Apr 2004 05:50:39 -0000 1.20
+++ maven.xml 30 Apr 2004 08:58:20 -0000 1.21
@@ -157,6 +157,12 @@
<preGoal name="java:jar-resources">
<ant:filter token="AVALON-LOGGING-LOGKIT-SPEC"
value="&avalon-logging-logkit-artifact-spec;"/>
+ <ant:filter token="AVALON-LOGGING-LOG4J-SPEC"
+ value="&avalon-logging-log4j-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="MERLIN_IMPLEMENTATION"
value="artifact:merlin/merlin-impl#&merlin-impl-version;"/>
<ant:filter token="LOGGING_IMPLEMENTATION"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
