mcconnell 2003/11/03 08:14:03
Modified: merlin/kernel/loader project.xml
merlin/kernel/loader/src/java/org/apache/avalon/merlin
KernelDefaults.java
Log:
Fixed Env. references.
Revision Changes Path
1.4 +5 -0 avalon/merlin/kernel/loader/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/loader/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 30 Oct 2003 22:00:38 -0000 1.3
+++ project.xml 3 Nov 2003 16:14:03 -0000 1.4
@@ -24,6 +24,11 @@
<version>3.8.1</version>
</dependency>
<dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-env</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
<version>1.0b1</version>
1.7 +5 -5
avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin/KernelDefaults.java
Index: KernelDefaults.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin/KernelDefaults.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KernelDefaults.java 30 Oct 2003 22:00:38 -0000 1.6
+++ KernelDefaults.java 3 Nov 2003 16:14:03 -0000 1.7
@@ -61,8 +61,8 @@
import java.util.Properties ;
import java.util.Enumeration ;
-import org.apache.avalon.merlin.env.Env ;
-import org.apache.avalon.merlin.env.EnvAccessException ;
+import org.apache.avalon.util.env.Env ;
+import org.apache.avalon.util.env.EnvAccessException ;
import org.apache.avalon.repository.ProxyContext ;
@@ -664,7 +664,7 @@
File l_merlinHome = null ;
try
{
- final String merlinHomeEnv = Env.getVariable( MERLIN_HOME_ENV );
+ final String merlinHomeEnv = Env.getEnvVariable( MERLIN_HOME_ENV );
if( merlinHomeEnv != null )
{
return new File( merlinHomeEnv ) ;
@@ -700,7 +700,7 @@
{
try
{
- final String userRepoEnv = Env.getVariable( MERLIN_REPO_LOCAL_ENV );
+ final String userRepoEnv = Env.getEnvVariable( MERLIN_REPO_LOCAL_ENV );
if( userRepoEnv != null )
{
return new File( userRepoEnv ) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
