avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util ContextManager.java
Date Fri, 07 Feb 2003 22:37:52 GMT
bloritsch    2003/02/07 14:37:52

  Modified:    fortress/examples build.xml
               fortress/src/java/org/apache/avalon/fortress/impl
                        DefaultContainer.java DefaultContainerManager.java
               fortress/src/java/org/apache/avalon/fortress/util
                        ContextManager.java
  Log:
  formatting changes
  
  Revision  Changes    Path
  1.15      +6 -6      avalon-excalibur/fortress/examples/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	28 Jan 2003 21:19:17 -0000	1.14
  +++ build.xml	7 Feb 2003 22:37:52 -0000	1.15
  @@ -62,8 +62,8 @@
               todir="${lib.dir}" preservelastmodified="yes"/>
   -->
           <!-- xml-apis -->
  -        <copy file="${xml-apis.jar}"
  -            todir="${lib.dir}" preservelastmodified="yes"/>
  +	<!--        <copy file="${xml-apis.jar}"
  +		todir="${lib.dir}" preservelastmodified="yes"/> -->
   
   		<copy file="${commons-collections.jar}"
   		    todir="${lib.dir}" preservelastmodified="yes"/>
  @@ -72,12 +72,12 @@
   		    todir="${lib.dir}" preservelastmodified="yes"/>
   
           <!-- Xerces jar -->
  -        <copy file="${xerces.jar}"
  -            todir="${lib.dir}" preservelastmodified="yes"/>
  +	<!--        <copy file="${xerces.jar}"
  +		todir="${lib.dir}" preservelastmodified="yes"/> -->
   
           <!-- Xalan jar -->
  -        <copy file="${xalan.jar}"
  -            todir="${lib.dir}" preservelastmodified="yes"/>
  +	<!--        <copy file="${xalan.jar}"
  +		todir="${lib.dir}" preservelastmodified="yes"/> -->
   
       </target>
   
  
  
  
  1.4       +2 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultContainer.java	7 Feb 2003 16:08:11 -0000	1.3
  +++ DefaultContainer.java	7 Feb 2003 22:37:52 -0000	1.4
  @@ -143,7 +143,7 @@
           }
           else
           {
  -            final org.apache.avalon.fortress.RoleEntry roleEntry = m_roleManager.getRoleForShortName(
config.getName() );
  +            final RoleEntry roleEntry = m_roleManager.getRoleForShortName( config.getName()
);
               if( null == roleEntry )
               {
                   final String message = "No class found matching configuration name " +
  
  
  
  1.3       +5 -4      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java
  
  Index: DefaultContainerManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultContainerManager.java	7 Feb 2003 16:08:11 -0000	1.2
  +++ DefaultContainerManager.java	7 Feb 2003 22:37:52 -0000	1.3
  @@ -64,6 +64,7 @@
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.excalibur.event.Queue;
   import org.apache.avalon.fortress.util.ContextManager;
  +import org.apache.avalon.fortress.RoleManager;
   import org.apache.excalibur.instrument.InstrumentManager;
   import org.apache.excalibur.mpool.PoolManager;
   
  @@ -230,8 +231,8 @@
           addService( LoggerManager.ROLE, managerContext, serviceManager );
           addService( PoolManager.ROLE, managerContext, serviceManager );
           addService( InstrumentManager.ROLE, managerContext, serviceManager );
  -        addService( org.apache.avalon.fortress.RoleManager.ROLE, managerContext, serviceManager
);
  -        addService( org.apache.avalon.fortress.impl.LifecycleExtensionManager.ROLE, managerContext,
serviceManager );
  +        addService( RoleManager.ROLE, managerContext, serviceManager );
  +        addService( LifecycleExtensionManager.ROLE, managerContext, serviceManager );
           serviceManager.makeReadOnly();
   
           return serviceManager;
  @@ -316,7 +317,7 @@
        */
       public final Logger getLogger()
       {
  -        // (mschier) was protected.  
  +        // (mschier) was protected.
           // Made public to get to the logger at the impl setup level.
           return m_logger;
       }
  
  
  
  1.3       +6 -3      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextManager.java	7 Feb 2003 16:08:12 -0000	1.2
  +++ ContextManager.java	7 Feb 2003 22:37:52 -0000	1.3
  @@ -268,6 +268,7 @@
                   }
                   catch( ContextException cex )
                   {
  +                    m_logger.debug("Could not initialize the Configuration", ce);
                       // Guess there is none.
                       return;
                   }
  @@ -293,7 +294,8 @@
               copyEntry( PARAMETERS );
           }
           catch( ContextException ce )
  -        {/* ignore this exception */
  +        {
  +            m_logger.debug("Could not initialize the Context", ce);
           }
       }
   
  @@ -535,7 +537,7 @@
       {
           try
           {
  -            m_childContext.put( org.apache.avalon.fortress.RoleManager.ROLE, m_rootContext.get(
org.apache.avalon.fortress.RoleManager.ROLE ) );
  +            m_childContext.put( RoleManager.ROLE, m_rootContext.get( RoleManager.ROLE )
);
               return;
           }
           catch( ContextException ce )
  @@ -557,6 +559,7 @@
               }
               catch( ContextException ce )
               {
  +                m_logger.debug("Could not initialize the RoleManager", ce);
                   // No RoleManager available anywhere.
                   roleConfig = EMPTY_CONFIG;
               }
  
  
  

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


Mime
View raw message