avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends CLIMain.java CLISetup.java
Date Wed, 27 Mar 2002 11:19:41 GMT
donaldp     02/03/27 03:19:41

  Modified:    src/java/org/apache/avalon/phoenix/frontends CLIMain.java
                        CLISetup.java
  Log:
  Made the default kernel.conf configuration relative to phoenix.home rather than to the currently
working directory.
  
  Revision  Changes    Path
  1.29      +11 -1     jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
  
  Index: CLIMain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- CLIMain.java	21 Mar 2002 09:03:41 -0000	1.28
  +++ CLIMain.java	27 Mar 2002 11:19:40 -0000	1.29
  @@ -45,7 +45,10 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( CLIMain.class );
   
  -    private static final String DEFAULT_LOG_FILE = "/logs/phoenix.log";
  +    private static final String DEFAULT_LOG_FILE = 
  +        File.separator + "logs" + File.separator + "phoenix.log";
  +    private static final String DEFAULT_CONF_FILE = 
  +        File.separator + "conf" + File.separator + "kernel.xml";
   
       private final static String DEFAULT_FORMAT =
           "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}] (%{context}):
" +
  @@ -85,6 +88,13 @@
               final Parameters parameters = setup.getParameters();
               final String phoenixHome = System.getProperty( "phoenix.home", ".." );
               parameters.setParameter( "phoenix.home", phoenixHome );
  +            if( !parameters.isParameter( "phoenix.configfile" ) )
  +            {
  +                final File configFile = new File( phoenixHome + DEFAULT_CONF_FILE );
  +                parameters.setParameter( "phoenix.configfile", 
  +                                         configFile.getCanonicalFile().toString() );  //
setting default
  +            }
  +
               execute( parameters, data, blocking );
           }
           catch( final Throwable throwable )
  
  
  
  1.14      +0 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java
  
  Index: CLISetup.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CLISetup.java	25 Mar 2002 09:01:48 -0000	1.13
  +++ CLISetup.java	27 Mar 2002 11:19:40 -0000	1.14
  @@ -142,9 +142,6 @@
           final List clOptions = parser.getArguments();
           final int size = clOptions.size();
   
  -        m_parameters.setParameter( "phoenix.configfile", "../conf/kernel.xml");  // setting
default
  -
  -
           for( int i = 0; i < size; i++ )
           {
               final CLOption option = (CLOption)clOptions.get( i );
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message