avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader Resources.properties
Date Thu, 20 Jun 2002 11:39:31 GMT
colus       2002/06/20 04:39:31

  Modified:    src/java/org/apache/avalon/phoenix/components/manager
                        AbstractSystemManager.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultKernel.java
               src/java/org/apache/avalon/phoenix/components/application
                        DefaultApplication.java
               src/java/org/apache/avalon/phoenix/components/embeddor
                        DefaultEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/classloader
                        Resources.properties
  Log:
  Fix typo. entrys -> entries.
  
  Revision  Changes    Path
  1.14      +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java
  
  Index: AbstractSystemManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractSystemManager.java	20 May 2002 15:19:31 -0000	1.13
  +++ AbstractSystemManager.java	20 Jun 2002 11:39:31 -0000	1.14
  @@ -30,7 +30,7 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( AbstractSystemManager.class );
   
  -    private HashMap m_entrys = new HashMap();
  +    private HashMap m_entries = new HashMap();
   
       /**
        * Register an object for management.
  @@ -64,7 +64,7 @@
               new ManagedEntry( object, interfaces );
           entry.setExportedObject( export( name, entry.getObject(), interfaces ) );
   
  -        m_entrys.put( name, entry );
  +        m_entries.put( name, entry );
       }
   
       /**
  @@ -85,7 +85,7 @@
           final ManagedEntry entry =
               new ManagedEntry( object, null );
           entry.setExportedObject( export( name, entry.getObject(), null ) );
  -        m_entrys.put( name, entry );
  +        m_entries.put( name, entry );
       }
   
       /**
  @@ -97,7 +97,7 @@
       public synchronized void unregister( final String name )
           throws ManagerException
       {
  -        final ManagedEntry entry = (ManagedEntry)m_entrys.remove( name );
  +        final ManagedEntry entry = (ManagedEntry)m_entries.remove( name );
   
           if( null == entry )
           {
  @@ -196,7 +196,7 @@
               throw new NullPointerException( "name" );
           }
   
  -        if( null != m_entrys.get( name ) )
  +        if( null != m_entries.get( name ) )
           {
               final String message = REZ.getString( "manager.error.register.exists", name
);
               throw new ManagerException( message );
  
  
  
  1.69      +6 -6      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- DefaultKernel.java	20 May 2002 11:43:56 -0000	1.68
  +++ DefaultKernel.java	20 Jun 2002 11:39:31 -0000	1.69
  @@ -58,7 +58,7 @@
       ///Configuration Repository
       private ConfigurationRepository m_repository;
   
  -    private HashMap m_entrys = new HashMap();
  +    private HashMap m_entries = new HashMap();
   
       public void service( final ServiceManager serviceManager )
           throws ServiceException
  @@ -80,7 +80,7 @@
           {
               try
               {
  -                final SarEntry entry = (SarEntry)m_entrys.get( names[ i ] );
  +                final SarEntry entry = (SarEntry)m_entries.get( names[ i ] );
                   shutdown( entry );
               }
               catch( final Exception e )
  @@ -93,12 +93,12 @@
   
       public String[] getApplicationNames()
       {
  -        return (String[])m_entrys.keySet().toArray( new String[ 0 ] );
  +        return (String[])m_entries.keySet().toArray( new String[ 0 ] );
       }
   
       public Application getApplication( final String name )
       {
  -        final SarEntry entry = (SarEntry)m_entrys.get( name );
  +        final SarEntry entry = (SarEntry)m_entries.get( name );
           if( null == entry )
           {
               return null;
  @@ -193,7 +193,7 @@
           final String name = metaData.getName();
           final SarEntry entry =
               new SarEntry( metaData, classLoader, hierarchy, server );
  -        m_entrys.put( name, entry );
  +        m_entries.put( name, entry );
   
           try
           {
  @@ -249,7 +249,7 @@
       public void removeApplication( String name )
           throws Exception
       {
  -        final SarEntry entry = (SarEntry)m_entrys.remove( name );
  +        final SarEntry entry = (SarEntry)m_entries.remove( name );
           if( null == entry )
           {
               final String message =
  
  
  
  1.30      +6 -6      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
  
  Index: DefaultApplication.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DefaultApplication.java	18 Jun 2002 05:21:04 -0000	1.29
  +++ DefaultApplication.java	20 Jun 2002 11:39:31 -0000	1.30
  @@ -51,7 +51,7 @@
       private boolean m_running = false;
   
       private ApplicationContext m_context;
  -    private HashMap m_entrys = new HashMap();
  +    private HashMap m_entries = new HashMap();
   
       /**
        * ResourceProvider for blocks.
  @@ -118,7 +118,7 @@
                   {
                       final String blockName = blocks[ i ].getName();
                       final BlockEntry blockEntry = new BlockEntry( blocks[ i ] );
  -                    m_entrys.put( blockName, blockEntry );
  +                    m_entries.put( blockName, blockEntry );
                   }
   
                   // load block listeners
  @@ -193,7 +193,7 @@
   
       public void dispose()
       {
  -        m_entrys.clear();
  +        m_entries.clear();
       }
   
       ////////////////////////////
  @@ -210,7 +210,7 @@
   
       public String[] getBlockNames()
       {
  -        return (String[])m_entrys.keySet().toArray( new String[ 0 ] );
  +        return (String[])m_entries.keySet().toArray( new String[ 0 ] );
       }
   
       /**
  @@ -221,7 +221,7 @@
        */
       public Object getBlock( final String name )
       {
  -        final BlockEntry entry = (BlockEntry)m_entrys.get( name );
  +        final BlockEntry entry = (BlockEntry)m_entries.get( name );
           if( null == entry )
           {
               return null;
  @@ -412,7 +412,7 @@
   
               try
               {
  -                final BlockEntry entry = (BlockEntry)m_entrys.get( block );
  +                final BlockEntry entry = (BlockEntry)m_entries.get( block );
                   if( PHASE_STARTUP == name )
                   {
                       startup( entry );
  
  
  
  1.70      +24 -24    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
  
  Index: DefaultEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- DefaultEmbeddor.java	20 Jun 2002 11:31:53 -0000	1.69
  +++ DefaultEmbeddor.java	20 Jun 2002 11:39:31 -0000	1.70
  @@ -69,7 +69,7 @@
   
       private String m_phoenixHome;
   
  -    private EmbeddorEntry[] m_entrys;
  +    private EmbeddorEntry[] m_entries;
   
       /**
        * If true, flag indicates that the Embeddor should continue running
  @@ -99,7 +99,7 @@
   
       /**
        * Pass the Context to the embeddor.
  -     * It is expected that the following will be entrys in context;
  +     * It is expected that the following will be entries in context;
        * <ul>
        *   <li><b>common.classloader</b>: ClassLoader shared betweeen
        *      container and applications</li>
  @@ -173,13 +173,13 @@
           throws ConfigurationException
       {
           final Configuration[] children = configuration.getChildren( "component" );
  -        m_entrys = new EmbeddorEntry[ children.length ];
  +        m_entries = new EmbeddorEntry[ children.length ];
           for( int i = 0; i < children.length; i++ )
           {
               final String role = children[ i ].getAttribute( "role" );
               final String classname = children[ i ].getAttribute( "class" );
               final String logger = children[ i ].getAttribute( "logger" );
  -            m_entrys[ i ] =
  +            m_entries[ i ] =
                   new EmbeddorEntry( role, classname, logger, children[ i ] );
           }
       }
  @@ -301,9 +301,9 @@
               final String message = REZ.getString( "embeddor.error.shutdown.failed" );
               getLogger().fatalError( message, e );
           }
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
  -            m_entrys[ i ].setObject( null );
  +            m_entries[ i ].setObject( null );
           }
           System.gc(); // make sure resources are released
       }
  @@ -418,12 +418,12 @@
       {
           try
           {
  -            for( int i = 0; i < m_entrys.length; i++ )
  +            for( int i = 0; i < m_entries.length; i++ )
               {
  -                final String className = m_entrys[ i ].getClassName();
  +                final String className = m_entries[ i ].getClassName();
                   final Class clazz = Class.forName( className );
                   final Object object = createObject( className, clazz );
  -                m_entrys[ i ].setObject( object );
  +                m_entries[ i ].setObject( object );
               }
           }
           catch( Exception e )
  @@ -497,9 +497,9 @@
       private void setupComponents()
           throws Exception
       {
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
  -            final EmbeddorEntry entry = m_entrys[ i ];
  +            final EmbeddorEntry entry = m_entries[ i ];
               setupComponent( entry.getObject(),
                               entry.getLoggerName(),
                               entry.getConfiguration() );
  @@ -539,10 +539,10 @@
       private void shutdownComponents()
           throws Exception
       {
  -        //for( int i = m_entrys.length - 1; i >= 0; i-- )
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        //for( int i = m_entries.length - 1; i >= 0; i-- )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
  -            final Object object = m_entrys[ i ].getObject();
  +            final Object object = m_entries[ i ].getObject();
               if( null == object )
               {
                   continue;
  @@ -607,14 +607,14 @@
           systemManager.register( ManagementRegistration.EMBEDDOR.getName(),
                                   this, ManagementRegistration.EMBEDDOR.getInterfaces() );
   
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
               final ManagementRegistration registration =
  -                ManagementRegistration.getManagementInfoForRole( m_entrys[ i ].getRole()
);
  +                ManagementRegistration.getManagementInfoForRole( m_entries[ i ].getRole()
);
               if ( null != registration )
               {
                   systemManager.register( registration.getName(),
  -                                        m_entrys[ i ].getObject(), registration.getInterfaces()
);
  +                                        m_entries[ i ].getObject(), registration.getInterfaces()
);
               }
           }
       }
  @@ -629,10 +629,10 @@
               (SystemManager)getServiceManager().lookup( SystemManager.ROLE );
           systemManager.unregister( ManagementRegistration.EMBEDDOR.getName() );
   
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
               final ManagementRegistration registration =
  -                ManagementRegistration.getManagementInfoForRole( m_entrys[ i ].getRole()
);
  +                ManagementRegistration.getManagementInfoForRole( m_entries[ i ].getRole()
);
               if ( null != registration )
               {
                   systemManager.unregister( registration.getName() );
  @@ -644,9 +644,9 @@
       {
           final DefaultServiceManager serviceManager = new DefaultServiceManager();
           serviceManager.put( Embeddor.ROLE, this );
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
  -            final String role = m_entrys[ i ].getRole();
  +            final String role = m_entries[ i ].getRole();
               final Object component = getEmbeddorComponent( role );
               serviceManager.put( role, component );
           }
  @@ -675,12 +675,12 @@
   
       private Object getEmbeddorComponent( final String role )
       {
  -        for( int i = 0; i < m_entrys.length; i++ )
  +        for( int i = 0; i < m_entries.length; i++ )
           {
  -            final EmbeddorEntry entry = m_entrys[ i ];
  +            final EmbeddorEntry entry = m_entries[ i ];
               if( entry.getRole().equals( role ) )
               {
  -                return m_entrys[ i ].getObject();
  +                return m_entries[ i ].getObject();
               }
           }
           // Should never happen
  
  
  
  1.10      +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/Resources.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Resources.properties	11 May 2002 06:30:56 -0000	1.9
  +++ Resources.properties	20 Jun 2002 11:39:31 -0000	1.10
  @@ -13,4 +13,4 @@
   available-extensions=The list of available extensions for application includes; {0}
   required-extensions=The list of required extensions for application includes; {0}
   optional-packages-added=The list of "Optional Packages" added to the application includes;
{0}
  -classpath-entries=The list of classpath entrys for the application includes; {0}
  \ No newline at end of file
  +classpath-entries=The list of classpath entries for the application includes; {0}
  \ No newline at end of file
  
  
  

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