avalon-dev 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/phoenix/engine/facilitys SarClassLoader.java
Date Mon, 26 Feb 2001 02:11:00 GMT
donaldp     01/02/25 18:11:00

  Modified:    src/java/org/apache/phoenix/engine DefaultSarDeployer.java
                        SarContextResources.java
               src/java/org/apache/phoenix/engine/facilitys
                        SarClassLoader.java
  Log:
  Removed some SarContextResource constants. Did this in preparation for genericising the
loading portion - thus can directly read from  jar/zip in the future.
  
  Revision  Changes    Path
  1.2       +2 -10     jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultSarDeployer.java
  
  Index: DefaultSarDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultSarDeployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultSarDeployer.java	2001/02/24 04:30:59	1.1
  +++ DefaultSarDeployer.java	2001/02/26 02:10:59	1.2
  @@ -182,9 +182,6 @@
           //setup the ServerApplications context
           final DefaultContext context = new DefaultContext();
           context.put( SarContextResources.APP_HOME_DIR, directory );
  -        context.put( SarContextResources.APP_BLOCKS_DIR, "blocks" );
  -        context.put( SarContextResources.APP_CONF_DIR, "conf" );
  -        context.put( SarContextResources.APP_LIB_DIR, "lib" );
           context.put( SarContextResources.APP_NAME, name );
           entry.setContext( context );
   
  @@ -223,16 +220,11 @@
           }
    
           final Deployer deployer = getBlockDeployer( entry );
  -        final String blockDirectory = 
  -            (String)entry.getContext().get( SarContextResources.APP_BLOCKS_DIR );
  -        final File blocksDirectory = new File( directory, blockDirectory );    
  +        final File blocksDirectory = new File( directory, "blocks" );    
           CamelotUtil.deployFromDirectory( deployer, blocksDirectory, ".bar" );
   
  -        final String confDirectory = 
  -            (String)entry.getContext().get( SarContextResources.APP_CONF_DIR );
  -
           final File file = 
  -            new File( directory, confDirectory + File.separator + "assembly.xml" );
  +            new File( directory, "conf" + File.separator + "assembly.xml" );
   
           try
           {
  
  
  
  1.2       +0 -4      jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/SarContextResources.java
  
  Index: SarContextResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/SarContextResources.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SarContextResources.java	2001/02/24 04:30:59	1.1
  +++ SarContextResources.java	2001/02/26 02:10:59	1.2
  @@ -16,8 +16,4 @@
   {
       String    APP_NAME          = "app.name";
       String    APP_HOME_DIR      = "app.home";
  -
  -    String    APP_BLOCKS_DIR    = "app.blocks";
  -    String    APP_LIB_DIR       = "app.lib";
  -    String    APP_CONF_DIR      = "app.conf";
   }
  
  
  
  1.2       +2 -6      jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilitys/SarClassLoader.java
  
  Index: SarClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilitys/SarClassLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SarClassLoader.java	2001/02/26 01:49:47	1.1
  +++ SarClassLoader.java	2001/02/26 02:11:00	1.2
  @@ -32,8 +32,6 @@
       implements Facility, Contextualizable, Composer, Initializable
   {
       protected File              m_baseDirectory;
  -    protected String            m_blocksDirectory;
  -    protected String            m_libDirectory;
   
       public SarClassLoader()
       {
  @@ -43,8 +41,6 @@
       public void contextualize( final Context context )
       {
           m_baseDirectory = (File)context.get( SarContextResources.APP_HOME_DIR );
  -        m_blocksDirectory = (String)context.get( SarContextResources.APP_BLOCKS_DIR );
  -        m_libDirectory = (String)context.get( SarContextResources.APP_LIB_DIR );
       }
   
       public void compose( final ComponentManager componentManager )
  @@ -57,9 +53,9 @@
           throws Exception
       {
           final File blockDir = 
  -            (new File( m_baseDirectory, m_blocksDirectory )).getAbsoluteFile();
  +            (new File( m_baseDirectory, "blocks" )).getAbsoluteFile();
           final File libDir = 
  -            (new File( m_baseDirectory, m_libDirectory )).getAbsoluteFile();
  +            (new File( m_baseDirectory, "lib" )).getAbsoluteFile();
           
           addURLs( blockDir, new String[] { ".bar" } );
           addURLs( libDir, new String[] { ".jar", ".zip" } );
  
  
  

Mime
View raw message