avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource AbstractLifestyleHandler.java DefaultComponentManager.java
Date Fri, 16 Aug 2002 04:55:52 GMT
mcconnell    2002/08/15 21:55:52

  Modified:    assembly/src/java/org/apache/excalibur/merlin/assembly
                        ContainerManager.java TypeManager.java
                        TypeRegistry.java
               assembly/src/java/org/apache/excalibur/merlin/resource
                        AbstractLifestyleHandler.java
                        DefaultComponentManager.java
  Log:
  General updates while validating Merlin as a container for the James mailserver
  
  Revision  Changes    Path
  1.21      +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ContainerManager.java	15 Aug 2002 04:14:49 -0000	1.20
  +++ ContainerManager.java	16 Aug 2002 04:55:51 -0000	1.21
  @@ -464,7 +464,7 @@
           // locally 
   
           logDependency( 
  -           getLogger(), "disassemble: ",  m_system.getShutdownGraph() 
  +           getLocalLogger(), "disassemble: ",  m_system.getShutdownGraph() 
           );
       }
   
  
  
  
  1.11      +17 -3     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java
  
  Index: TypeManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TypeManager.java	15 Aug 2002 04:14:49 -0000	1.10
  +++ TypeManager.java	16 Aug 2002 04:55:51 -0000	1.11
  @@ -296,6 +296,12 @@
                               {
                                   m_types.addBlock( path );
                               }
  +                            catch( ClassNotFoundException e )
  +                            {
  +                                final String warning = "Unresolved class: " + e.getMessage()

  +                                  + " in block: " + path ;
  +                                getLocalLogger().warn( warning );
  +                            }
                               catch( Throwable e )
                               {
                                   final String warning = "Bypassing type: " + path ;
  @@ -363,6 +369,13 @@
           {
               FilesetDescriptor descriptor = dirs[i];
               File base = new File( dir, descriptor.getBaseDirectory() );
  +            if( !base.exists() )
  +            {
  +                final String error = 
  +                  "Classpath base directory does not exist: " + base.getCanonicalPath();
  +                throw new TypeException( error );
  +            }
  +
               IncludeDescriptor[] includes = descriptor.getIncludeDescriptors();
               for( int j=0; j<includes.length; j++ )
               {
  @@ -419,9 +432,10 @@
               catch( Throwable error )
               {
                   getLocalLogger().warn(
  -                        "Encountered error while loading resource: " + file, error );
  +                    "Encountered error while loading resource: " + file, error );
                   errors.put( file, error );
               }
  +
           }
           if( stack.size() == 0 )
           {
  @@ -614,7 +628,7 @@
                   catch( final IOException ioe )
                   {
                       final String message = REZ.getString( "bad-classpath-entry", element
);
  -                    throw new Exception( message );
  +                    throw new TypeException( message + ": " + element, ioe );
                   }
               }
           }
  
  
  
  1.8       +1 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java
  
  Index: TypeRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TypeRegistry.java	15 Aug 2002 04:14:49 -0000	1.7
  +++ TypeRegistry.java	16 Aug 2002 04:55:51 -0000	1.8
  @@ -145,7 +145,6 @@
           return type;
       }
   
  -
       private void verify( Type type ) throws Exception
       {
           String name = type.getInfo().getName();
  
  
  
  1.6       +1 -0      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/AbstractLifestyleHandler.java
  
  Index: AbstractLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/AbstractLifestyleHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractLifestyleHandler.java	14 Aug 2002 10:46:29 -0000	1.5
  +++ AbstractLifestyleHandler.java	16 Aug 2002 04:55:51 -0000	1.6
  @@ -294,4 +294,5 @@
            m_helper = null;
            m_disposed = true;
        }
  +
   }
  
  
  
  1.2       +3 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultComponentManager.java
  
  Index: DefaultComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultComponentManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultComponentManager.java	12 Aug 2002 08:11:09 -0000	1.1
  +++ DefaultComponentManager.java	16 Aug 2002 04:55:51 -0000	1.2
  @@ -43,7 +43,9 @@
               {
                   return (Component)object;
               }
  -            throw new ComponentException( role, "Service provider returned a non-Component."
);
  +            final String error = "Service provider returned a non-Component: "
  +              + object.getClass();
  +            throw new ComponentException( role, error );
           }
           catch( ResourceException e )
           {
  
  
  

--
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