mcconnell 2003/12/14 03:56:34
Modified: repository/main/src/java/org/apache/avalon/repository/main
DefaultInitialContext.java
Log:
Cleanup avalon.home resolution.
Revision Changes Path
1.10 +51 -24
avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java
Index: DefaultInitialContext.java
===================================================================
RCS file:
/home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultInitialContext.java 9 Dec 2003 09:19:10 -0000 1.9
+++ DefaultInitialContext.java 14 Dec 2003 11:56:33 -0000 1.10
@@ -113,11 +113,47 @@
*/
public static final String AVALON = "avalon.properties";
+ /**
+ * Return the Avalon system common directory. This directory is
+ * is used as the default root directory against which the
+ * default application repository is established.
+ *
+ * @return the avalon system home directory.
+ */
+ public static File getAvalonHome()
+ {
+ try
+ {
+ String path =
+ System.getProperty( "avalon.home", Env.getEnvVariable( "AVALON_HOME"
) );
+
+ if( null != path )
+ {
+ return new File( path ).getCanonicalFile();
+ }
+ else
+ {
+ return new File(
+ System.getProperty( "user.home" )
+ + File.separator
+ + ".avalon" ).getCanonicalFile();
+ }
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Internal error while attempting to access symbol AVALON_HOME.";
+ final String message =
+ ExceptionHelper.packException( error, e, true );
+ throw new RuntimeException( message );
+ }
+ }
+
//------------------------------------------------------------------
- // static
+ // private static
//------------------------------------------------------------------
- private static final String AVALON_IMPLEMENTATION =
+ private static final String AVALON_IMPL_PROPERTIES =
"avalon.implementation";
private static final File USER_HOME =
@@ -401,7 +437,7 @@
*/
private static Properties createDefaultProperties()
{
- final String path = AVALON_IMPLEMENTATION;
+ final String path = AVALON_IMPL_PROPERTIES;
try
{
Properties properties = new Properties();
@@ -459,32 +495,23 @@
{
String homeValue = home.getProperty( HOSTS_KEY );
String workValue = work.getProperty( HOSTS_KEY, homeValue );
- String value = System.getProperty( CACHE_KEY , workValue );
+ String value = System.getProperty( HOSTS_KEY , workValue );
if( null == value ) return DEFAULT_INITIAL_HOSTS;
return expandHosts( value );
}
private static File setupDefaultCache( Properties home, Properties work )
{
- try
- {
- String env = Env.getEnvVariable( "AVALON_HOME" );
- String avalon = System.getProperty( "avalon.home", env );
- String homeValue = home.getProperty( CACHE_KEY, avalon );
- String workValue = work.getProperty( CACHE_KEY, homeValue );
- String value = System.getProperty( CACHE_KEY , workValue );
- if( null != value ) return new File( value );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to access environment.";
- final String message =
- ExceptionHelper.packException( error, e, true );
- System.err.println( message );
- return null;
- }
- return new File( USER_HOME, ".avalon" );
+ String homeValue = home.getProperty( CACHE_KEY );
+ String workValue = work.getProperty( CACHE_KEY, homeValue );
+ String value = System.getProperty( CACHE_KEY , workValue );
+ if( null != value ) return new File( value );
+ return getDefaultCache();
+ }
+
+ private static File getDefaultCache()
+ {
+ return new File( getAvalonHome(), "repository" );
}
private static File getBaseDirectory()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
