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/tools/xdoclet BlockInfoSubTask.java ManifestSubTask.java PhoenixXDoclet.java
Date Fri, 26 Jul 2002 09:49:23 GMT
donaldp     2002/07/26 02:49:23

  Modified:    src/java/org/apache/avalon/phoenix AbstractBlock.java
                        ApplicationEvent.java BlockContext.java
                        BlockEvent.java Constants.java
               src/java/org/apache/avalon/phoenix/components/application
                        BlockEntry.java BlockInvocationHandler.java
                        BlockResourceProvider.java DefaultApplication.java
                        DefaultBlockContext.java
               src/java/org/apache/avalon/phoenix/components/classloader
                        AbstractPolicy.java DefaultClassLoaderManager.java
                        DefaultPolicy.java PolicyEntry.java
                        PropertyUtil.java
               src/java/org/apache/avalon/phoenix/components/configuration
                        ConfigurationDirectoryFilter.java
                        ConfigurationFileFilter.java ConfigurationKey.java
                        FileSystemPersistentConfigurationRepository.java
               src/java/org/apache/avalon/phoenix/components/configuration/validator
                        DelegateEntry.java
                        DelegatingConfigurationValidator.java
                        JarvConfigurationValidator.java
                        NoopConfigurationValidator.java
               src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
               src/java/org/apache/avalon/phoenix/components/deployer/installer
                        FileDigest.java Installer.java
               src/java/org/apache/avalon/phoenix/components/embeddor
                        DefaultEmbeddor.java EmbeddorEntry.java
                        ManagementRegistration.java SingleAppEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/extensions
                        DefaultExtensionManager.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultApplicationContext.java DefaultKernel.java
                        SarEntry.java
               src/java/org/apache/avalon/phoenix/components/kernel/beanshell
                        BeanShellGUI.java BeanShellKernel.java
                        BeanShellKernelProxy.java
               src/java/org/apache/avalon/phoenix/components/logger
                        LogKitHierarchyLogger.java SimpleLogKitManager.java
               src/java/org/apache/avalon/phoenix/components/manager
                        AbstractJMXManager.java AbstractSystemManager.java
                        DefaultManager.java MX4JSystemManager.java
                        SubContext.java
               src/java/org/apache/avalon/phoenix/frontends CLIMain.java
                        CLISetup.java ComposableServlet.java
                        PhoenixServlet.java
               src/java/org/apache/avalon/phoenix/interfaces
                        ConfigurationValidator.java
                        ConfigurationValidatorMBean.java
               src/java/org/apache/avalon/phoenix/launcher
                        DaemonLauncher.java Main.java
               src/java/org/apache/avalon/phoenix/metadata
                        BlockListenerMetaData.java BlockMetaData.java
                        DependencyMetaData.java SarMetaData.java
               src/java/org/apache/avalon/phoenix/metainfo
                        BlockDescriptor.java BlockInfo.java
                        DependencyDescriptor.java ServiceDescriptor.java
               src/java/org/apache/avalon/phoenix/tools/configuration
                        DTDResolver.java
               src/java/org/apache/avalon/phoenix/tools/tasks Sar.java
               src/java/org/apache/avalon/phoenix/tools/verifier
                        SarVerifier.java
               src/java/org/apache/avalon/phoenix/tools/xdoclet
                        BlockInfoSubTask.java ManifestSubTask.java
                        PhoenixXDoclet.java
  Log:
  Restyled.
  
  Revision  Changes    Path
  1.9       +3 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/AbstractBlock.java
  
  Index: AbstractBlock.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/AbstractBlock.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractBlock.java	18 May 2002 09:51:35 -0000	1.8
  +++ AbstractBlock.java	26 Jul 2002 09:49:19 -0000	1.9
  @@ -32,7 +32,9 @@
       implements Block, Contextualizable, Composable, Configurable
   {
       private BlockContext m_context;
  +
       private Configuration m_configuration;
  +
       private ComponentManager m_componentManager;
   
       public void contextualize( final Context context )
  
  
  
  1.5       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/ApplicationEvent.java
  
  Index: ApplicationEvent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/ApplicationEvent.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApplicationEvent.java	10 May 2002 13:41:59 -0000	1.4
  +++ ApplicationEvent.java	26 Jul 2002 09:49:19 -0000	1.5
  @@ -21,6 +21,7 @@
       extends EventObject
   {
       private final String m_name;
  +
       private final SarMetaData m_sarMetaData;
   
       /**
  
  
  
  1.12      +2 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java
  
  Index: BlockContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BlockContext.java	15 May 2002 21:48:17 -0000	1.11
  +++ BlockContext.java	26 Jul 2002 09:49:19 -0000	1.12
  @@ -20,7 +20,9 @@
       extends Context
   {
       String APP_NAME = "app.name";
  +
       String APP_HOME_DIR = "app.home";
  +
       String NAME = "block.name";
   
       /**
  
  
  
  1.7       +2 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockEvent.java
  
  Index: BlockEvent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockEvent.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BlockEvent.java	14 May 2002 12:19:09 -0000	1.6
  +++ BlockEvent.java	26 Jul 2002 09:49:19 -0000	1.7
  @@ -21,7 +21,9 @@
       extends EventObject
   {
       private final String m_name;
  +
       private final Object m_block;
  +
       private final BlockInfo m_blockInfo;
   
       /**
  
  
  
  1.6       +2 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/Constants.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Constants.java	16 Mar 2002 00:11:54 -0000	1.5
  +++ Constants.java	26 Jul 2002 09:49:19 -0000	1.6
  @@ -15,6 +15,8 @@
   public interface Constants
   {
       String SOFTWARE = "@@NAME@@";
  +
       String VERSION = "@@VERSION@@";
  +
       String DATE = "@@DATE@@";
   }
  
  
  
  1.18      +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
  
  Index: BlockEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- BlockEntry.java	15 Jul 2002 16:17:46 -0000	1.17
  +++ BlockEntry.java	26 Jul 2002 09:49:20 -0000	1.18
  @@ -21,6 +21,7 @@
       private Object m_object;
   
       private BlockMetaData m_blockMetaData;
  +
       private BlockInvocationHandler m_invocationHandler;
   
       public BlockEntry( final BlockMetaData blockMetaData )
  
  
  
  1.7       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockInvocationHandler.java
  
  Index: BlockInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockInvocationHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BlockInvocationHandler.java	15 Jul 2002 16:17:46 -0000	1.6
  +++ BlockInvocationHandler.java	26 Jul 2002 09:49:20 -0000	1.7
  @@ -33,6 +33,7 @@
       implements InvocationHandler
   {
       private transient Object m_object;
  +
       private transient Object m_proxy;
   
       /**
  
  
  
  1.3       +3 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
  
  Index: BlockResourceProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BlockResourceProvider.java	14 Jul 2002 02:27:16 -0000	1.2
  +++ BlockResourceProvider.java	26 Jul 2002 09:49:20 -0000	1.3
  @@ -52,7 +52,7 @@
       private final Application m_application;
   
       public BlockResourceProvider( final ApplicationContext context,
  -                          final Application application )
  +                                  final Application application )
       {
           if( null == context )
           {
  @@ -219,6 +219,6 @@
        */
       private BlockMetaData getMetaDataFor( final Object entry )
       {
  -        return ( (BlockEntry)entry ).getMetaData();
  +        return ((BlockEntry)entry).getMetaData();
       }
   }
  
  
  
  1.31      +2 -0      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- DefaultApplication.java	20 Jun 2002 11:39:31 -0000	1.30
  +++ DefaultApplication.java	26 Jul 2002 09:49:20 -0000	1.31
  @@ -46,11 +46,13 @@
           ResourceManager.getPackageResources( DefaultApplication.class );
   
       private static final String PHASE_STARTUP = "startup";
  +
       private static final String PHASE_SHUTDOWN = "shutdown";
   
       private boolean m_running = false;
   
       private ApplicationContext m_context;
  +
       private HashMap m_entries = new HashMap();
   
       /**
  
  
  
  1.16      +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java
  
  Index: DefaultBlockContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultBlockContext.java	14 Jul 2002 02:27:16 -0000	1.15
  +++ DefaultBlockContext.java	26 Jul 2002 09:49:20 -0000	1.16
  @@ -23,6 +23,7 @@
       implements BlockContext
   {
       private String m_name;
  +
       private ApplicationContext m_applicationContext;
   
       protected DefaultBlockContext( final String name, final ApplicationContext frame )
  
  
  
  1.10      +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/AbstractPolicy.java
  
  Index: AbstractPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/AbstractPolicy.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractPolicy.java	20 May 2002 11:44:19 -0000	1.9
  +++ AbstractPolicy.java	26 Jul 2002 09:49:20 -0000	1.10
  @@ -32,6 +32,7 @@
       implements LogEnabled
   {
       private final ArrayList m_entries = new ArrayList();
  +
       private Logger m_logger;
   
       public void enableLogging( final Logger logger )
  
  
  
  1.38      +3 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
  
  Index: DefaultClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- DefaultClassLoaderManager.java	19 Jul 2002 01:11:13 -0000	1.37
  +++ DefaultClassLoaderManager.java	26 Jul 2002 09:49:20 -0000	1.38
  @@ -16,11 +16,11 @@
   import java.util.Arrays;
   import java.util.jar.Manifest;
   import org.apache.avalon.excalibur.extension.Extension;
  -import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
  -import org.apache.avalon.excalibur.packagemanager.PackageManager;
  -import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
  +import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
  +import org.apache.avalon.excalibur.packagemanager.PackageManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
  
  
  
  1.10      +6 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultPolicy.java
  
  Index: DefaultPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultPolicy.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultPolicy.java	15 Jul 2002 16:17:23 -0000	1.9
  +++ DefaultPolicy.java	26 Jul 2002 09:49:20 -0000	1.10
  @@ -42,12 +42,17 @@
           ResourceManager.getPackageResources( DefaultPolicy.class );
   
       private static final String SAR_PROTOCOL = "sar:";
  +
       private static final String SAR_INF = SAR_PROTOCOL + "SAR-INF/";
  +
       private static final String CLASSES = SAR_INF + "classes";
  +
       private static final String LIB = SAR_INF + "lib";
   
       private final File m_baseDirectory;
  +
       private final File m_workDirectory;
  +
       private DefaultContext m_context;
   
       protected DefaultPolicy( final File baseDirectory,
  @@ -397,7 +402,7 @@
   
           while( tokenizer.hasMoreTokens() )
           {
  -            final String alias = ( (String)tokenizer.nextToken() ).trim();
  +            final String alias = ((String)tokenizer.nextToken()).trim();
               Certificate certificate = null;
   
               try
  
  
  
  1.2       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PolicyEntry.java
  
  Index: PolicyEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PolicyEntry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PolicyEntry.java	20 May 2002 10:23:04 -0000	1.1
  +++ PolicyEntry.java	26 Jul 2002 09:49:20 -0000	1.2
  @@ -16,6 +16,7 @@
   final class PolicyEntry
   {
       private final CodeSource m_codeSource;
  +
       private final Permissions m_permissions;
   
       public PolicyEntry( final CodeSource codeSource,
  
  
  
  1.4       +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PropertyUtil.java
  
  Index: PropertyUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PropertyUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyUtil.java	15 Jul 2002 16:17:23 -0000	1.3
  +++ PropertyUtil.java	26 Jul 2002 09:49:20 -0000	1.4
  @@ -49,7 +49,7 @@
   
           final int length = property.length();
   
  -        if( 0 == start && end == ( length - 1 ) )
  +        if( 0 == start && end == (length - 1) )
           {
               return resolveValue( property.substring( start + 2, end ),
                                    context,
  @@ -110,7 +110,7 @@
   
           final int length = property.length();
   
  -        if( 0 == start && end == ( length - 1 ) )
  +        if( 0 == start && end == (length - 1) )
           {
               final String propertyName = property.substring( start + 2, end );
               final Object key = recursiveResolveProperty( propertyName, context, ignoreUndefined );
  @@ -172,7 +172,7 @@
           final int start = currentPosition + 2;
   
           int weight = 1;
  -        for( int i = start; ( weight > 0 ) && ( i < length ); i++ )
  +        for( int i = start; (weight > 0) && (i < length); i++ )
           {
               final char ch = property.charAt( i );
               switch( ch )
  @@ -233,7 +233,7 @@
           {
               while( null != value && value instanceof Resolvable )
               {
  -                value = ( (Resolvable)value ).resolve( context );
  +                value = ((Resolvable)value).resolve( context );
               }
           }
           catch( final ContextException ce )
  
  
  
  1.2       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/ConfigurationDirectoryFilter.java
  
  Index: ConfigurationDirectoryFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/ConfigurationDirectoryFilter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurationDirectoryFilter.java	16 Jul 2002 18:09:00 -0000	1.1
  +++ ConfigurationDirectoryFilter.java	26 Jul 2002 09:49:20 -0000	1.2
  @@ -7,8 +7,8 @@
    */
   package org.apache.avalon.phoenix.components.configuration;
   
  -import java.io.FileFilter;
   import java.io.File;
  +import java.io.FileFilter;
   
   class ConfigurationDirectoryFilter implements FileFilter
   {
  
  
  
  1.2       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/ConfigurationFileFilter.java
  
  Index: ConfigurationFileFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/ConfigurationFileFilter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurationFileFilter.java	16 Jul 2002 18:09:00 -0000	1.1
  +++ ConfigurationFileFilter.java	26 Jul 2002 09:49:20 -0000	1.2
  @@ -7,8 +7,8 @@
    */
   package org.apache.avalon.phoenix.components.configuration;
   
  -import java.io.FileFilter;
   import java.io.File;
  +import java.io.FileFilter;
   
   class ConfigurationFileFilter implements FileFilter
   {
  
  
  
  1.2       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/ConfigurationKey.java
  
  Index: ConfigurationKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/ConfigurationKey.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurationKey.java	16 Jul 2002 18:09:00 -0000	1.1
  +++ ConfigurationKey.java	26 Jul 2002 09:49:20 -0000	1.2
  @@ -10,6 +10,7 @@
   final class ConfigurationKey
   {
       private final String m_application;
  +
       private final String m_block;
   
       public ConfigurationKey( String application, String block )
  @@ -27,7 +28,7 @@
       {
           if( obj instanceof ConfigurationKey )
           {
  -            final ConfigurationKey key = ( ConfigurationKey ) obj;
  +            final ConfigurationKey key = (ConfigurationKey)obj;
   
               return this.getApplication().equals( key.getApplication() )
                   && this.getBlock().equals( key.getBlock() );
  
  
  
  1.7       +14 -14    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
  
  Index: FileSystemPersistentConfigurationRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FileSystemPersistentConfigurationRepository.java	24 Jul 2002 20:20:52 -0000	1.6
  +++ FileSystemPersistentConfigurationRepository.java	26 Jul 2002 09:49:20 -0000	1.7
  @@ -12,9 +12,6 @@
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  -
  -import org.xml.sax.SAXException;
  -
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.excalibur.io.FileUtil;
  @@ -39,6 +36,7 @@
   import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
   import org.apache.avalon.phoenix.interfaces.SystemManager;
   import org.apache.excalibur.configuration.merged.ConfigurationMerger;
  +import org.xml.sax.SAXException;
   
   /**
    * Repository which persistently stores configuration information on disk
  @@ -55,9 +53,11 @@
           ResourceManager.getPackageResources( FileSystemPersistentConfigurationRepository.class );
   
       private final HashMap m_persistedConfigurations = new HashMap();
  +
       private final HashMap m_configurations = new HashMap();
   
       private ServiceManager m_serviceManager;
  +
       private String m_phoenixHome;
   
       private File m_storageDirectory;
  @@ -122,7 +122,7 @@
   
               if( opath instanceof String )
               {
  -                return FileUtil.normalize( ( String ) opath );
  +                return FileUtil.normalize( (String)opath );
               }
               else
               {
  @@ -144,7 +144,7 @@
       public void initialize() throws Exception
       {
           final SystemManager systemManager =
  -            ( SystemManager ) this.m_serviceManager.lookup( SystemManager.ROLE );
  +            (SystemManager)this.m_serviceManager.lookup( SystemManager.ROLE );
           final SystemManager context =
               systemManager.getSubContext( null, "component" ).getSubContext( "ConfigurationManager",
                                                                               "subcomponent" );
  @@ -174,7 +174,7 @@
   
           for( int i = 0; i < apps.length; i++ )
           {
  -            loadConfigurations( apps[i] );
  +            loadConfigurations( apps[ i ] );
           }
       }
   
  @@ -188,10 +188,10 @@
           for( int i = 0; i < blocks.length; i++ )
           {
               final String block =
  -                blocks[i].getName().substring( 0, blocks[i].getName().indexOf( ".xml" ) );
  +                blocks[ i ].getName().substring( 0, blocks[ i ].getName().indexOf( ".xml" ) );
   
               this.m_persistedConfigurations.put( new ConfigurationKey( app, block ),
  -                                                builder.buildFromFile( blocks[i] ) );
  +                                                builder.buildFromFile( blocks[ i ] ) );
   
               if( getLogger().isDebugEnabled() )
                   getLogger().debug( "Loaded persistent configuration [app: " + app
  @@ -204,12 +204,12 @@
       {
           for( Iterator i = this.m_persistedConfigurations.entrySet().iterator(); i.hasNext(); )
           {
  -            final Map.Entry entry = ( Map.Entry ) i.next();
  -            final ConfigurationKey key = ( ConfigurationKey ) entry.getKey();
  +            final Map.Entry entry = (Map.Entry)i.next();
  +            final ConfigurationKey key = (ConfigurationKey)entry.getKey();
   
               persistConfiguration( key.getApplication(),
                                     key.getBlock(),
  -                                  ( Configuration ) entry.getValue() );
  +                                  (Configuration)entry.getValue() );
           }
       }
   
  @@ -260,8 +260,8 @@
           throws ConfigurationException
       {
           final String name = application + "." + block;
  -        final Configuration c = ( Configuration ) m_configurations.get( name );
  -        final Configuration p = ( Configuration ) m_persistedConfigurations.get(
  +        final Configuration c = (Configuration)m_configurations.get( name );
  +        final Configuration p = (Configuration)m_persistedConfigurations.get(
               new ConfigurationKey( application, block ) );
   
           if( null == c && p == null )
  @@ -286,7 +286,7 @@
       public Configuration getPersistentConfiguration( String application, String block )
           throws ConfigurationException
       {
  -        final Configuration configuration = ( Configuration ) m_persistedConfigurations.get(
  +        final Configuration configuration = (Configuration)m_persistedConfigurations.get(
               new ConfigurationKey( application, block ) );
   
           if( null == configuration )
  
  
  
  1.2       +2 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/DelegateEntry.java
  
  Index: DelegateEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/DelegateEntry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DelegateEntry.java	15 Jul 2002 16:18:31 -0000	1.1
  +++ DelegateEntry.java	26 Jul 2002 09:49:20 -0000	1.2
  @@ -18,7 +18,9 @@
   class DelegateEntry
   {
       private final String m_schemaType;
  +
       private final String m_className;
  +
       private final Configuration m_configuration;
   
       private ConfigurationValidator m_validator;
  
  
  
  1.4       +20 -19    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/DelegatingConfigurationValidator.java
  
  Index: DelegatingConfigurationValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/DelegatingConfigurationValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DelegatingConfigurationValidator.java	19 Jul 2002 21:00:30 -0000	1.3
  +++ DelegatingConfigurationValidator.java	26 Jul 2002 09:49:20 -0000	1.4
  @@ -11,7 +11,8 @@
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  -
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -21,8 +22,6 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
   import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
   
   /**
    * Default ConfigurationValidator implementation that allows schemas to be plugged-in
  @@ -37,7 +36,9 @@
           ResourceManager.getPackageResources( DelegatingConfigurationValidator.class );
   
       private Map m_blockTypeMap = Collections.synchronizedMap( new HashMap() );
  +
       private Map m_delegates = new HashMap();
  +
       private String m_supportedTypes;
   
       public void configure( Configuration configuration )
  @@ -48,12 +49,12 @@
   
           for( int i = 0; i < delegates.length; i++ )
           {
  -            final String type = delegates[i].getAttribute( "schema-type" );
  +            final String type = delegates[ i ].getAttribute( "schema-type" );
   
               this.m_delegates.put( type,
                                     new DelegateEntry( type,
  -                                                     delegates[i].getAttribute( "class" ),
  -                                                     delegates[i] )
  +                                                     delegates[ i ].getAttribute( "class" ),
  +                                                     delegates[ i ] )
               );
   
               if( i > 0 )
  @@ -72,9 +73,9 @@
       {
           for( Iterator i = m_delegates.values().iterator(); i.hasNext(); )
           {
  -            final DelegateEntry entry = ( DelegateEntry ) i.next();
  +            final DelegateEntry entry = (DelegateEntry)i.next();
               final Class clazz = Class.forName( entry.getClassName() );
  -            final ConfigurationValidator validator = ( ConfigurationValidator ) clazz.newInstance();
  +            final ConfigurationValidator validator = (ConfigurationValidator)clazz.newInstance();
   
               ContainerUtil.enableLogging( validator, getLogger() );
               ContainerUtil.configure( validator, entry.getConfiguration() );
  @@ -88,14 +89,14 @@
       {
           for( Iterator i = m_delegates.values().iterator(); i.hasNext(); )
           {
  -            ContainerUtil.dispose( ( ( DelegateEntry ) i.next() ).getValidator() );
  +            ContainerUtil.dispose( ((DelegateEntry)i.next()).getValidator() );
           }
       }
   
       public void addSchema( String application, String block, String schemaType, String url )
           throws ConfigurationException
       {
  -        final DelegateEntry entry = ( DelegateEntry ) this.m_delegates.get( schemaType );
  +        final DelegateEntry entry = (DelegateEntry)this.m_delegates.get( schemaType );
   
           if( entry == null )
           {
  @@ -128,11 +129,11 @@
   
       public void removeSchema( String application, String block )
       {
  -        final String type = ( String ) m_blockTypeMap.get( createKey( application, block ) );
  +        final String type = (String)m_blockTypeMap.get( createKey( application, block ) );
   
           if( null != type )
           {
  -            final DelegateEntry entry = ( DelegateEntry ) m_delegates.get( type );
  +            final DelegateEntry entry = (DelegateEntry)m_delegates.get( type );
   
               entry.getValidator().removeSchema( application, block );
           }
  @@ -141,7 +142,7 @@
       private ConfigurationValidator getDelegate( String application, String block )
           throws ConfigurationException
       {
  -        final String type = ( String ) this.m_blockTypeMap.get( createKey( application, block ) );
  +        final String type = (String)this.m_blockTypeMap.get( createKey( application, block ) );
   
           if( null == type )
           {
  @@ -150,7 +151,7 @@
               throw new ConfigurationException( msg );
           }
   
  -        return ( ( DelegateEntry ) this.m_delegates.get( type ) ).getValidator();
  +        return ((DelegateEntry)this.m_delegates.get( type )).getValidator();
       }
   
       private String createKey( String application, String block )
  @@ -160,17 +161,17 @@
   
       public String getSchema( String application, String block )
       {
  -        final String type = ( String ) m_blockTypeMap.get( createKey( application, block ) );
  +        final String type = (String)m_blockTypeMap.get( createKey( application, block ) );
   
           if( null != type )
           {
  -            final DelegateEntry entry = ( DelegateEntry ) m_delegates.get( type );
  +            final DelegateEntry entry = (DelegateEntry)m_delegates.get( type );
               final ConfigurationValidator validator = entry.getValidator();
   
               if( validator instanceof ConfigurationValidatorMBean )
               {
  -                return ( ( ConfigurationValidatorMBean ) validator ).getSchema( application,
  -                                                                                block );
  +                return ((ConfigurationValidatorMBean)validator).getSchema( application,
  +                                                                           block );
   
               }
           }
  @@ -180,6 +181,6 @@
   
       public String getSchemaType( String application, String block )
       {
  -        return ( String ) this.m_blockTypeMap.get( createKey( application, block ) );
  +        return (String)this.m_blockTypeMap.get( createKey( application, block ) );
       }
   }
  
  
  
  1.6       +13 -11    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/JarvConfigurationValidator.java
  
  Index: JarvConfigurationValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/JarvConfigurationValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JarvConfigurationValidator.java	23 Jul 2002 20:50:46 -0000	1.5
  +++ JarvConfigurationValidator.java	26 Jul 2002 09:49:20 -0000	1.6
  @@ -13,11 +13,6 @@
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.Map;
  -
  -import org.xml.sax.ErrorHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.SAXParseException;
  -
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.excalibur.io.FileUtil;
  @@ -31,12 +26,14 @@
   import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
   import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
   import org.apache.excalibur.configuration.ConfigurationUtil;
  -
   import org.iso_relax.verifier.Schema;
   import org.iso_relax.verifier.Verifier;
   import org.iso_relax.verifier.VerifierConfigurationException;
   import org.iso_relax.verifier.VerifierFactory;
   import org.iso_relax.verifier.VerifierHandler;
  +import org.xml.sax.ErrorHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.SAXParseException;
   
   /**
    * A validator that is capable of validating any schema supported by the JARV
  @@ -51,15 +48,20 @@
           ResourceManager.getPackageResources( JarvConfigurationValidator.class );
   
       private String m_schemaType;
  +
       private String m_schemaLanguage;
  +
       private String m_verifierFactoryClass;
  +
       private String m_debugPath;
   
       private final DefaultConfigurationSerializer m_serializer =
           new DefaultConfigurationSerializer();
   
       private final Map m_schemaURLs = Collections.synchronizedMap( new HashMap() );
  +
       private final Map m_schemas = Collections.synchronizedMap( new HashMap() );
  +
       private VerifierFactory m_verifierFactory;
   
       /**
  @@ -82,8 +84,8 @@
           this.m_verifierFactoryClass =
               configuration.getChild( "verifier-factory-class" ).getValue( null );
   
  -        if( ( null == this.m_schemaLanguage && null == this.m_verifierFactoryClass )
  -            || ( null != this.m_schemaLanguage && null != this.m_verifierFactoryClass ) )
  +        if( (null == this.m_schemaLanguage && null == this.m_verifierFactoryClass)
  +            || (null != this.m_schemaLanguage && null != this.m_verifierFactoryClass) )
           {
               throw new ConfigurationException( REZ.getString( "jarv.error.badconfig" ) );
           }
  @@ -99,7 +101,7 @@
           else if( null != this.m_verifierFactoryClass )
           {
               this.m_verifierFactory =
  -                ( VerifierFactory ) Class.forName( this.m_verifierFactoryClass ).newInstance();
  +                (VerifierFactory)Class.forName( this.m_verifierFactoryClass ).newInstance();
           }
   
           if( null != this.m_debugPath )
  @@ -172,7 +174,7 @@
                               final Configuration configuration )
           throws ConfigurationException
       {
  -        final Schema schema = ( Schema ) this.m_schemas.get( createKey( application, block ) );
  +        final Schema schema = (Schema)this.m_schemas.get( createKey( application, block ) );
           final Configuration branched = ConfigurationUtil.branch( configuration, "root" );
   
           if( null == schema )
  @@ -285,7 +287,7 @@
       public String getSchema( String application, String block )
       {
           final String key = createKey( application, block );
  -        final String url = ( String ) this.m_schemaURLs.get( key );
  +        final String url = (String)this.m_schemaURLs.get( key );
   
           if( null != url )
           {
  
  
  
  1.4       +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/NoopConfigurationValidator.java
  
  Index: NoopConfigurationValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/NoopConfigurationValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NoopConfigurationValidator.java	19 Jul 2002 21:00:30 -0000	1.3
  +++ NoopConfigurationValidator.java	26 Jul 2002 09:49:20 -0000	1.4
  @@ -7,10 +7,10 @@
    */
   package org.apache.avalon.phoenix.components.configuration.validator;
   
  -import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
  -import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
  +import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
   
   /**
    * A ConfigurationValidator that always says everything is okay
  @@ -21,7 +21,7 @@
       implements ConfigurationValidator, ConfigurationValidatorMBean
   {
       public void addSchema( String application, String block, String schemaType, String url )
  -      throws ConfigurationException
  +        throws ConfigurationException
       {
       }
   
  @@ -30,13 +30,13 @@
       }
   
       public boolean isValid( String application, String block, Configuration configuration )
  -      throws ConfigurationException
  +        throws ConfigurationException
       {
           return true;
       }
   
       public boolean isFeasiblyValid( String application, String block, Configuration configuration )
  -      throws ConfigurationException
  +        throws ConfigurationException
       {
           return true;
       }
  
  
  
  1.47      +14 -7     jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- DefaultDeployer.java	14 Jul 2002 05:40:43 -0000	1.46
  +++ DefaultDeployer.java	26 Jul 2002 09:49:20 -0000	1.47
  @@ -43,12 +43,12 @@
   import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
   import org.apache.avalon.phoenix.metadata.BlockMetaData;
   import org.apache.avalon.phoenix.metadata.SarMetaData;
  +import org.apache.avalon.phoenix.metainfo.BlockDescriptor;
   import org.apache.avalon.phoenix.tools.assembler.Assembler;
   import org.apache.avalon.phoenix.tools.assembler.AssemblyException;
   import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
   import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
   import org.apache.excalibur.containerkit.verifier.VerifyException;
  -import org.apache.avalon.phoenix.metainfo.BlockDescriptor;
   
   /**
    * Deploy .sar files into a kernel using this class.
  @@ -63,14 +63,21 @@
           ResourceManager.getPackageResources( DefaultDeployer.class );
   
       private final Assembler m_assembler = new Assembler();
  +
       private final SarVerifier m_verifier = new SarVerifier();
  +
       private final Installer m_installer = new Installer();
  +
       private final Map m_installations = new Hashtable();
   
       private LogManager m_logManager;
  +
       private Kernel m_kernel;
  +
       private ConfigurationRepository m_repository;
  +
       private ClassLoaderManager m_classLoaderManager;
  +
       private ConfigurationValidator m_validator;
   
       /**
  @@ -362,7 +369,7 @@
        * @throws DeploymentException upon invalid schema
        */
       private void storeConfigurationSchemas( final SarMetaData metaData, ClassLoader classLoader )
  -      throws DeploymentException
  +        throws DeploymentException
       {
           final BlockMetaData[] blocks = metaData.getBlocks();
           int i = 0;
  @@ -371,8 +378,8 @@
           {
               for( i = 0; i < blocks.length; i++ )
               {
  -                final String name = blocks[i].getName();
  -                final BlockDescriptor descriptor = blocks[i].getBlockInfo().getBlockDescriptor();
  +                final String name = blocks[ i ].getName();
  +                final BlockDescriptor descriptor = blocks[ i ].getBlockInfo().getBlockDescriptor();
                   final String type = descriptor.getSchemaType();
   
                   if( null != type )
  @@ -391,13 +398,13 @@
           {
               //uh-oh, bad schema bad bad!
               final String message = REZ.getString( "deploy.error.config.schema.invalid",
  -                                                  blocks[i].getName() );
  +                                                  blocks[ i ].getName() );
   
               //back out any schemas that we have already stored for this app
               while( --i >= 0 )
               {
                   m_validator.removeSchema( metaData.getName(),
  -                                          blocks[i].getName() );
  +                                          blocks[ i ].getName() );
               }
   
               throw new DeploymentException( message, e );
  @@ -407,7 +414,7 @@
       private String getConfigurationSchemaURL( final String name,
                                                 final String classname,
                                                 final ClassLoader classLoader )
  -      throws DeploymentException
  +        throws DeploymentException
       {
           final String resourceName = classname.replace( '.', '/' ) + "-schema.xml";
   
  
  
  
  1.2       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/FileDigest.java
  
  Index: FileDigest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/FileDigest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileDigest.java	11 May 2002 02:05:13 -0000	1.1
  +++ FileDigest.java	26 Jul 2002 09:49:20 -0000	1.2
  @@ -11,6 +11,7 @@
   public class FileDigest
   {
       private final File m_file;
  +
       private final long m_checksum;
   
       /** Create a new FileDigest object.
  
  
  
  1.12      +7 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java
  
  Index: Installer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Installer.java	15 Jul 2002 16:17:23 -0000	1.11
  +++ Installer.java	26 Jul 2002 09:49:20 -0000	1.12
  @@ -42,14 +42,20 @@
           ResourceManager.getPackageResources( Installer.class );
   
       private static final String META_INF = "META-INF";
  +
       private static final String SAR_INF = "SAR-INF";
  +
       private static final String LIB = "SAR-INF/lib";
  +
       private static final String CLASSES = "SAR-INF/classes/";
   
       //The names on the native filesystem
       private static final String FS_CONFIG_XML = "SAR-INF" + File.separator + "config.xml";
  +
       private static final String FS_ASSEMBLY_XML = "SAR-INF" + File.separator + "assembly.xml";
  +
       private static final String FS_ENV_XML = "SAR-INF" + File.separator + "environment.xml";
  +
       private static final String FS_CLASSES =
           "SAR-INF" + File.separator + "classes" + File.separator;
   
  
  
  
  1.74      +3 -2      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.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- DefaultEmbeddor.java	15 Jul 2002 16:16:50 -0000	1.73
  +++ DefaultEmbeddor.java	26 Jul 2002 09:49:21 -0000	1.74
  @@ -57,6 +57,7 @@
       private static final String DEFAULT_APPS_PATH = "/apps";
   
       private EmbeddorObservable m_observable = new EmbeddorObservable();
  +
       private Parameters m_parameters;
   
       /**
  @@ -238,7 +239,7 @@
               {
                   // wait() for shutdown() to take action...
                   if( m_shutdown
  -                    || ( emptyKernel() && !m_persistent ) )
  +                    || (emptyKernel() && !m_persistent) )
                   {
                       // The server will shut itself down when all applications are disposed.
                       if( emptyKernel() )
  @@ -260,7 +261,7 @@
           if( null != kernel )
           {
               final String[] names = kernel.getApplicationNames();
  -            return ( 0 == names.length );
  +            return (0 == names.length);
           }
           else
           {
  
  
  
  1.3       +4 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/EmbeddorEntry.java
  
  Index: EmbeddorEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/EmbeddorEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EmbeddorEntry.java	10 May 2002 11:24:48 -0000	1.2
  +++ EmbeddorEntry.java	26 Jul 2002 09:49:21 -0000	1.3
  @@ -15,9 +15,13 @@
   public class EmbeddorEntry
   {
       private final String m_role;
  +
       private final String m_classname;
  +
       private final String m_loggerName;
  +
       private final Configuration m_configuration;
  +
       private Object m_object;
   
       public EmbeddorEntry( final String role,
  
  
  
  1.6       +9 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/ManagementRegistration.java
  
  Index: ManagementRegistration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/ManagementRegistration.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ManagementRegistration.java	24 Jul 2002 20:33:08 -0000	1.5
  +++ ManagementRegistration.java	26 Jul 2002 09:49:21 -0000	1.6
  @@ -11,6 +11,8 @@
   import java.util.Map;
   import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
   import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
  +import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
  +import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
   import org.apache.avalon.phoenix.interfaces.Deployer;
   import org.apache.avalon.phoenix.interfaces.DeployerMBean;
   import org.apache.avalon.phoenix.interfaces.Embeddor;
  @@ -19,8 +21,6 @@
   import org.apache.avalon.phoenix.interfaces.Kernel;
   import org.apache.avalon.phoenix.interfaces.KernelMBean;
   import org.apache.avalon.phoenix.interfaces.LogManager;
  -import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
  -import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
   
   /**
    *
  @@ -34,16 +34,21 @@
           new ManagementRegistration( Kernel.ROLE,
                                       "Kernel",
                                       new Class[]{KernelMBean.class} );
  +
       public static final ManagementRegistration EXTENSION_MANAGER =
           new ManagementRegistration( ExtensionManager.ROLE,
                                       "ExtensionManager",
                                       new Class[]{ExtensionManagerMBean.class} );
  +
       public static final ManagementRegistration EMBEDDOR =
           new ManagementRegistration( Embeddor.ROLE, "Embeddor", new Class[]{EmbeddorMBean.class} );
  +
       public static final ManagementRegistration DEPLOYER =
           new ManagementRegistration( Deployer.ROLE, "Deployer", new Class[]{DeployerMBean.class} );
  +
       public static final ManagementRegistration LOG_MANAGER =
           new ManagementRegistration( LogManager.ROLE, "LogManager", new Class[]{} );
  +
       public static final ManagementRegistration CONFIGURATION_REPOSITORY =
           new ManagementRegistration( ConfigurationRepository.ROLE,
                                       "ConfigurationManager",
  @@ -56,7 +61,9 @@
       //TODO: Need information for SystemManager?
   
       private String m_role;
  +
       private String m_name;
  +
       private Class[] m_interfaces;
   
       private ManagementRegistration( final String role, final String name, final Class[] interfaces )
  
  
  
  1.24      +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java
  
  Index: SingleAppEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- SingleAppEmbeddor.java	20 Jun 2002 06:16:46 -0000	1.23
  +++ SingleAppEmbeddor.java	26 Jul 2002 09:49:21 -0000	1.24
  @@ -77,7 +77,7 @@
   
       public boolean hasComponent( final String role )
       {
  -        return ( null != m_application.getBlock( role ) );
  +        return (null != m_application.getBlock( role ));
       }
   
       /**
  
  
  
  1.4       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java
  
  Index: DefaultExtensionManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultExtensionManager.java	14 Jul 2002 05:44:22 -0000	1.3
  +++ DefaultExtensionManager.java	26 Jul 2002 09:49:21 -0000	1.4
  @@ -28,6 +28,7 @@
       ExtensionManager, ExtensionManagerMBean
   {
       private Logger m_logger;
  +
       private String m_rawPath;
   
       public void enableLogging( final Logger logger )
  
  
  
  1.24      +6 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
  
  Index: DefaultApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DefaultApplicationContext.java	14 Jul 2002 02:27:16 -0000	1.23
  +++ DefaultApplicationContext.java	26 Jul 2002 09:49:21 -0000	1.24
  @@ -8,6 +8,8 @@
   package org.apache.avalon.phoenix.components.kernel;
   
   import java.util.HashMap;
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -21,10 +23,8 @@
   import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
   import org.apache.avalon.phoenix.interfaces.ManagerException;
   import org.apache.avalon.phoenix.interfaces.SystemManager;
  -import org.apache.avalon.phoenix.metadata.SarMetaData;
   import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.phoenix.metadata.SarMetaData;
   import org.apache.excalibur.threadcontext.ThreadContext;
   import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
   
  @@ -58,6 +58,7 @@
   
       ///Place to expose Management beans
       private SystemManager m_systemManager;
  +
       private SystemManager m_blockManager;
   
       private final SarMetaData m_metaData;
  @@ -161,7 +162,7 @@
        * @return the Configuration
        */
       public Configuration getConfiguration( final String component )
  -      throws ConfigurationException
  +        throws ConfigurationException
       {
           final Configuration configuration =
               m_repository.getConfiguration( m_metaData.getName(),
  @@ -200,7 +201,7 @@
       {
           for( int i = 0; i < listeners.length; i++ )
           {
  -            if( listeners[i].getName().equals( name ) )
  +            if( listeners[ i ].getName().equals( name ) )
               {
                   return true;
               }
  
  
  
  1.75      +72 -71    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.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- DefaultKernel.java	22 Jul 2002 13:26:23 -0000	1.74
  +++ DefaultKernel.java	26 Jul 2002 09:49:21 -0000	1.75
  @@ -26,10 +26,10 @@
   import org.apache.avalon.phoenix.interfaces.ApplicationContext;
   import org.apache.avalon.phoenix.interfaces.ApplicationMBean;
   import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
  +import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
   import org.apache.avalon.phoenix.interfaces.Kernel;
   import org.apache.avalon.phoenix.interfaces.KernelMBean;
   import org.apache.avalon.phoenix.interfaces.SystemManager;
  -import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
   import org.apache.avalon.phoenix.metadata.SarMetaData;
   
   /**
  @@ -54,6 +54,7 @@
   
       ///SystemManager provided by Embeddor
       private SystemManager m_systemManager;
  +
       private SystemManager m_applicationManager;
   
       ///Configuration Repository
  @@ -70,7 +71,7 @@
           m_systemManager = (SystemManager)serviceManager.lookup( SystemManager.ROLE );
           m_repository = (ConfigurationRepository)serviceManager.
               lookup( ConfigurationRepository.ROLE );
  -        m_validator = (ConfigurationValidator) serviceManager.lookup( ConfigurationValidator.ROLE );
  +        m_validator = (ConfigurationValidator)serviceManager.lookup( ConfigurationValidator.ROLE );
       }
   
       public void initialize()
  @@ -125,80 +126,80 @@
       private void startup( final SarEntry entry )
           throws Exception
       {
  -	//lock for application startup and shutdown
  -	synchronized ( entry )
  -	{
  -	    final String name = entry.getMetaData().getName();
  -
  -	    Application application = entry.getApplication();
  -	    if( null == application )
  -	    {
  -		try
  -		{
  -		    final Application newApp = new DefaultApplication();
  -		    final Logger childLogger =
  -			getLogger().getChildLogger( name );
  -		    ContainerUtil.enableLogging( newApp, childLogger );
  -
  -		    final ApplicationContext context =
  -			createApplicationContext( entry );
  -		    newApp.setApplicationContext( context );
  -
  -		    ContainerUtil.initialize( newApp );
  -		    ContainerUtil.start( newApp );
  -
  -		    entry.setApplication( newApp );
  -		    application = newApp;
  -		}
  -		catch( final Throwable t )
  -		{
  -		    //Initialization failed so clean entry
  -		    //so invalid instance is not used
  -		    entry.setApplication( null );
  -
  -		    final String message =
  -			REZ.getString( "kernel.error.entry.initialize",
  -				       entry.getMetaData().getName() );
  -		    throw new CascadingException( message, t );
  -		}
  -
  -		// manage application
  -		try
  -		{
  -		    m_applicationManager.register( name,
  -						   application,
  -						   new Class[]{ApplicationMBean.class} );
  -		}
  -		catch( final Throwable t )
  -		{
  -		    final String message =
  -			REZ.getString( "kernel.error.entry.manage", name );
  -		    throw new CascadingException( message, t );
  -		}
  -	    }
  -	}
  +        //lock for application startup and shutdown
  +        synchronized( entry )
  +        {
  +            final String name = entry.getMetaData().getName();
  +
  +            Application application = entry.getApplication();
  +            if( null == application )
  +            {
  +                try
  +                {
  +                    final Application newApp = new DefaultApplication();
  +                    final Logger childLogger =
  +                        getLogger().getChildLogger( name );
  +                    ContainerUtil.enableLogging( newApp, childLogger );
  +
  +                    final ApplicationContext context =
  +                        createApplicationContext( entry );
  +                    newApp.setApplicationContext( context );
  +
  +                    ContainerUtil.initialize( newApp );
  +                    ContainerUtil.start( newApp );
  +
  +                    entry.setApplication( newApp );
  +                    application = newApp;
  +                }
  +                catch( final Throwable t )
  +                {
  +                    //Initialization failed so clean entry
  +                    //so invalid instance is not used
  +                    entry.setApplication( null );
  +
  +                    final String message =
  +                        REZ.getString( "kernel.error.entry.initialize",
  +                                       entry.getMetaData().getName() );
  +                    throw new CascadingException( message, t );
  +                }
  +
  +                // manage application
  +                try
  +                {
  +                    m_applicationManager.register( name,
  +                                                   application,
  +                                                   new Class[]{ApplicationMBean.class} );
  +                }
  +                catch( final Throwable t )
  +                {
  +                    final String message =
  +                        REZ.getString( "kernel.error.entry.manage", name );
  +                    throw new CascadingException( message, t );
  +                }
  +            }
  +        }
       }
   
       private void shutdown( final SarEntry entry )
           throws Exception
       {
  -	//lock for application startup and shutdown
  -	synchronized ( entry )
  -	{
  -	    final Application application = entry.getApplication();
  -	    if( null != application )
  -	    {
  -		entry.setApplication( null );
  -		ContainerUtil.shutdown( application );
  -	    }
  -	    else
  -	    {
  -		final String message =
  -		    REZ.getString( "kernel.error.entry.nostop",
  -			           entry.getMetaData().getName() );
  -		getLogger().warn( message );
  -	    }
  -	}
  +        //lock for application startup and shutdown
  +        synchronized( entry )
  +        {
  +            final Application application = entry.getApplication();
  +            if( null != application )
  +            {
  +                entry.setApplication( null );
  +                ContainerUtil.shutdown( application );
  +            }
  +            else
  +            {
  +                final String message =
  +                    REZ.getString( "kernel.error.entry.nostop",
  +                                   entry.getMetaData().getName() );
  +                getLogger().warn( message );
  +            }
  +        }
       }
   
       public void addApplication( final SarMetaData metaData,
  
  
  
  1.10      +4 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java
  
  Index: SarEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SarEntry.java	14 Jul 2002 02:27:16 -0000	1.9
  +++ SarEntry.java	26 Jul 2002 09:49:21 -0000	1.10
  @@ -20,9 +20,13 @@
   final class SarEntry
   {
       private SarMetaData m_metaData;
  +
       private Configuration m_configuration;
  +
       private ClassLoader m_classLoader;
  +
       private Application m_application;
  +
       private Logger m_logger;
   
       protected SarEntry( final SarMetaData metaData,
  
  
  
  1.3       +4 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellGUI.java
  
  Index: BeanShellGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellGUI.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BeanShellGUI.java	14 Jul 2002 02:33:31 -0000	1.2
  +++ BeanShellGUI.java	26 Jul 2002 09:49:21 -0000	1.3
  @@ -30,8 +30,11 @@
       implements ActionListener
   {
       private JConsole m_jConsole;
  +
       private Interpreter m_interpreter;
  +
       private Thread m_thread;
  +
       private JFrame m_frame;
   
       /**
  @@ -100,5 +103,4 @@
               m_frame.dispose();
           }
       }
  -
   }
  
  
  
  1.3       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernel.java
  
  Index: BeanShellKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernel.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BeanShellKernel.java	14 Jul 2002 02:33:31 -0000	1.2
  +++ BeanShellKernel.java	26 Jul 2002 09:49:21 -0000	1.3
  @@ -4,7 +4,6 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -
   package org.apache.avalon.phoenix.components.kernel.beanshell;
   
   import org.apache.avalon.excalibur.proxy.DynamicProxy;
  
  
  
  1.4       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
  
  Index: BeanShellKernelProxy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BeanShellKernelProxy.java	14 Jul 2002 07:50:24 -0000	1.3
  +++ BeanShellKernelProxy.java	26 Jul 2002 09:49:21 -0000	1.4
  @@ -8,10 +8,10 @@
   package org.apache.avalon.phoenix.components.kernel.beanshell;
   
   import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.phoenix.interfaces.Application;
   import org.apache.avalon.phoenix.interfaces.Kernel;
   import org.apache.avalon.phoenix.metadata.SarMetaData;
  -import org.apache.avalon.framework.logger.Logger;
   
   public class BeanShellKernelProxy
       implements Kernel
  
  
  
  1.2       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/LogKitHierarchyLogger.java
  
  Index: LogKitHierarchyLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/LogKitHierarchyLogger.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LogKitHierarchyLogger.java	14 Jul 2002 15:16:59 -0000	1.1
  +++ LogKitHierarchyLogger.java	26 Jul 2002 09:49:21 -0000	1.2
  @@ -17,6 +17,7 @@
   public class LogKitHierarchyLogger implements Logger
   {
       private final Hierarchy m_hierarchy;
  +
       private final org.apache.log.Logger m_root;
   
       public LogKitHierarchyLogger( Hierarchy hierarchy )
  
  
  
  1.14      +2 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java
  
  Index: SimpleLogKitManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SimpleLogKitManager.java	15 Jul 2002 16:16:49 -0000	1.13
  +++ SimpleLogKitManager.java	26 Jul 2002 09:49:21 -0000	1.14
  @@ -52,7 +52,9 @@
       ///Hierarchy of Application logging
   
       private final Hierarchy m_hierarchy = new Hierarchy();
  +
       private final Logger m_logkitLogger = m_hierarchy.getLoggerFor( "" );
  +
       private org.apache.avalon.framework.logger.Logger m_logger =
           new LogKitLogger( m_logkitLogger );
   
  
  
  
  1.2       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractJMXManager.java
  
  Index: AbstractJMXManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractJMXManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractJMXManager.java	13 Jul 2002 10:15:12 -0000	1.1
  +++ AbstractJMXManager.java	26 Jul 2002 09:49:21 -0000	1.2
  @@ -31,6 +31,7 @@
           ResourceManager.getPackageResources( AbstractJMXManager.class );
   
       private MBeanServer m_mBeanServer;
  +
       private String m_domain = "Phoenix";
   
       public void initialize()
  
  
  
  1.16      +2 -2      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractSystemManager.java	13 Jul 2002 10:15:12 -0000	1.15
  +++ AbstractSystemManager.java	26 Jul 2002 09:49:21 -0000	1.16
  @@ -25,12 +25,12 @@
   public abstract class AbstractSystemManager
       extends AbstractLogEnabled
       implements SystemManager, Initializable, Startable, Disposable
  -
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( AbstractSystemManager.class );
   
       private final HashMap m_entries = new HashMap();
  +
       private SubContext m_subContext;
   
       public void initialize()
  @@ -95,7 +95,7 @@
       public SystemManager getSubContext( String parent, String type )
           throws ManagerException
       {
  -        return m_subContext.getSubContext( parent,type );
  +        return m_subContext.getSubContext( parent, type );
       }
   
       /**
  
  
  
  1.28      +5 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/DefaultManager.java
  
  Index: DefaultManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/DefaultManager.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- DefaultManager.java	13 Jul 2002 10:15:12 -0000	1.27
  +++ DefaultManager.java	26 Jul 2002 09:49:21 -0000	1.28
  @@ -43,15 +43,20 @@
   
       private static final int DEFAULT_REGISTRY_PORT =
           Integer.getInteger( "phoenix.port", 1111 ).intValue();
  +
       private static final int DEFAULT_HTTPADAPTER_PORT =
           Integer.getInteger( "phoenix.adapter.http", 8082 ).intValue();
  +
       private static final String DEFAULT_ADMIN_USER =
           System.getProperty( "phoenix.admin.user", "admin" );
  +
       private static final String DEFAULT_ADMIN_PASSWD =
           System.getProperty( "phoenix.admin.passwd" );
   
       private Parameters m_parameters;
  +
       private RMIAdaptorImpl m_rmiAdaptor;
  +
       private Registry m_rmiRegistry;
   
       ///Name Adaptor registered with
  
  
  
  1.12      +8 -9      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
  
  Index: MX4JSystemManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MX4JSystemManager.java	22 Jul 2002 20:06:56 -0000	1.11
  +++ MX4JSystemManager.java	26 Jul 2002 09:49:21 -0000	1.12
  @@ -11,13 +11,12 @@
   import javax.management.MBeanServer;
   import javax.management.MBeanServerFactory;
   import javax.management.ObjectName;
  +import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
  +import mx4j.util.StandardMBeanProxy;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   
  -import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
  -import mx4j.util.StandardMBeanProxy;
  -
   /**
    * This component is responsible for managing phoenix instance.
    *
  @@ -28,11 +27,11 @@
   public class MX4JSystemManager
       extends AbstractJMXManager implements Configurable
   {
  -
       private static final int DEFAULT_HTTPADAPTER_PORT =
           Integer.getInteger( "phoenix.adapter.http", 8082 ).intValue();
   
       private int m_port;
  +
       private boolean m_rmi;
   
       public void initialize()
  @@ -44,7 +43,7 @@
   
           final ObjectName adaptorName = new ObjectName( "Http:name=HttpAdaptor" );
           mBeanServer.createMBean( "mx4j.adaptor.http.HttpAdaptor", adaptorName, null );
  -        mBeanServer.setAttribute( adaptorName, new Attribute( "Port", new Integer(m_port) ) );
  +        mBeanServer.setAttribute( adaptorName, new Attribute( "Port", new Integer( m_port ) ) );
   
           /**
            // add user names
  @@ -98,9 +97,9 @@
           ObjectName adaptor = new ObjectName( "Adaptor:protocol=JRMP" );
           server.createMBean( "mx4j.adaptor.rmi.jrmp.JRMPAdaptor", adaptor, null );
           JRMPAdaptorMBean mbean =
  -            ( JRMPAdaptorMBean ) StandardMBeanProxy.create( JRMPAdaptorMBean.class,
  -                                                            server,
  -                                                            adaptor );
  +            (JRMPAdaptorMBean)StandardMBeanProxy.create( JRMPAdaptorMBean.class,
  +                                                         server,
  +                                                         adaptor );
           // Set the JNDI name with which will be registered
           String jndiName = "jrmp";
           mbean.setJNDIName( jndiName );
  @@ -112,7 +111,7 @@
           throws ConfigurationException
       {
           m_port = configuration.getChild( "manager-adaptor-port" ).
  -                getValueAsInteger( DEFAULT_HTTPADAPTER_PORT );
  +            getValueAsInteger( DEFAULT_HTTPADAPTER_PORT );
           m_rmi = configuration.getChild( "enable-rmi-adaptor" ).getValueAsBoolean( false );
       }
   
  
  
  
  1.3       +3 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/SubContext.java
  
  Index: SubContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/SubContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SubContext.java	22 Jul 2002 16:59:18 -0000	1.2
  +++ SubContext.java	26 Jul 2002 09:49:21 -0000	1.3
  @@ -24,8 +24,11 @@
       private static final String EMPTY_STRING = "";
   
       private final HashMap m_subcontexts = new HashMap();
  +
       private final SystemManager m_parent;
  +
       private final String m_name;
  +
       private final String m_type;
   
       /**
  
  
  
  1.41      +9 -8      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- CLIMain.java	15 Jul 2002 16:16:49 -0000	1.40
  +++ CLIMain.java	26 Jul 2002 09:49:21 -0000	1.41
  @@ -44,12 +44,13 @@
   
       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 static final String DEFAULT_FORMAT =
  -      "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}] (%{context}): "
  -      + "%{message}\n%{throwable}";
  +        "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}] (%{context}): "
  +        + "%{message}\n%{throwable}";
   
       ///The embeddor attached to frontend
       private Embeddor m_embeddor;
  @@ -58,7 +59,7 @@
       private int m_exitCode;
   
       private ShutdownHook m_hook;
  -    
  +
       private boolean m_shuttingDown;
   
       /**
  @@ -265,21 +266,21 @@
           // Depending on how the shutdown process is initiated, it is possible
           //  that the shutdown() method can be recursively called from within
           //  the call to notifyObservers below.
  -        if ( !m_shuttingDown )
  +        if( !m_shuttingDown )
           {
               m_shuttingDown = true;
  -            
  +
               //Null hook so it is not tried to be removed
               //when we are shutting down. (Attempting to remove
               //hook during shutdown raises an exception).
               m_hook = null;
  -    
  +
               if( null != m_embeddor )
               {
                   final String message = REZ.getString( "main.exit.notice" );
                   System.out.println( message );
                   System.out.flush();
  -    
  +
                   try
                   {
                       ContainerUtil.shutdown( m_embeddor );
  @@ -293,7 +294,7 @@
                       m_embeddor = null;
                   }
               }
  -    
  +
               // Notify any observers that Phoenix is shutting down
               setChanged();
               notifyObservers( "shutdown" );
  
  
  
  1.17      +8 -0      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CLISetup.java	20 May 2002 11:43:12 -0000	1.16
  +++ CLISetup.java	26 Jul 2002 09:49:21 -0000	1.17
  @@ -32,13 +32,21 @@
           "org.apache.avalon.phoenix.components.manager.DefaultManager";
   
       private static final int DEBUG_LOG_OPT = 'd';
  +
       private static final int HELP_OPT = 'h';
  +
       private static final int LOG_FILE_OPT = 'l';
  +
       private static final int APPS_PATH_OPT = 'a';
  +
       private static final int PERSISTENT_OPT = 'p';
  +
       private static final int CONFIGFILE_OPT = 'f';
  +
       private static final int REMOTE_MANAGER_OPT = 1;
  +
       private static final int DISABLE_HOOK_OPT = 2;
  +
       private static final int APPLICATION_OPT = 3;
   
       ///Parameters created by parsing CLI options
  
  
  
  1.9       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/ComposableServlet.java
  
  Index: ComposableServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/ComposableServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ComposableServlet.java	20 Jun 2002 06:16:46 -0000	1.8
  +++ ComposableServlet.java	26 Jul 2002 09:49:21 -0000	1.9
  @@ -9,11 +9,11 @@
   
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServlet;
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.phoenix.components.embeddor.SingleAppEmbeddor;
   import org.apache.avalon.phoenix.interfaces.Embeddor;
   
  @@ -39,7 +39,7 @@
           super.init();
   
           m_embeddor = (SingleAppEmbeddor)getServletContext().getAttribute( Embeddor.ROLE );
  -        if ( null == m_embeddor )
  +        if( null == m_embeddor )
           {
               final String message = REZ.getString( "servlet.error.load" );
               throw new ServletException( message );
  @@ -49,7 +49,7 @@
           {
               compose( m_embeddor );
           }
  -        catch ( final ComponentException ce )
  +        catch( final ComponentException ce )
           {
               throw new ServletException( ce );
           }
  
  
  
  1.22      +4 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java
  
  Index: PhoenixServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- PhoenixServlet.java	15 Jul 2002 16:16:49 -0000	1.21
  +++ PhoenixServlet.java	26 Jul 2002 09:49:21 -0000	1.22
  @@ -44,11 +44,13 @@
           ResourceManager.getPackageResources( PhoenixServlet.class );
   
       private static final String DEFAULT_LOG_FILE = "/logs/phoenix.log";
  +
       private static final String DEFAULT_FORMAT =
  -      "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}] (%{context}): "
  -      + "%{message}\n%{throwable}";
  +        "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}] (%{context}): "
  +        + "%{message}\n%{throwable}";
   
       private Parameters m_parameters;
  +
       private SingleAppEmbeddor m_embeddor;
   
       private String getInitParameter( final String name,
  
  
  
  1.4       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationValidator.java
  
  Index: ConfigurationValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConfigurationValidator.java	13 Jul 2002 19:36:22 -0000	1.3
  +++ ConfigurationValidator.java	26 Jul 2002 09:49:22 -0000	1.4
  @@ -30,7 +30,7 @@
        * @throws ConfigurationException if schema is invalid
        */
       void addSchema( String application, String block, String schemaType, String url )
  -      throws ConfigurationException;
  +        throws ConfigurationException;
   
       /**
        * Add configuration schema to validator
  @@ -60,7 +60,7 @@
        * @throws ConfigurationException if no schema is found
        */
       boolean isFeasiblyValid( String application, String block, Configuration configuration )
  -      throws ConfigurationException;
  +        throws ConfigurationException;
   
       /**
        * Check to see if configuration is valid.
  @@ -74,5 +74,5 @@
        * @throws ConfigurationException if no schema is found
        */
       boolean isValid( String application, String block, Configuration configuration )
  -      throws ConfigurationException;
  +        throws ConfigurationException;
   }
  
  
  
  1.2       +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationValidatorMBean.java
  
  Index: ConfigurationValidatorMBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationValidatorMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurationValidatorMBean.java	19 Jul 2002 21:00:29 -0000	1.1
  +++ ConfigurationValidatorMBean.java	26 Jul 2002 09:49:22 -0000	1.2
  @@ -7,8 +7,8 @@
    */
   package org.apache.avalon.phoenix.interfaces;
   
  -import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
   
   /**
    * Management interface to the Configuration Validator
  @@ -52,5 +52,5 @@
        * @see ConfigurationValidator#isValid
        */
       boolean isValid( String application, String block, Configuration configuration )
  -      throws ConfigurationException;
  +        throws ConfigurationException;
   }
  
  
  
  1.12      +8 -8      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java
  
  Index: DaemonLauncher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DaemonLauncher.java	15 Jul 2002 16:16:49 -0000	1.11
  +++ DaemonLauncher.java	26 Jul 2002 09:49:22 -0000	1.12
  @@ -31,7 +31,7 @@
        *  CLIMain but we can't do that for security reasons.
        */
       private boolean m_ignoreUpdates = false;
  -    
  +
       public Integer start( final String[] args )
       {
           Integer exitCodeInteger = null;
  @@ -76,7 +76,7 @@
       {
           // To avoid recursive calls, start ignoring updates.
           m_ignoreUpdates = true;
  -        
  +
           Main.shutdown();
           return exitCode;
       }
  @@ -115,7 +115,7 @@
        */
       public void update( final Observable observable, final Object arg )
       {
  -        if ( m_ignoreUpdates )
  +        if( m_ignoreUpdates )
           {
               // Ignore this update
               if( WrapperManager.isDebugEnabled() )
  @@ -128,7 +128,7 @@
           else
           {
               Thread.dumpStack();
  -            final String command = ( null != arg ) ? arg.toString() : "";
  +            final String command = (null != arg) ? arg.toString() : "";
               if( command.equals( "restart" ) )
               {
                   if( WrapperManager.isDebugEnabled() )
  @@ -136,9 +136,9 @@
                       System.out.println( "DaemonLauncher: restart requested." );
                       System.out.flush();
                   }
  -    
  +
                   WrapperManager.restart();
  -    
  +
                   if( WrapperManager.isDebugEnabled() )
                   {
                       //Should never get here???
  @@ -153,9 +153,9 @@
                       System.out.println( "DaemonLauncher: shutdown requested." );
                       System.out.flush();
                   }
  -    
  +
                   WrapperManager.stop( 0 );
  -    
  +
                   if( WrapperManager.isDebugEnabled() )
                   {
                       //Should never get here???
  
  
  
  1.20      +3 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Main.java	12 Jul 2002 22:45:40 -0000	1.19
  +++ Main.java	26 Jul 2002 09:49:22 -0000	1.20
  @@ -28,6 +28,7 @@
   public final class Main
   {
       private static final String MAIN_CLASS = "org.apache.avalon.phoenix.frontends.CLIMain";
  +
       private static final String LOADER_JAR = "phoenix-loader.jar";
   
       private static Object c_frontend;
  @@ -192,7 +193,7 @@
               phoenixHome = loaderDir.getAbsoluteFile().getParentFile() + File.separator;
           }
   
  -        phoenixHome = ( new File( phoenixHome ) ).getCanonicalFile().toString();
  +        phoenixHome = (new File( phoenixHome )).getCanonicalFile().toString();
           System.setProperty( "phoenix.home", phoenixHome );
           return phoenixHome;
       }
  @@ -213,7 +214,7 @@
   
               if( element.endsWith( LOADER_JAR ) )
               {
  -                File file = ( new File( element ) ).getCanonicalFile();
  +                File file = (new File( element )).getCanonicalFile();
                   file = file.getParentFile();
                   return file;
               }
  
  
  
  1.5       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockListenerMetaData.java
  
  Index: BlockListenerMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockListenerMetaData.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BlockListenerMetaData.java	11 Dec 2001 10:13:35 -0000	1.4
  +++ BlockListenerMetaData.java	26 Jul 2002 09:49:22 -0000	1.5
  @@ -15,6 +15,7 @@
   public final class BlockListenerMetaData
   {
       private final String m_name;
  +
       private final String m_classname;
   
       public BlockListenerMetaData( final String name, final String classname )
  
  
  
  1.11      +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockMetaData.java
  
  Index: BlockMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockMetaData.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BlockMetaData.java	4 Jun 2002 06:58:11 -0000	1.10
  +++ BlockMetaData.java	26 Jul 2002 09:49:22 -0000	1.11
  @@ -17,6 +17,7 @@
   public class BlockMetaData
   {
       private final String m_name;
  +
       private final DependencyMetaData[] m_dependencies;
   
       private BlockInfo m_blockInfo;
  
  
  
  1.5       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/DependencyMetaData.java
  
  Index: DependencyMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/DependencyMetaData.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DependencyMetaData.java	11 Dec 2001 10:13:35 -0000	1.4
  +++ DependencyMetaData.java	26 Jul 2002 09:49:22 -0000	1.5
  @@ -15,6 +15,7 @@
   public final class DependencyMetaData
   {
       private final String m_name;
  +
       private final String m_role;
   
       public DependencyMetaData( final String name, final String role )
  
  
  
  1.8       +3 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/SarMetaData.java
  
  Index: SarMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/SarMetaData.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SarMetaData.java	11 Dec 2001 10:13:35 -0000	1.7
  +++ SarMetaData.java	26 Jul 2002 09:49:22 -0000	1.8
  @@ -17,8 +17,11 @@
   public class SarMetaData
   {
       private String m_name;
  +
       private File m_homeDirectory;
  +
       private BlockMetaData[] m_blocks;
  +
       private BlockListenerMetaData[] m_listeners;
   
       public SarMetaData( final String name,
  
  
  
  1.9       +3 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java
  
  Index: BlockDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BlockDescriptor.java	13 Jul 2002 19:31:59 -0000	1.8
  +++ BlockDescriptor.java	26 Jul 2002 09:49:22 -0000	1.9
  @@ -21,8 +21,11 @@
        * assembly tools or generators.
        */
       private final String m_name;
  +
       private final String m_classname;
  +
       private final Version m_version;
  +
       private final String m_schemaType;
   
       public BlockDescriptor( final String name,
  
  
  
  1.14      +3 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockInfo.java
  
  Index: BlockInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockInfo.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BlockInfo.java	13 Jul 2002 19:33:06 -0000	1.13
  +++ BlockInfo.java	26 Jul 2002 09:49:22 -0000	1.14
  @@ -19,8 +19,11 @@
   public class BlockInfo
   {
       private final BlockDescriptor m_descriptor;
  +
       private final ServiceDescriptor[] m_services;
  +
       private final ServiceDescriptor[] m_managementAccessPoints;
  +
       private final DependencyDescriptor[] m_dependencies;
   
       /**
  
  
  
  1.8       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/DependencyDescriptor.java
  
  Index: DependencyDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/DependencyDescriptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DependencyDescriptor.java	16 Mar 2002 00:11:56 -0000	1.7
  +++ DependencyDescriptor.java	26 Jul 2002 09:49:22 -0000	1.8
  @@ -15,6 +15,7 @@
   public final class DependencyDescriptor
   {
       private final String m_role;
  +
       private final ServiceDescriptor m_service;
   
       /**
  
  
  
  1.10      +3 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java
  
  Index: ServiceDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServiceDescriptor.java	15 Jul 2002 16:16:49 -0000	1.9
  +++ ServiceDescriptor.java	26 Jul 2002 09:49:22 -0000	1.10
  @@ -19,6 +19,7 @@
   public final class ServiceDescriptor
   {
       private final Version m_version;
  +
       private final String m_name;
   
       /**
  @@ -64,8 +65,8 @@
       public boolean matches( final ServiceDescriptor other )
       {
           return
  -          other.getName().equals( m_name )
  -          && other.getVersion().complies( m_version );
  +            other.getName().equals( m_name )
  +            && other.getVersion().complies( m_version );
       }
   
       /**
  
  
  
  1.5       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/DTDResolver.java
  
  Index: DTDResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/DTDResolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DTDResolver.java	15 Jul 2002 16:16:30 -0000	1.4
  +++ DTDResolver.java	26 Jul 2002 09:49:22 -0000	1.5
  @@ -54,12 +54,12 @@
           {
               final DTDInfo info = m_dtdInfos[ i ];
   
  -            if( ( publicId != null && publicId.equals( info.getPublicId() ) )
  -              || ( systemId != null && systemId.equals( info.getSystemId() ) ) )
  +            if( (publicId != null && publicId.equals( info.getPublicId() ))
  +                || (systemId != null && systemId.equals( info.getSystemId() )) )
               {
                   final ClassLoader classLoader = getClassLoader();
                   final InputStream inputStream =
  -                  classLoader.getResourceAsStream( info.getResource() );
  +                    classLoader.getResourceAsStream( info.getResource() );
                   return new InputSource( inputStream );
               }
           }
  
  
  
  1.15      +4 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/tasks/Sar.java
  
  Index: Sar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/tasks/Sar.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Sar.java	15 Jul 2002 16:16:31 -0000	1.14
  +++ Sar.java	26 Jul 2002 09:49:22 -0000	1.15
  @@ -22,7 +22,9 @@
       extends Jar
   {
       private File m_config;
  +
       private File m_assembly;
  +
       private File m_environment;
   
       public Sar()
  @@ -79,14 +81,14 @@
           if( !m_environment.exists() )
           {
               final String message = "Environment descriptor: "
  -              + m_environment + " does not exist.";
  +                + m_environment + " does not exist.";
               throw new BuildException( message );
           }
   
           if( !m_environment.isFile() )
           {
               final String message = "Environment descriptor: "
  -              + m_environment + " is not a file.";
  +                + m_environment + " is not a file.";
               throw new BuildException( message );
           }
       }
  
  
  
  1.25      +3 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
  
  Index: SarVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- SarVerifier.java	23 Jun 2002 22:19:24 -0000	1.24
  +++ SarVerifier.java	26 Jul 2002 09:49:22 -0000	1.25
  @@ -30,8 +30,8 @@
   import org.apache.avalon.phoenix.metainfo.BlockInfo;
   import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
   import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
  -import org.apache.excalibur.containerkit.verifier.VerifyException;
   import org.apache.excalibur.containerkit.verifier.ComponentVerifier;
  +import org.apache.excalibur.containerkit.verifier.VerifyException;
   
   /**
    * This Class verifies that Sars are valid. It performs a number
  @@ -551,7 +551,7 @@
           {
               final char ch = name.charAt( i );
   
  -            if( !Character.isLetterOrDigit( ch ) && '-' != ch && '.' != ch)
  +            if( !Character.isLetterOrDigit( ch ) && '-' != ch && '.' != ch )
               {
                   return false;
               }
  
  
  
  1.9       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/BlockInfoSubTask.java
  
  Index: BlockInfoSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/BlockInfoSubTask.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BlockInfoSubTask.java	15 Jul 2002 16:16:31 -0000	1.8
  +++ BlockInfoSubTask.java	26 Jul 2002 09:49:23 -0000	1.9
  @@ -26,6 +26,7 @@
       public static final String SUBTASK_NAME = "blockinfo";
   
       private static final String GENERATED_FILE_NAME = "{0}.xinfo";
  +
       private static final String DEFAULT_TEMPLATE_FILE =
           "/org/apache/avalon/phoenix/tools/xdoclet/blockinfo.j";
   
  
  
  
  1.7       +5 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java
  
  Index: ManifestSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ManifestSubTask.java	15 Jul 2002 16:16:31 -0000	1.6
  +++ ManifestSubTask.java	26 Jul 2002 09:49:23 -0000	1.7
  @@ -7,11 +7,11 @@
    */
   package org.apache.avalon.phoenix.tools.xdoclet;
   
  -import xjavadoc.XClass;
   import java.io.File;
   import java.net.URL;
   import xdoclet.TemplateSubTask;
   import xdoclet.XDocletException;
  +import xjavadoc.XClass;
   
   /**
    * Generates Manifest file for Blocks
  @@ -26,6 +26,7 @@
       public static final String SUBTASK_NAME = "manifest";
   
       private static final String GENERATED_FILE_NAME = "manifest.mf";
  +
       private static final String DEFAULT_TEMPLATE_FILE =
           "/org/apache/avalon/phoenix/tools/xdoclet/manifest.j";
   
  @@ -85,13 +86,13 @@
           }
   
           if( null == getDestinationFile()
  -          || getDestinationFile().trim().equals( "" ) )
  +            || getDestinationFile().trim().equals( "" ) )
           {
               throw new XDocletException( "Error with the 'manifestFile' attribute." );
           }
   
           if( null == getClassPattern()
  -          || getClassPattern().trim().equals( "" ) )
  +            || getClassPattern().trim().equals( "" ) )
           {
               throw new XDocletException( "'pattern' parameter missing or empty." );
           }
  
  
  
  1.6       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java
  
  Index: PhoenixXDoclet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PhoenixXDoclet.java	18 Apr 2002 10:26:04 -0000	1.5
  +++ PhoenixXDoclet.java	26 Jul 2002 09:49:23 -0000	1.6
  @@ -19,6 +19,7 @@
       extends DocletTask
   {
       private BlockInfoSubTask m_blockInfoSubTask;
  +
       private ManifestSubTask m_manifestSubTask;
   
       public BlockInfoSubTask createBlockinfo()
  
  
  

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