avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit PUnitBlockEntry.java PUnitHelper.java PUnitTestCase.java
Date Sat, 22 Feb 2003 05:34:47 GMT
donaldp     2003/02/21 21:34:47

  Modified:    src/java/org/apache/avalon/phoenix/components/application
                        BlockEntry.java DefaultBlockContext.java
               src/java/org/apache/avalon/phoenix/components/classloader
                        PropertyUtil.java
               src/java/org/apache/avalon/phoenix/components/configuration
                        FileSystemPersistentConfigurationRepository.java
               src/java/org/apache/avalon/phoenix/components/configuration/validator
                        DelegatingConfigurationValidator.java
                        JarvConfigurationValidator.java
               src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
               src/java/org/apache/avalon/phoenix/components/embeddor
                        SingleAppEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/installer
                        DefaultInstaller.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultApplicationContext.java
               src/java/org/apache/avalon/phoenix/components/manager
                        AbstractJMXManager.java
                        ExtendedMX4JSystemManager.java
                        HostedSystemManager.java MBeanInfoBuilder.java
                        MBeanScripter.java MX4JLoggerAdapter.java
                        MX4JSystemManager.java
               src/java/org/apache/avalon/phoenix/components/util
                        ComponentMetaDataConverter.java
               src/java/org/apache/avalon/phoenix/containerkit/factory
                        DefaultComponentFactory.java
               src/java/org/apache/avalon/phoenix/containerkit/kernel
                        AbstractServiceKernel.java
               src/java/org/apache/avalon/phoenix/containerkit/lifecycle
                        LifecycleHelper.java
               src/java/org/apache/avalon/phoenix/frontends CLISetup.java
               src/java/org/apache/avalon/phoenix/interfaces Kernel.java
               src/java/org/apache/avalon/phoenix/launcher
                        DaemonLauncher.java FreeNEasyPolicy.java
                        JMXLauncher.java LauncherUtils.java Main.java
               src/java/org/apache/avalon/phoenix/tools/configuration
                        DTDResolver.java
               src/java/org/apache/avalon/phoenix/tools/metagenerate
                        MetaGenerateTask.java NamedXmlSnippet.java
               src/java/org/apache/avalon/phoenix/tools/punit
                        PUnitBlockEntry.java PUnitHelper.java
                        PUnitTestCase.java
  Log:
  styled
  
  Revision  Changes    Path
  1.25      +3 -3      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
  
  Index: BlockEntry.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- BlockEntry.java	22 Feb 2003 04:03:25 -0000	1.24
  +++ BlockEntry.java	22 Feb 2003 05:34:44 -0000	1.25
  @@ -49,7 +49,7 @@
       {
           invalidate();
   
  -        if( null != object && ! isDisableProxy() )
  +        if( null != object && !isDisableProxy() )
           {
               final ComponentInfo blockInfo = m_componentProfile.getInfo();
               final Class[] interfaces = getServiceClasses( object, blockInfo.getServices() );
  @@ -60,7 +60,7 @@
   
       public synchronized Object getProxy()
       {
  -        if ( isDisableProxy() )
  +        if( isDisableProxy() )
           {
               return m_object;
           }
  @@ -83,7 +83,7 @@
           for( int i = 0; i < attributes.length; i++ )
           {
               final Attribute attribute = attributes[ i ];
  -            if( attribute.getName().equals( ContainerConstants.DISABLE_PROXY_ATTR  ) )
  +            if( attribute.getName().equals( ContainerConstants.DISABLE_PROXY_ATTR ) )
               {
                   return true;
               }
  
  
  
  1.23      +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java
  
  Index: DefaultBlockContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- DefaultBlockContext.java	22 Feb 2003 04:03:25 -0000	1.22
  +++ DefaultBlockContext.java	22 Feb 2003 05:34:44 -0000	1.23
  @@ -26,7 +26,7 @@
       private final ApplicationContext m_applicationContext;
   
       DefaultBlockContext( final String name,
  -                                   final ApplicationContext frame )
  +                         final ApplicationContext frame )
       {
           m_name = name;
           m_applicationContext = frame;
  
  
  
  1.7       +3 -3      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PropertyUtil.java
  
  Index: PropertyUtil.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PropertyUtil.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PropertyUtil.java	22 Feb 2003 04:03:26 -0000	1.6
  +++ PropertyUtil.java	22 Feb 2003 05:34:44 -0000	1.7
  @@ -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,
  @@ -135,7 +135,7 @@
           {
               while( null != value && value instanceof Resolvable )
               {
  -                value = ((Resolvable)value).resolve( context );
  +                value = ( (Resolvable)value ).resolve( context );
               }
           }
           catch( final ContextException ce )
  
  
  
  1.14      +4 -4      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
  
  Index: FileSystemPersistentConfigurationRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- FileSystemPersistentConfigurationRepository.java	22 Feb 2003 04:03:26 -0000	1.13
  +++ FileSystemPersistentConfigurationRepository.java	22 Feb 2003 05:34:44 -0000	1.14
  @@ -105,7 +105,7 @@
   
               if( opath instanceof String )
               {
  -                return FileUtil.normalize( ( String ) opath );
  +                return FileUtil.normalize( (String)opath );
               }
               else
               {
  @@ -137,7 +137,7 @@
   
           for( int i = 0; i < apps.length; i++ )
           {
  -            loadConfigurations( apps[i] );
  +            loadConfigurations( apps[ i ] );
           }
       }
   
  @@ -151,11 +151,11 @@
           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" ) );
   
               m_persistedConfigurations.storeConfiguration( app,
                                                             block,
  -                                                          builder.buildFromFile( blocks[i] ) );
  +                                                          builder.buildFromFile( blocks[ i ] ) );
   
               if( getLogger().isDebugEnabled() )
                   getLogger().debug( "Loaded persistent configuration [app: " + app
  
  
  
  1.6       +4 -4      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/DelegatingConfigurationValidator.java
  
  Index: DelegatingConfigurationValidator.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/DelegatingConfigurationValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DelegatingConfigurationValidator.java	22 Feb 2003 04:03:26 -0000	1.5
  +++ DelegatingConfigurationValidator.java	22 Feb 2003 05:34:44 -0000	1.6
  @@ -89,7 +89,7 @@
       {
           for( Iterator i = m_delegates.values().iterator(); i.hasNext(); )
           {
  -            ContainerUtil.dispose( ((DelegateEntry)i.next()).getValidator() );
  +            ContainerUtil.dispose( ( (DelegateEntry)i.next() ).getValidator() );
           }
       }
   
  @@ -151,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( final String application, final String block )
  @@ -170,8 +170,8 @@
   
               if( validator instanceof ConfigurationValidatorMBean )
               {
  -                return ((ConfigurationValidatorMBean)validator).getSchema( application,
  -                                                                           block );
  +                return ( (ConfigurationValidatorMBean)validator ).getSchema( application,
  +                                                                             block );
   
               }
           }
  
  
  
  1.10      +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/JarvConfigurationValidator.java
  
  Index: JarvConfigurationValidator.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/JarvConfigurationValidator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JarvConfigurationValidator.java	22 Feb 2003 04:03:26 -0000	1.9
  +++ JarvConfigurationValidator.java	22 Feb 2003 05:34:44 -0000	1.10
  @@ -87,8 +87,8 @@
           m_verifierFactoryClass =
               configuration.getChild( "verifier-factory-class" ).getValue( null );
   
  -        if( (null == m_schemaLanguage && null == m_verifierFactoryClass)
  -            || (null != m_schemaLanguage && null != m_verifierFactoryClass) )
  +        if( ( null == m_schemaLanguage && null == m_verifierFactoryClass )
  +            || ( null != m_schemaLanguage && null != m_verifierFactoryClass ) )
           {
               throw new ConfigurationException( REZ.getString( "jarv.error.badconfig" ) );
           }
  
  
  
  1.66      +22 -22    avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- DefaultDeployer.java	22 Feb 2003 04:03:26 -0000	1.65
  +++ DefaultDeployer.java	22 Feb 2003 05:34:44 -0000	1.66
  @@ -89,14 +89,14 @@
       public void service( final ServiceManager serviceManager )
           throws ServiceException
       {
  -        m_kernel = ( Kernel ) serviceManager.lookup( Kernel.ROLE );
  -        m_repository = ( ConfigurationRepository ) serviceManager.
  +        m_kernel = (Kernel)serviceManager.lookup( Kernel.ROLE );
  +        m_repository = (ConfigurationRepository)serviceManager.
               lookup( ConfigurationRepository.ROLE );
  -        m_classLoaderManager = ( ClassLoaderManager ) serviceManager.
  +        m_classLoaderManager = (ClassLoaderManager)serviceManager.
               lookup( ClassLoaderManager.ROLE );
  -        m_logManager = ( LogManager ) serviceManager.lookup( LogManager.ROLE );
  -        m_validator = ( ConfigurationValidator ) serviceManager.lookup( ConfigurationValidator.ROLE );
  -        m_installer = ( Installer ) serviceManager.lookup( Installer.ROLE );
  +        m_logManager = (LogManager)serviceManager.lookup( LogManager.ROLE );
  +        m_validator = (ConfigurationValidator)serviceManager.lookup( ConfigurationValidator.ROLE );
  +        m_installer = (Installer)serviceManager.lookup( Installer.ROLE );
       }
   
       public void initialize()
  @@ -114,10 +114,10 @@
       {
           final Set set = m_installations.keySet();
           final String[] applications =
  -            ( String[] ) set.toArray( new String[set.size()] );
  +            (String[])set.toArray( new String[ set.size() ] );
           for( int i = 0; i < applications.length; i++ )
           {
  -            final String name = applications[i];
  +            final String name = applications[ i ];
               try
               {
                   undeploy( name );
  @@ -143,7 +143,7 @@
           throws DeploymentException
       {
           final Installation installation =
  -            ( Installation ) m_installations.get( name );
  +            (Installation)m_installations.get( name );
           if( null == installation )
           {
               final String message =
  @@ -172,7 +172,7 @@
           throws DeploymentException
       {
           final Installation installation =
  -            ( Installation ) m_installations.remove( name );
  +            (Installation)m_installations.remove( name );
           if( null == installation )
           {
               final String message =
  @@ -189,8 +189,8 @@
               for( int i = 0; i < blocks.length; i++ )
               {
                   //remove configuration and schema from repository and validator
  -                m_repository.removeConfiguration( name, blocks[i] );
  -                m_validator.removeSchema( name, blocks[i] );
  +                m_repository.removeConfiguration( name, blocks[ i ] );
  +                m_validator.removeSchema( name, blocks[ i ] );
               }
   
               m_installer.uninstall( installation );
  @@ -348,7 +348,7 @@
           final PartitionProfile[] profiles = new PartitionProfile[]{blockProfile, listenerProfile};
           return new PartitionProfile( metaData,
                                        profiles,
  -                                     new ComponentProfile[0] );
  +                                     new ComponentProfile[ 0 ] );
       }
   
       private PartitionProfile assembleListenerProfile( final PartitionMetaData metaData )
  @@ -357,7 +357,7 @@
           final ComponentMetaData[] components = metaData.getComponents();
           for( int i = 0; i < components.length; i++ )
           {
  -            final ComponentMetaData component = components[i];
  +            final ComponentMetaData component = components[ i ];
               final ComponentInfo info =
                   LegacyUtil.createListenerInfo( component.getImplementationKey() );
               final ComponentProfile profile = new ComponentProfile( info, component );
  @@ -365,7 +365,7 @@
           }
   
           final ComponentProfile[] profiles =
  -            ( ComponentProfile[] ) componentSet.toArray( new ComponentProfile[componentSet.size()] );
  +            (ComponentProfile[])componentSet.toArray( new ComponentProfile[ componentSet.size() ] );
           return new PartitionProfile( metaData, PartitionProfile.EMPTY_SET, profiles );
       }
   
  @@ -377,7 +377,7 @@
           final PartitionMetaData[] partitions = metaData.getPartitions();
           for( int i = 0; i < partitions.length; i++ )
           {
  -            final PartitionMetaData partition = partitions[i];
  +            final PartitionMetaData partition = partitions[ i ];
               final PartitionProfile profile = assembleProfile( partition, factory );
               partitionSet.add( profile );
           }
  @@ -386,7 +386,7 @@
           final ComponentMetaData[] components = metaData.getComponents();
           for( int i = 0; i < components.length; i++ )
           {
  -            final ComponentMetaData component = components[i];
  +            final ComponentMetaData component = components[ i ];
               final ComponentBundle bundle =
                   factory.createBundle( component.getImplementationKey() );
               final ComponentInfo info = bundle.getComponentInfo();
  @@ -395,9 +395,9 @@
           }
   
           final PartitionProfile[] partitionProfiles =
  -            ( PartitionProfile[] ) partitionSet.toArray( new PartitionProfile[partitionSet.size()] );
  +            (PartitionProfile[])partitionSet.toArray( new PartitionProfile[ partitionSet.size() ] );
           final ComponentProfile[] componentProfiles =
  -            ( ComponentProfile[] ) componentSet.toArray( new ComponentProfile[componentSet.size()] );
  +            (ComponentProfile[])componentSet.toArray( new ComponentProfile[ componentSet.size() ] );
           return new PartitionProfile( metaData, partitionProfiles, componentProfiles );
       }
   
  @@ -452,7 +452,7 @@
           {
               for( i = 0; i < blocks.length; i++ )
               {
  -                final ComponentProfile block = blocks[i];
  +                final ComponentProfile block = blocks[ i ];
                   final SchemaDescriptor descriptor = block.getInfo().getConfigurationSchema();
                   name = block.getMetaData().getName();
   
  @@ -482,7 +482,7 @@
               while( --i >= 0 )
               {
                   m_validator.removeSchema( application,
  -                                          blocks[i].getMetaData().getName() );
  +                                          blocks[ i ].getMetaData().getName() );
               }
   
               throw new DeploymentException( message, e );
  @@ -552,7 +552,7 @@
               metaData.getPartition( ContainerConstants.BLOCK_PARTITION );
           for( int i = 0; i < configurations.length; i++ )
           {
  -            final Configuration configuration = configurations[i];
  +            final Configuration configuration = configurations[ i ];
               final String name = configuration.getName();
               final boolean listener =
                   null != listenerPartition.getComponent( name );
  
  
  
  1.27      +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java
  
  Index: SingleAppEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- SingleAppEmbeddor.java	23 Aug 2002 04:13:39 -0000	1.26
  +++ SingleAppEmbeddor.java	22 Feb 2003 05:34:44 -0000	1.27
  @@ -77,7 +77,7 @@
   
       public boolean hasComponent( final String role )
       {
  -        return (null != m_application.getBlock( role ));
  +        return ( null != m_application.getBlock( role ) );
       }
   
       /**
  
  
  
  1.12      +2 -4      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/installer/DefaultInstaller.java
  
  Index: DefaultInstaller.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/installer/DefaultInstaller.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultInstaller.java	1 Nov 2002 01:15:40 -0000	1.11
  +++ DefaultInstaller.java	22 Feb 2003 05:34:44 -0000	1.12
  @@ -56,7 +56,6 @@
       private static final String FS_CLASSES =
           "SAR-INF" + File.separator + "classes" + File.separator;
   
  -
       /**
        * The directory which is used as the base for
        * extracting all temporary files from archives. It is
  @@ -287,7 +286,7 @@
           final Enumeration entries = zipFile.entries();
           while( entries.hasMoreElements() )
           {
  -            final ZipEntry entry = (ZipEntry) entries.nextElement();
  +            final ZipEntry entry = (ZipEntry)entries.nextElement();
               final String name = fixName( entry.getName() );
   
               if( name.startsWith( META_INF ) )
  @@ -549,7 +548,6 @@
               //should never occur
           }
       }
  -
   
       /**
        * Make sure that the work directory is created and not a file.
  
  
  
  1.34      +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
  
  Index: DefaultApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- DefaultApplicationContext.java	22 Feb 2003 04:03:27 -0000	1.33
  +++ DefaultApplicationContext.java	22 Feb 2003 05:34:45 -0000	1.34
  @@ -302,7 +302,7 @@
       public ClassLoader getClassLoader( final String name )
           throws Exception
       {
  -        final ClassLoader classLoader = (ClassLoader)m_loaders.get(name);
  +        final ClassLoader classLoader = (ClassLoader)m_loaders.get( name );
           if( null == classLoader )
           {
               final String message =
  
  
  
  1.8       +3 -3      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractJMXManager.java
  
  Index: AbstractJMXManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractJMXManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractJMXManager.java	22 Feb 2003 04:03:27 -0000	1.7
  +++ AbstractJMXManager.java	22 Feb 2003 05:34:45 -0000	1.8
  @@ -97,14 +97,14 @@
       {
           try
           {
  -            final Target target = (Target) exportedObject;
  +            final Target target = (Target)exportedObject;
               final Set topicNames = target.getTopicNames();
               final Iterator i = topicNames.iterator();
   
               while( i.hasNext() )
               {
                   final ObjectName objectName =
  -                    createObjectName( name, target.getTopic( ( String ) i.next() ) );
  +                    createObjectName( name, target.getTopic( (String)i.next() ) );
   
                   getMBeanServer().unregisterMBean( objectName );
               }
  
  
  
  1.6       +12 -12    avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/ExtendedMX4JSystemManager.java
  
  Index: ExtendedMX4JSystemManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/ExtendedMX4JSystemManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExtendedMX4JSystemManager.java	2 Oct 2002 11:25:55 -0000	1.5
  +++ ExtendedMX4JSystemManager.java	22 Feb 2003 05:34:45 -0000	1.6
  @@ -44,15 +44,15 @@
           throws ConfigurationException
       {
           final String namingFactory =
  -            configuration.getChild( "rmi-naming-factory" ).getValue( null);
  -        if ( null != namingFactory )
  +            configuration.getChild( "rmi-naming-factory" ).getValue( null );
  +        if( null != namingFactory )
           {
               getLogger().warn( "Deprecated." );
               System.setProperty( "java.naming.factory.initial", namingFactory );
           }
  -        else if ( null == System.getProperty( "java.naming.factory.initial" ) )
  +        else if( null == System.getProperty( "java.naming.factory.initial" ) )
           {
  -            System.setProperty( "java.naming.factory.initial", DEFAULT_NAMING_FACTORY  );
  +            System.setProperty( "java.naming.factory.initial", DEFAULT_NAMING_FACTORY );
           }
   
           m_configuration = configuration;
  @@ -66,7 +66,7 @@
           m_mBeanScripters = new HashMap();
           final Configuration[] scripters =
               m_configuration.getChildren( "mbean" );
  -        for ( int i = 0; i < scripters.length; i++ )
  +        for( int i = 0; i < scripters.length; i++ )
           {
               createMBeanScripter( scripters[ i ] );
           }
  @@ -75,7 +75,7 @@
       public void dispose()
       {
           final Iterator scripterNames = m_mBeanScripters.keySet().iterator();
  -        while ( scripterNames.hasNext() )
  +        while( scripterNames.hasNext() )
           {
               destroyMBeanScripter( (String)scripterNames.next() );
           }
  @@ -96,10 +96,10 @@
   
               m_mBeanScripters.put( scripter.getName(), scripter );
           }
  -        catch ( final Exception e )
  +        catch( final Exception e )
           {
               final String message = REZ.getString( "jmxmanager.error.jmxmbean.initialize", scripter.getName() );
  -            getLogger().error( message , e );
  +            getLogger().error( message, e );
               throw e;
           }
       }
  @@ -112,18 +112,18 @@
           {
               scripter.shutdown();
           }
  -        catch ( final Exception e )
  +        catch( final Exception e )
           {
               final String message = REZ.getString( "jmxmanager.error.jmxmbean.dispose", scripter.getName() );
  -            getLogger().error( message , e );
  +            getLogger().error( message, e );
           }
       }
   
       protected MBeanServer createMBeanServer()
           throws Exception
       {
  -        MX4JLoggerAdapter.setLogger(getLogger());
  -        mx4j.log.Log.redirectTo(new MX4JLoggerAdapter());
  +        MX4JLoggerAdapter.setLogger( getLogger() );
  +        mx4j.log.Log.redirectTo( new MX4JLoggerAdapter() );
           return MBeanServerFactory.createMBeanServer( "Phoenix" );
       }
   }
  
  
  
  1.5       +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java
  
  Index: HostedSystemManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HostedSystemManager.java	22 Feb 2003 04:03:27 -0000	1.4
  +++ HostedSystemManager.java	22 Feb 2003 05:34:45 -0000	1.5
  @@ -31,7 +31,7 @@
               return null;
           }
   
  -        MBeanServer ms = (MBeanServer) serverList.get( 0 );
  +        MBeanServer ms = (MBeanServer)serverList.get( 0 );
           getLogger().debug( "HostedSystemManager createMBeanServer \"" + ms + "\"" );
           return ms;
       }
  
  
  
  1.6       +6 -6      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanInfoBuilder.java
  
  Index: MBeanInfoBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanInfoBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MBeanInfoBuilder.java	22 Feb 2003 04:03:27 -0000	1.5
  +++ MBeanInfoBuilder.java	22 Feb 2003 05:34:45 -0000	1.6
  @@ -156,9 +156,9 @@
               {
                   // skip getters and setters
                   final String name = methods[ j ].getName();
  -                if( !(name.startsWith( "get" ) ||
  +                if( !( name.startsWith( "get" ) ||
                       name.startsWith( "set" ) ||
  -                    name.startsWith( "is" )) )
  +                    name.startsWith( "is" ) ) )
                   {
                       operations.add( buildOperationInfo( methods[ j ], null ) );
                   }
  @@ -328,8 +328,8 @@
           final String type = property.getPropertyType().getName();
   
           String description = property.getDisplayName();
  -        boolean isReadable = (readMethod != null);
  -        boolean isWriteable = (writeMethod != null);
  +        boolean isReadable = ( readMethod != null );
  +        boolean isWriteable = ( writeMethod != null );
   
           if( config != null )
           {
  @@ -347,7 +347,7 @@
           }
   
           final boolean isIs =
  -            (readMethod != null) && readMethod.getName().startsWith( "is" );
  +            ( readMethod != null ) && readMethod.getName().startsWith( "is" );
   
           final ModelMBeanAttributeInfo info =
               new ModelMBeanAttributeInfo( name, type, description, isReadable, isWriteable, isIs );
  
  
  
  1.4       +6 -6      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanScripter.java
  
  Index: MBeanScripter.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanScripter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MBeanScripter.java	22 Feb 2003 04:03:27 -0000	1.3
  +++ MBeanScripter.java	22 Feb 2003 05:34:45 -0000	1.4
  @@ -77,7 +77,7 @@
       {
           final Configuration[] attributes =
               m_configuration.getChildren( "attribute" );
  -        for ( int i = 0; i < attributes.length; i++ )
  +        for( int i = 0; i < attributes.length; i++ )
           {
               setAttribute( attributes[ i ] );
           }
  @@ -89,7 +89,7 @@
           final String name = attribute.getAttribute( "name" );
           final String type = attribute.getAttribute( "type" );
           Object value = attribute.getValue( null );
  -        if ( null != value )
  +        if( null != value )
           {
               final Class valueClass = Class.forName( type );
               value = c_valueConverter.convert( valueClass, value, null );
  @@ -102,7 +102,7 @@
           throws Exception
       {
           final Configuration[] uses = m_configuration.getChildren( "use" );
  -        for ( int i = 0; i < uses.length; i++ )
  +        for( int i = 0; i < uses.length; i++ )
           {
               setUse( uses[ i ] );
           }
  @@ -136,7 +136,7 @@
       private void invokeOperations( final Configuration[] invokes )
           throws Exception
       {
  -        for ( int i = 0; i < invokes.length; i++ )
  +        for( int i = 0; i < invokes.length; i++ )
           {
               final Configuration invoke = invokes[ i ];
               invokeOperation( invoke );
  @@ -150,11 +150,11 @@
           final Configuration[] paramConfs = invoke.getChildren( "parameter" );
           final String[] types = new String[ paramConfs.length ];
           final Object[] values = new Object[ paramConfs.length ];
  -        for ( int i = 0; i < paramConfs.length; i++ )
  +        for( int i = 0; i < paramConfs.length; i++ )
           {
               final String type = paramConfs[ i ].getAttribute( "type" );
               Object value = paramConfs[ i ].getValue( null );
  -            if ( null != value )
  +            if( null != value )
               {
                   final Class valueClass = Class.forName( type );
                   value = c_valueConverter.convert( valueClass, value, null );
  
  
  
  1.3       +9 -9      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JLoggerAdapter.java
  
  Index: MX4JLoggerAdapter.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JLoggerAdapter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MX4JLoggerAdapter.java	22 Feb 2003 04:03:27 -0000	1.2
  +++ MX4JLoggerAdapter.java	22 Feb 2003 05:34:45 -0000	1.3
  @@ -20,7 +20,7 @@
        * This is really bad.  A static way of introducing a logger to a tool.
        * @param logger the Avalon logger.
        */
  -    public static void setLogger(final org.apache.avalon.framework.logger.Logger logger)
  +    public static void setLogger( final org.apache.avalon.framework.logger.Logger logger )
       {
           avalonLogger = logger;
       }
  @@ -33,27 +33,27 @@
        * @param message the message to log.
        * @param throwable a message that may be sent.
        */
  -    protected void log(final int level, final Object message, final Throwable throwable)
  +    protected void log( final int level, final Object message, final Throwable throwable )
       {
  -        switch (level)
  +        switch( level )
           {
               case mx4j.log.Logger.DEBUG:
  -                avalonLogger.debug(message.toString(), throwable);
  +                avalonLogger.debug( message.toString(), throwable );
                   break;
               case mx4j.log.Logger.ERROR:
  -                avalonLogger.error(message.toString(), throwable);
  +                avalonLogger.error( message.toString(), throwable );
                   break;
               case mx4j.log.Logger.FATAL:
  -                avalonLogger.fatalError(message.toString(), throwable);
  +                avalonLogger.fatalError( message.toString(), throwable );
                   break;
               case mx4j.log.Logger.INFO:
  -                avalonLogger.info(message.toString(), throwable);
  +                avalonLogger.info( message.toString(), throwable );
                   break;
               case mx4j.log.Logger.TRACE:
  -                avalonLogger.debug(message.toString(), throwable);
  +                avalonLogger.debug( message.toString(), throwable );
                   break;
               case mx4j.log.Logger.WARN:
  -                avalonLogger.warn(message.toString(), throwable);
  +                avalonLogger.warn( message.toString(), throwable );
                   break;
           }
       }
  
  
  
  1.24      +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
  
  Index: MX4JSystemManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- MX4JSystemManager.java	22 Feb 2003 05:09:29 -0000	1.23
  +++ MX4JSystemManager.java	22 Feb 2003 05:34:45 -0000	1.24
  @@ -233,7 +233,7 @@
               final ObjectName objectName = new ObjectName( name );
               mBeanServer.invoke( objectName, "stop", null, null );
           }
  -        catch ( final Exception e )
  +        catch( final Exception e )
           {
               final String message =
                   REZ.getString( "jmxmanager.error.jmxmbean.dispose", name );
  
  
  
  1.4       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java
  
  Index: ComponentMetaDataConverter.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ComponentMetaDataConverter.java	22 Feb 2003 04:03:28 -0000	1.3
  +++ ComponentMetaDataConverter.java	22 Feb 2003 05:34:45 -0000	1.4
  @@ -86,7 +86,7 @@
                                              listeners[ i ].getImplementationKey() );
               listenerSet.add( listener );
           }
  -        return (BlockListenerMetaData[])listenerSet.toArray( new BlockListenerMetaData[listenerSet.size() ] );
  +        return (BlockListenerMetaData[])listenerSet.toArray( new BlockListenerMetaData[ listenerSet.size() ] );
       }
   
       /**
  
  
  
  1.3       +1 -3      avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/factory/DefaultComponentFactory.java
  
  Index: DefaultComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/factory/DefaultComponentFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultComponentFactory.java	22 Feb 2003 04:03:28 -0000	1.2
  +++ DefaultComponentFactory.java	22 Feb 2003 05:34:45 -0000	1.3
  @@ -93,8 +93,6 @@
           return clazz.newInstance();
       }
   
  -
  -
       /**
        * Create a bundle for specified key.
        * Note that this does not cache bundle in any way.
  
  
  
  1.3       +5 -5      avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/AbstractServiceKernel.java
  
  Index: AbstractServiceKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/AbstractServiceKernel.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractServiceKernel.java	22 Feb 2003 04:03:28 -0000	1.2
  +++ AbstractServiceKernel.java	22 Feb 2003 05:34:45 -0000	1.3
  @@ -326,7 +326,7 @@
           {
               final String message =
                   REZ.getString( "app.error.run-phase",
  -                               startup ? "0":"1",
  +                               startup ? "0" : "1",
                                  name,
                                  e.getMessage() );
               getLogger().error( message, e );
  @@ -361,7 +361,7 @@
               final String message =
                   REZ.getString( "components-processing",
                                  count,
  -                               startup ? "0":"1",
  +                               startup ? "0" : "1",
                                  pathList );
               getLogger().info( message );
           }
  @@ -380,10 +380,10 @@
           if( getLogger().isDebugEnabled() )
           {
               final String key =
  -                completed ? "processed-component": "process-component";
  +                completed ? "processed-component" : "process-component";
               final String message =
                   REZ.getString( key,
  -                               startup ? "0":"1",
  +                               startup ? "0" : "1",
                                  name );
               getLogger().debug( message );
           }
  
  
  
  1.3       +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/lifecycle/LifecycleHelper.java
  
  Index: LifecycleHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/lifecycle/LifecycleHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LifecycleHelper.java	22 Feb 2003 04:03:28 -0000	1.2
  +++ LifecycleHelper.java	22 Feb 2003 05:34:45 -0000	1.3
  @@ -62,7 +62,7 @@
        * @param name the name of the component
        * @param entry the entry representing object
        * @param provider the resource provider
  -     * @return the newly created component 
  +     * @return the newly created component
        * @throws LifecycleException if an error occurs when the component passes
        *     through a specific lifecycle stage
        */
  
  
  
  1.21      +0 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java
  
  Index: CLISetup.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CLISetup.java	22 Feb 2003 04:03:29 -0000	1.20
  +++ CLISetup.java	22 Feb 2003 05:34:46 -0000	1.21
  @@ -129,7 +129,6 @@
                                       CONFIGFILE_OPT,
                                       REZ.getString( "cli.opt.configfile.desc" ) );
   
  -
           return options;
       }
   
  
  
  
  1.19      +0 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Kernel.java	25 Jan 2003 15:47:18 -0000	1.18
  +++ Kernel.java	22 Feb 2003 05:34:46 -0000	1.19
  @@ -37,7 +37,6 @@
       void removeApplication( String name )
           throws Exception;
   
  -
       /**
        * Gets the named application
        *
  
  
  
  1.15      +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java
  
  Index: DaemonLauncher.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DaemonLauncher.java	15 Sep 2002 02:07:31 -0000	1.14
  +++ DaemonLauncher.java	22 Feb 2003 05:34:46 -0000	1.15
  @@ -127,7 +127,7 @@
           }
           else
           {
  -            final String command = (null != arg) ? arg.toString() : "";
  +            final String command = ( null != arg ) ? arg.toString() : "";
               if( command.equals( "restart" ) )
               {
                   if( WrapperManager.isDebugEnabled() )
  
  
  
  1.3       +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/FreeNEasyPolicy.java
  
  Index: FreeNEasyPolicy.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/FreeNEasyPolicy.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FreeNEasyPolicy.java	2 Oct 2002 11:25:56 -0000	1.2
  +++ FreeNEasyPolicy.java	22 Feb 2003 05:34:46 -0000	1.3
  @@ -3,7 +3,7 @@
    * User: peter
    * Date: Sep 21, 2002
    * Time: 11:19:40 AM
  - * To change template for new class use 
  + * To change template for new class use
    * Code Style | Class Templates options (Tools | IDE Options).
    */
   package org.apache.avalon.phoenix.launcher;
  
  
  
  1.3       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/JMXLauncher.java
  
  Index: JMXLauncher.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/JMXLauncher.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JMXLauncher.java	22 Feb 2003 04:03:29 -0000	1.2
  +++ JMXLauncher.java	22 Feb 2003 05:34:46 -0000	1.3
  @@ -271,7 +271,7 @@
               m_frontend = clazz.newInstance();
   
               //kick the tires and light the fires....
  -            final Integer integer = (Integer) startupMethod.invoke(
  +            final Integer integer = (Integer)startupMethod.invoke(
                   m_frontend, new Object[]{args, data, new Boolean( false )} );
               exitCode = integer.intValue();
   
  @@ -323,7 +323,7 @@
               }
           }
   
  -        return (URL[]) urls.toArray( new URL[ urls.size() ] );
  +        return (URL[])urls.toArray( new URL[ urls.size() ] );
       }
   
       /**
  
  
  
  1.2       +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/LauncherUtils.java
  
  Index: LauncherUtils.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/LauncherUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LauncherUtils.java	21 Sep 2002 01:18:55 -0000	1.1
  +++ LauncherUtils.java	22 Feb 2003 05:34:46 -0000	1.2
  @@ -45,7 +45,7 @@
               }
           }
   
  -        return (URL[]) urls.toArray( new URL[ urls.size() ] );
  +        return (URL[])urls.toArray( new URL[ urls.size() ] );
       }
   
       /**
  
  
  
  1.27      +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Main.java	22 Feb 2003 04:03:29 -0000	1.26
  +++ Main.java	22 Feb 2003 05:34:46 -0000	1.27
  @@ -82,7 +82,7 @@
               c_frontend = clazz.newInstance();
   
               //kick the tires and light the fires....
  -            final Integer integer = (Integer) method.invoke(
  +            final Integer integer = (Integer)method.invoke(
                   c_frontend, new Object[]{args, data, new Boolean( blocking )} );
               exitCode = integer.intValue();
           }
  
  
  
  1.8       +3 -3      avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/DTDResolver.java
  
  Index: DTDResolver.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/DTDResolver.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DTDResolver.java	6 Aug 2002 11:57:42 -0000	1.7
  +++ DTDResolver.java	22 Feb 2003 05:34:46 -0000	1.8
  @@ -54,8 +54,8 @@
           {
               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 =
  
  
  
  1.6       +1 -1      avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/metagenerate/MetaGenerateTask.java
  
  Index: MetaGenerateTask.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/metagenerate/MetaGenerateTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MetaGenerateTask.java	22 Feb 2003 04:03:30 -0000	1.5
  +++ MetaGenerateTask.java	22 Feb 2003 05:34:46 -0000	1.6
  @@ -43,7 +43,7 @@
       {
           final FormatEnum format = new FormatEnum();
           format.setValue( "legacy" );
  -        setFormat( format);
  +        setFormat( format );
           super.execute();
           outputClasses();
       }
  
  
  
  1.3       +4 -4      avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/metagenerate/NamedXmlSnippet.java
  
  Index: NamedXmlSnippet.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/metagenerate/NamedXmlSnippet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamedXmlSnippet.java	22 Feb 2003 04:03:30 -0000	1.2
  +++ NamedXmlSnippet.java	22 Feb 2003 05:34:46 -0000	1.3
  @@ -21,7 +21,7 @@
        * @param name The node name
        * @param xml the XML
        */
  -    public NamedXmlSnippet(final String name, final String xml)
  +    public NamedXmlSnippet( final String name, final String xml )
       {
           this.m_name = name;
           this.m_xml = xml;
  @@ -50,9 +50,9 @@
        * @param object The object to compare to.
        * @return whichever is order precidence
        */
  -    public int compareTo(final Object object)
  +    public int compareTo( final Object object )
       {
  -        final NamedXmlSnippet attr = (NamedXmlSnippet) object;
  -        return m_name.compareTo(attr.getName());
  +        final NamedXmlSnippet attr = (NamedXmlSnippet)object;
  +        return m_name.compareTo( attr.getName() );
       }
   }
  
  
  
  1.4       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlockEntry.java
  
  Index: PUnitBlockEntry.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlockEntry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PUnitBlockEntry.java	22 Feb 2003 04:03:30 -0000	1.3
  +++ PUnitBlockEntry.java	22 Feb 2003 05:34:47 -0000	1.4
  @@ -28,8 +28,8 @@
        * @param resourceProvider The resource provider for the block
        */
       public PUnitBlockEntry( final String blockName,
  -                       final Object block,
  -                       final ResourceProvider resourceProvider )
  +                            final Object block,
  +                            final ResourceProvider resourceProvider )
       {
           m_blockName = blockName;
           m_block = block;
  
  
  
  1.4       +3 -3      avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitHelper.java
  
  Index: PUnitHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitHelper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PUnitHelper.java	22 Feb 2003 04:03:30 -0000	1.3
  +++ PUnitHelper.java	22 Feb 2003 05:34:47 -0000	1.4
  @@ -68,9 +68,9 @@
        * @param configuration The configuration
        */
       public void addBlock( final String blockName,
  -                             final String serviceName,
  -                             final Object block,
  -                             final Configuration configuration )
  +                          final String serviceName,
  +                          final Object block,
  +                          final Configuration configuration )
       {
           final PUnitResourceProvider resourceProvider =
               new PUnitResourceProvider( m_serviceManager, configuration, m_logger );
  
  
  
  1.11      +4 -5      avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java
  
  Index: PUnitTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PUnitTestCase.java	22 Feb 2003 04:03:30 -0000	1.10
  +++ PUnitTestCase.java	22 Feb 2003 05:34:47 -0000	1.11
  @@ -19,7 +19,6 @@
   {
       private final PUnitHelper m_pUnitHelper = new PUnitHelper();
   
  -
       /**
        * PUnitTestCase
        */
  @@ -75,11 +74,11 @@
        * @param configuration The configuration
        */
       public void addBlock( final String blockName,
  -                             final String serviceName,
  -                             final Object block,
  -                             final Configuration configuration )
  +                          final String serviceName,
  +                          final Object block,
  +                          final Configuration configuration )
       {
  -        m_pUnitHelper.addBlock(blockName, serviceName, block, configuration);
  +        m_pUnitHelper.addBlock( blockName, serviceName, block, configuration );
       }
   
       /**
  
  
  

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


Mime
View raw message