You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ak...@apache.org on 2004/07/18 18:52:20 UTC
svn commit: rev 23035 - avalon/trunk/runtime/merlin/unit/src/java/org/apache/avalon/merlin/unit
Author: akarasulu
Date: Sun Jul 18 09:52:20 2004
New Revision: 23035
Modified:
avalon/trunk/runtime/merlin/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
Log:
bug fix by Steve McConnells patch
Modified: avalon/trunk/runtime/merlin/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
==============================================================================
--- avalon/trunk/runtime/merlin/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java (original)
+++ avalon/trunk/runtime/merlin/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java Sun Jul 18 09:52:20 2004
@@ -141,10 +141,11 @@
Artifact artifact = DefaultBuilder.createImplementationArtifact(
classloader, home, work,
MERLIN_PROPERTIES, IMPLEMENTATION_KEY );
-
+
+ File cache = getCacheDirectory();
InitialContextFactory icFactory =
new DefaultInitialContextFactory( "merlin", work );
- icFactory.setCacheDirectory( getCacheDirectory() );
+ icFactory.setCacheDirectory( cache );
InitialContext context = icFactory.createInitialContext();
@@ -160,6 +161,7 @@
criteria.put( "merlin.context", "target" );
criteria.put( "merlin.server", "true" );
criteria.put( "merlin.code.security.enabled", "false" );
+ criteria.put( "merlin.repository", cache );
//
// if the deployment path is undefined then the best we
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org