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/verifier SarVerifier.java
Date Fri, 10 May 2002 02:43:05 GMT
donaldp     02/05/09 19:43:04

  Modified:    src/java/org/apache/avalon/phoenix/components/application
                        BlockInvocationHandler.java DefaultApplication.java
                        LifecycleHelper.java
               src/java/org/apache/avalon/phoenix/components/classloader
                        AbstractPolicy.java DefaultClassLoaderManager.java
                        PolicyClassLoader.java
               src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
               src/java/org/apache/avalon/phoenix/components/embeddor
                        DefaultEmbeddor.java SingleAppEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultApplicationContext.java DefaultKernel.java
               src/java/org/apache/avalon/phoenix/components/logger
                        SimpleLogKitManager.java
               src/java/org/apache/avalon/phoenix/components/manager
                        AbstractSystemManager.java DefaultManager.java
                        MX4JSystemManager.java
               src/java/org/apache/avalon/phoenix/components/manager/rmiadaptor
                        RMIAdaptor.java
               src/java/org/apache/avalon/phoenix/frontends CLIMain.java
               src/java/org/apache/avalon/phoenix/interfaces
                        ApplicationContext.java ApplicationMBean.java
                        ClassLoaderManager.java Deployer.java
                        EmbeddorMBean.java SystemManager.java
               src/java/org/apache/avalon/phoenix/launcher Main.java
               src/java/org/apache/avalon/phoenix/tools/assembler
                        Assembler.java
               src/java/org/apache/avalon/phoenix/tools/infobuilder
                        BlockInfoBuilder.java
               src/java/org/apache/avalon/phoenix/tools/installer
                        Installer.java
               src/java/org/apache/avalon/phoenix/tools/verifier
                        SarVerifier.java
  Log:
  @exception --> @throws
  
  Revision  Changes    Path
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BlockInvocationHandler.java	11 Dec 2001 10:13:33 -0000	1.4
  +++ BlockInvocationHandler.java	10 May 2002 02:43:03 -0000	1.5
  @@ -27,7 +27,7 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/12/11 10:13:33 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/05/10 02:43:03 $
    */
   final class BlockInvocationHandler
       implements InvocationHandler
  @@ -77,7 +77,7 @@
        * @param method the method invoked on proxy object
        * @param args the arguments supplied to method
        * @return the return value of method
  -     * @exception Throwable if an error occurs
  +     * @throws Throwable if an error occurs
        */
       public Object invoke( final Object proxy,
                             final Method method,
  
  
  
  1.15      +8 -8      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultApplication.java	1 May 2002 09:15:50 -0000	1.14
  +++ DefaultApplication.java	10 May 2002 02:43:03 -0000	1.15
  @@ -68,8 +68,8 @@
        * This is only valid when isRunning() returns false,
        * otherwise it will generate an IllegalStateException.
        *
  -     * @exception IllegalStateException if application is already running
  -     * @exception ApplicationException if the application failed to start.
  +     * @throws IllegalStateException if application is already running
  +     * @throws ApplicationException if the application failed to start.
        *            the message part of exception will contain more information
        *            pertaining to why the application failed to startup
        */
  @@ -116,8 +116,8 @@
        * This is equivelent to  calling stop() and then start()
        * in succession.
        *
  -     * @exception IllegalStateException if application is not already running
  -     * @exception ApplicationException if the application failed to stop or start.
  +     * @throws IllegalStateException if application is not already running
  +     * @throws ApplicationException if the application failed to stop or start.
        *            the message part of exception will contain more information
        *            pertaining to why the application failed to startup/shutdown
        */
  @@ -133,8 +133,8 @@
        * This is only valid when isRunning() returns true,
        * otherwise it will generate an IllegalStateException.
        *
  -     * @exception IllegalStateException if application is not already running
  -     * @exception ApplicationException if the application failed to shutdown.
  +     * @throws IllegalStateException if application is not already running
  +     * @throws ApplicationException if the application failed to shutdown.
        *            the message part of exception will contain more information
        *            pertaining to why the application failed to shutodwn
        */
  @@ -293,7 +293,7 @@
        * Exceptions leave the blocks in an indeterminate state.
        *
        * @param name the name of phase (for logging purposes)
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private final void runPhase( final String name )
           throws Exception
  @@ -317,7 +317,7 @@
        * has already been setup.
        *
        * @param name the name of phase (for logging purposes)
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private final void doRunPhase( final String name )
           throws Exception
  
  
  
  1.33      +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java
  
  Index: LifecycleHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- LifecycleHelper.java	24 Mar 2002 12:18:25 -0000	1.32
  +++ LifecycleHelper.java	10 May 2002 02:43:03 -0000	1.33
  @@ -114,7 +114,7 @@
        * object if appropriate.
        *
        * @param metaData the BlockListenerMetaData
  -     * @exception Exception if an error occurs when listener passes
  +     * @throws Exception if an error occurs when listener passes
        *            through a specific lifecycle stage
        */
       public void startupListener( final BlockListenerMetaData metaData )
  @@ -183,7 +183,7 @@
        * cause exceptions with useful messages to be raised.
        *
        * @param entry the entry containing Block
  -     * @exception Exception if an error occurs when block passes
  +     * @throws Exception if an error occurs when block passes
        *            through a specific lifecycle stage
        */
       public void startup( final BlockEntry entry )
  @@ -430,7 +430,7 @@
        *
        * @param metaData the BlockMetaData
        * @return the newly created Block object
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private Block createBlock( final BlockMetaData metaData )
           throws Exception
  @@ -460,7 +460,7 @@
        *
        * @param name the name of component
        * @return the Configuration object
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private Configuration getConfiguration( final String name, final int type )
           throws ConfigurationException
  @@ -560,7 +560,7 @@
        * @param name the name of block that caused failure
        * @param stage the stage
        * @param t the exception thrown
  -     * @exception Exception containing error
  +     * @throws Exception containing error
        */
       private void fail( final String name, final int stage, final Throwable t )
           throws Exception
  
  
  
  1.6       +1 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractPolicy.java	16 Mar 2002 00:11:54 -0000	1.5
  +++ AbstractPolicy.java	10 May 2002 02:43:03 -0000	1.6
  @@ -95,7 +95,7 @@
        * @param location the location of codes to apply permission set to.
        * @param signers a comma seperated string of thos who signed codebase
        * @return the new permission set
  -     * @exception MalformedURLException if location string is malformed
  +     * @throws MalformedURLException if location string is malformed
        */
       protected Permissions createPermissionSetFor( final String location,
                                                     final Certificate[] signers )
  
  
  
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- DefaultClassLoaderManager.java	18 Apr 2002 10:46:13 -0000	1.27
  +++ DefaultClassLoaderManager.java	10 May 2002 02:43:03 -0000	1.28
  @@ -76,7 +76,7 @@
        * </ul>
        *
        * @param context the context
  -     * @exception ContextException if context does not contain common classloader
  +     * @throws ContextException if context does not contain common classloader
        */
       public void contextualize( Context context )
           throws ContextException
  @@ -103,7 +103,7 @@
        * @param homeDirectory the base directory of application
        * @param classPath the list of URLs in applications deployment
        * @return the ClassLoader created
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       public ClassLoader createClassLoader( final Configuration environment,
                                             final File source,
  @@ -249,7 +249,7 @@
        *
        * @param configuration the configuration data
        * @param baseDirectory the applications base directory
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private Policy configurePolicy( final Configuration configuration,
                                       final File baseDirectory )
  
  
  
  1.15      +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PolicyClassLoader.java
  
  Index: PolicyClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PolicyClassLoader.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PolicyClassLoader.java	11 Dec 2001 10:13:33 -0000	1.14
  +++ PolicyClassLoader.java	10 May 2002 02:43:03 -0000	1.15
  @@ -113,7 +113,7 @@
        *
        * @param name the name of resource to look for
        * @return the Enumeration of resources
  -     * @exception IOException if an input/output error occurs
  +     * @throws IOException if an input/output error occurs
        */
       public Enumeration findResources( final String name )
           throws IOException
  @@ -166,7 +166,7 @@
        *
        * @param classPath the string representation of urls
        * @return the URL array
  -     * @exception MalformedURLException if an error occurs
  +     * @throws MalformedURLException if an error occurs
        */
       private URL[] createURLs( final String[] classPath )
           throws MalformedURLException
  @@ -187,7 +187,7 @@
        * using our <code>URLStreamHandlerFactory</code> object.
        *
        * @param url the string representation of URL
  -     * @exception MalformedURLException if URL is badly formed or
  +     * @throws MalformedURLException if URL is badly formed or
        *            protocol can not be found
        */
       private URL createURL( final String url )
  @@ -209,7 +209,7 @@
        *
        * @param scheme the scheme/protocol to create handler for
        * @return the created URLStreamHandler or null
  -     * @exception MalformedURLException if an error occurs
  +     * @throws MalformedURLException if an error occurs
        */
       private URLStreamHandler createHandler( final String scheme )
           throws MalformedURLException
  @@ -229,7 +229,7 @@
        *
        * @param url the full string representation of url
        * @return the scheme part of URL
  -     * @exception MalformedURLException if an error occurs
  +     * @throws MalformedURLException if an error occurs
        */
       private String parseScheme( final String url )
           throws MalformedURLException
  
  
  
  1.22      +9 -9      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- DefaultDeployer.java	18 Apr 2002 20:16:17 -0000	1.21
  +++ DefaultDeployer.java	10 May 2002 02:43:03 -0000	1.22
  @@ -65,7 +65,7 @@
        * Retrieve relevant services needed to deploy.
        *
        * @param componentManager the ComponentManager
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       public void compose( final ComponentManager componentManager )
           throws ComponentException
  @@ -89,7 +89,7 @@
        * Undeploy an application.
        *
        * @param name the name of deployment
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       public void undeploy( final String name )
           throws DeploymentException
  @@ -118,19 +118,19 @@
               throw new DeploymentException( e.getMessage(), e );
           }
       }
  -    
  -    
  +
  +
       /**
        * Deploy an application from an installation.
        *
        * @param name the name of application
        * @param sarURL the location to deploy from represented as String
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       public void deploy( final String name, final String sarURL )
           throws DeploymentException
       {
  -        try 
  +        try
           {
   	        deploy( name, new URL( sarURL ) );
           }
  @@ -146,7 +146,7 @@
        *
        * @param name the name of application
        * @param location the location to deploy from
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       public void deploy( final String name, final URL location )
           throws DeploymentException
  @@ -212,7 +212,7 @@
        *
        * @param location the location of configuration data as a url
        * @return the Configuration
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       private Configuration getConfigurationFor( final String location )
           throws DeploymentException
  @@ -235,7 +235,7 @@
        * @param appName the name of Application.
        * @param metaData the SarMetaData.
        * @param configurations the block configurations.
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       private void setupConfiguration( final String appName,
                                        final SarMetaData metaData,
  
  
  
  1.54      +6 -6      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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- DefaultEmbeddor.java	27 Mar 2002 11:17:34 -0000	1.53
  +++ DefaultEmbeddor.java	10 May 2002 02:43:03 -0000	1.54
  @@ -151,7 +151,7 @@
        * </ul>
        *
        * @param parameters the Parameters for embeddor
  -     * @exception ParameterException if an error occurs
  +     * @throws ParameterException if an error occurs
        */
       public synchronized void parameterize( final Parameters parameters )
           throws ParameterException
  @@ -317,7 +317,7 @@
       /**
        * Ask the embeddor to restart itself if this operation is supported.
        *
  -     * @exception UnsupportedOperationException if restart not supported
  +     * @throws UnsupportedOperationException if restart not supported
        */
       public void restart()
           throws UnsupportedOperationException
  @@ -431,7 +431,7 @@
        * default-apps-location specified in Parameters.
        * TODO: load facilities from .fars as well.
        *
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       protected void deployDefaultApplications()
           throws Exception
  @@ -500,7 +500,7 @@
        * setup lifecycle stages.
        *
        * @param component the component
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private void setupComponent( final Component component, final String loggerName, Configuration config )
           throws Exception
  @@ -548,7 +548,7 @@
        * shutdown lifecycle stages.
        *
        * @param component the component
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private void shutdownComponent( final Component component )
           throws Exception
  @@ -570,7 +570,7 @@
        * @param component the name of the component
        * @param clazz the name of interface/type
        * @return the created object
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private Object createComponent( final String component, final Class clazz )
           throws Exception
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- SingleAppEmbeddor.java	21 Mar 2002 04:39:14 -0000	1.18
  +++ SingleAppEmbeddor.java	10 May 2002 02:43:03 -0000	1.19
  @@ -38,7 +38,7 @@
       /**
        * Deploy a single application.
        *
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       protected void deployDefaultApplications()
           throws Exception
  
  
  
  1.13      +2 -2      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultApplicationContext.java	28 Apr 2002 14:19:12 -0000	1.12
  +++ DefaultApplicationContext.java	10 May 2002 02:43:03 -0000	1.13
  @@ -86,7 +86,7 @@
        * Configure frame.
        *
        * @param configuration the configuration data
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public void configure( final Configuration configuration )
           throws ConfigurationException
  @@ -197,7 +197,7 @@
        *
        * @param name the name of thread pool
        * @return the threadpool
  -     * @exception IllegalArgumentException if the name of thread pool is
  +     * @throws IllegalArgumentException if the name of thread pool is
        *            invalid or named pool does not exist
        */
       public ThreadPool getThreadPool( final String name )
  
  
  
  1.58      +1 -1      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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- DefaultKernel.java	30 Apr 2002 15:54:53 -0000	1.57
  +++ DefaultKernel.java	10 May 2002 02:43:03 -0000	1.58
  @@ -108,7 +108,7 @@
        * Create and initialize the application instance if it is not already initialized.
        *
        * @param entry the entry for application
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private void startup( final SarEntry entry )
           throws Exception
  
  
  
  1.10      +2 -2      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SimpleLogKitManager.java	16 Mar 2002 00:11:55 -0000	1.9
  +++ SimpleLogKitManager.java	10 May 2002 02:43:03 -0000	1.10
  @@ -76,7 +76,7 @@
        *
        * @param targets the target configuration data
        * @return a Map of target-name to target
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private HashMap configureTargets( final Configuration[] targets )
           throws ConfigurationException
  @@ -124,7 +124,7 @@
        *
        * @param categories configuration data for categories
        * @param targets a hashmap containing the already existing taregt
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private void configureCategories( final Configuration[] categories, final HashMap targets )
           throws ConfigurationException
  
  
  
  1.9       +11 -11    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractSystemManager.java	11 Dec 2001 10:13:34 -0000	1.8
  +++ AbstractSystemManager.java	10 May 2002 02:43:04 -0000	1.9
  @@ -49,10 +49,10 @@
        * @param name the name to register object under
        * @param object the object
        * @param interfaces the interfaces to register the component under
  -     * @exception ManagerException if an error occurs. An error could occur if the object doesn't
  +     * @throws ManagerException if an error occurs. An error could occur if the object doesn't
        *            implement the interfaces, the interfaces parameter contain non-instance
        *            classes, the name is already registered etc.
  -     * @exception IllegalArgumentException if object or interfaces is null
  +     * @throws IllegalArgumentException if object or interfaces is null
        */
       public synchronized void register( final String name, final Object object, final Class[] interfaces )
           throws ManagerException, IllegalArgumentException
  @@ -81,8 +81,8 @@
        *
        * @param name the name to register object under
        * @param object the object
  -     * @exception ManagerException if an error occurs such as name already registered.
  -     * @exception IllegalArgumentException if object is null
  +     * @throws ManagerException if an error occurs such as name already registered.
  +     * @throws IllegalArgumentException if object is null
        */
       public synchronized void register( final String name, final Object object )
           throws ManagerException, IllegalArgumentException
  @@ -101,7 +101,7 @@
        * Unregister named object.
        *
        * @param name the name of object to unregister
  -     * @exception ManagerException if an error occurs such as when no such object registered.
  +     * @throws ManagerException if an error occurs such as when no such object registered.
        */
       public synchronized void unregister( final String name )
           throws ManagerException
  @@ -126,7 +126,7 @@
        * @param object the object
        * @param interfaces the interfaces
        * @return the exported object
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       protected abstract Object export( String name, Object object, Class[] interfaces )
           throws ManagerException;
  @@ -136,7 +136,7 @@
        *
        * @param name the name of object
        * @param exportedObject the object return by export
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       protected abstract void unexport( String name, Object exportedObject )
           throws ManagerException;
  @@ -145,7 +145,7 @@
        * Verify that an interface conforms to the requirements of management medium.
        *
        * @param clazz the interface class
  -     * @exception ManagerException if verification fails
  +     * @throws ManagerException if verification fails
        */
       protected abstract void verifyInterface( Class clazz )
           throws ManagerException;
  @@ -156,7 +156,7 @@
        *
        * @param object the object
        * @param interfaces the array of interfaces to check
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       private void verifyInterfaces( final Object object, final Class[] interfaces )
           throws ManagerException
  @@ -189,8 +189,8 @@
        *
        * @param name the name of object
        * @param object the object to be registered
  -     * @exception ManagerException if name already exists
  -     * @exception IllegalArgumentException if name or object is null
  +     * @throws ManagerException if name already exists
  +     * @throws IllegalArgumentException if name or object is null
        */
       private void checkRegister( final String name, final Object object )
           throws ManagerException, IllegalArgumentException
  
  
  
  1.19      +5 -5      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DefaultManager.java	18 Apr 2002 20:16:17 -0000	1.18
  +++ DefaultManager.java	10 May 2002 02:43:04 -0000	1.19
  @@ -91,7 +91,7 @@
        * Retrieve relevant services needed to deploy.
        *
        * @param componentManager the ComponentManager
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       public void compose( final ComponentManager componentManager )
           throws ComponentException
  @@ -184,7 +184,7 @@
        * @param object the object
        * @param interfaces the interfaces
        * @return the exported object
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       protected Object export( final String name,
                                final Object object,
  @@ -226,7 +226,7 @@
        *
        * @param object the object to create MBean for
        * @return the MBean to be exported
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       private Object createMBean( final Object object )
           throws ManagerException
  @@ -247,7 +247,7 @@
        *
        * @param name the name of object
        * @param exportedObject the object return by export
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       protected void unexport( final String name,
                                final Object exportedObject )
  @@ -269,7 +269,7 @@
        * Verify that an interface conforms to the requirements of management medium.
        *
        * @param clazz the interface class
  -     * @exception ManagerException if verification fails
  +     * @throws ManagerException if verification fails
        */
       protected void verifyInterface( final Class clazz )
           throws ManagerException
  
  
  
  1.3       +5 -5      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MX4JSystemManager.java	18 Apr 2002 20:16:17 -0000	1.2
  +++ MX4JSystemManager.java	10 May 2002 02:43:04 -0000	1.3
  @@ -71,7 +71,7 @@
        * Retrieve relevant services needed to deploy.
        *
        * @param componentManager the ComponentManager
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       public void compose( final ComponentManager componentManager )
           throws ComponentException
  @@ -156,7 +156,7 @@
        * @param object the object
        * @param interfaces the interfaces
        * @return the exported object
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       protected Object export( final String name,
                                final Object object,
  @@ -198,7 +198,7 @@
        *
        * @param object the object to create MBean for
        * @return the MBean to be exported
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       private Object createMBean( final Object object )
           throws ManagerException
  @@ -219,7 +219,7 @@
        *
        * @param name the name of object
        * @param exportedObject the object return by export
  -     * @exception ManagerException if an error occurs
  +     * @throws ManagerException if an error occurs
        */
       protected void unexport( final String name,
                                final Object exportedObject )
  @@ -241,7 +241,7 @@
        * Verify that an interface conforms to the requirements of management medium.
        *
        * @param clazz the interface class
  -     * @exception ManagerException if verification fails
  +     * @throws ManagerException if verification fails
        */
       protected void verifyInterface( final Class clazz )
           throws ManagerException
  
  
  
  1.3       +102 -102  jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/rmiadaptor/RMIAdaptor.java
  
  Index: RMIAdaptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/rmiadaptor/RMIAdaptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RMIAdaptor.java	7 Apr 2002 08:30:07 -0000	1.2
  +++ RMIAdaptor.java	10 May 2002 02:43:04 -0000	1.3
  @@ -37,7 +37,7 @@
    * to remote operations.
    *
    * @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2002/04/07 08:30:07 $
  + * @version CVS $Revision: 1.3 $ $Date: 2002/05/10 02:43:04 $
    */
   public interface RMIAdaptor
       extends Remote
  @@ -51,13 +51,13 @@
        *
        * @param className The class name of the object to be instantiated.
        * @return The newly instantiated object.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or the <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      object's constructor.
  -     * @exception javax.management.MBeanException The constructor of the object has thrown an
  +     * @throws javax.management.MBeanException The constructor of the object has thrown an
        *      exception
  -     * @exception RemoteException RMI Exception
  +     * @throws RemoteException RMI Exception
        */
       Object instantiate( String className )
           throws ReflectionException, MBeanException, RemoteException;
  @@ -72,15 +72,15 @@
        * @param className The class name of the MBean to be instantiated.
        * @param loaderName The object name of the class loader to be used.
        * @return The newly instantiated object.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or the <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      object's constructor.
  -     * @exception javax.management.MBeanException The constructor of the object has thrown an
  +     * @throws javax.management.MBeanException The constructor of the object has thrown an
        *      exception.
  -     * @exception javax.management.InstanceNotFoundException The specified class loader is not
  +     * @throws javax.management.InstanceNotFoundException The specified class loader is not
        *      registered in the MBaenServer.
  -     * @exception java.rmi.RemoteException RMI Exception
  +     * @throws java.rmi.RemoteException RMI Exception
        */
       Object instantiate( String className, ObjectName loaderName )
           throws ReflectionException, MBeanException, InstanceNotFoundException, RemoteException;
  @@ -98,13 +98,13 @@
        * @param signature An array containing the signature of the constructor to
        *      be invoked.
        * @return The newly instantiated object.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or the <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      object's constructor.
  -     * @exception javax.management.MBeanException The constructor of the object has thrown an
  +     * @throws javax.management.MBeanException The constructor of the object has thrown an
        *      exception
  -     * @exception java.rmi.RemoteException RMI Exception
  +     * @throws java.rmi.RemoteException RMI Exception
        */
       Object instantiate( String className, Object params[], String signature[] )
           throws ReflectionException, MBeanException, RemoteException;
  @@ -123,15 +123,15 @@
        *      be invoked.
        * @param loaderName The object name of the class loader to be used.
        * @return The newly instantiated object.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or the <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      object's constructor.
  -     * @exception javax.management.MBeanException The constructor of the object has thrown an
  +     * @throws javax.management.MBeanException The constructor of the object has thrown an
        *      exception
  -     * @exception javax.management.InstanceNotFoundException The specified class loader is not
  +     * @throws javax.management.InstanceNotFoundException The specified class loader is not
        *      registered in the MBean server.
  -     * @exception RemoteException RMI Exception
  +     * @throws RemoteException RMI Exception
        */
       Object instantiate( String className, ObjectName loaderName, Object params[], String signature[] )
           throws ReflectionException, MBeanException, InstanceNotFoundException, RemoteException;
  @@ -150,20 +150,20 @@
        * @param name The object name of the MBean. May be null.
        * @return An <CODE>ObjectInstance</CODE> , containing the <CODE>ObjectName
        *      </CODE>and the Java class name of the newly instantiated MBean.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or a <CODE><CODE>
        *      java.lang.Exception</CODE></CODE> that occurred when trying to
        *      invoke the MBean's constructor.
  -     * @exception javax.management.InstanceAlreadyExistsException The MBean is already under the
  +     * @throws javax.management.InstanceAlreadyExistsException The MBean is already under the
        *      control of the MBean server.
  -     * @exception javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
  +     * @throws javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
        *      <CODE>MBeanRegistration</CODE> interface) method of the MBean has
        *      thrown an exception. The MBean will not be registered.
  -     * @exception javax.management.MBeanException The constructor of the MBean has thrown an
  +     * @throws javax.management.MBeanException The constructor of the MBean has thrown an
        *      exception
  -     * @exception javax.management.NotCompliantMBeanException This class is not a JMX compliant
  +     * @throws javax.management.NotCompliantMBeanException This class is not a JMX compliant
        *      MBean
  -     * @exception java.rmi.RemoteException RMI Exception
  +     * @throws java.rmi.RemoteException RMI Exception
        */
       ObjectInstance createMBean( String className, ObjectName name )
           throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException,
  @@ -184,22 +184,22 @@
        * @param loaderName The object name of the class loader to be used.
        * @return An <CODE>ObjectInstance</CODE> , containing the <CODE>ObjectName
        *      </CODE>and the Java class name of the newly instantiated MBean.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or a <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      MBean's constructor.
  -     * @exception javax.management.InstanceAlreadyExistsException The MBean is already under the
  +     * @throws javax.management.InstanceAlreadyExistsException The MBean is already under the
        *      control of the MBean server.
  -     * @exception javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
  +     * @throws javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
        *      <CODE>MBeanRegistration</CODE> interface) method of the MBean has
        *      thrown an exception. The MBean will not be registered.
  -     * @exception javax.management.MBeanException The constructor of the MBean has thrown an
  +     * @throws javax.management.MBeanException The constructor of the MBean has thrown an
        *      exception
  -     * @exception javax.management.NotCompliantMBeanException This class is not a JMX compliant
  +     * @throws javax.management.NotCompliantMBeanException This class is not a JMX compliant
        *      MBean
  -     * @exception javax.management.InstanceNotFoundException The specified class loader is not
  +     * @throws javax.management.InstanceNotFoundException The specified class loader is not
        *      registered in the MBean server.
  -     * @exception java.rmi.RemoteException RMI Exception
  +     * @throws java.rmi.RemoteException RMI Exception
        */
       ObjectInstance createMBean( String className, ObjectName name, ObjectName loaderName )
           throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException,
  @@ -223,19 +223,19 @@
        *      be invoked.
        * @return An <CODE>ObjectInstance</CODE> , containing the <CODE>ObjectName
        *      </CODE>and the Java class name of the newly instantiated MBean.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or a <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      MBean's constructor.
  -     * @exception javax.management.InstanceAlreadyExistsException The MBean is already under the
  +     * @throws javax.management.InstanceAlreadyExistsException The MBean is already under the
        *      control of the MBean server.
  -     * @exception javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
  +     * @throws javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
        *      <CODE>MBeanRegistration</CODE> interface) method of the MBean has
        *      thrown an exception. The MBean will not be registered.
  -     * @exception javax.management.MBeanException The constructor of the MBean has thrown an
  +     * @throws javax.management.MBeanException The constructor of the MBean has thrown an
        *      exception
  -     * @exception javax.management.NotCompliantMBeanException If the mBean is invalid form
  -     * @exception RemoteException RMI Exception
  +     * @throws javax.management.NotCompliantMBeanException If the mBean is invalid form
  +     * @throws RemoteException RMI Exception
        */
       ObjectInstance createMBean( String className, ObjectName name, Object params[], String signature[] )
           throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException,
  @@ -260,22 +260,22 @@
        * @param loaderName The object name of the class loader to be used.
        * @return An <CODE>ObjectInstance</CODE> , containing the <CODE>ObjectName
        *      </CODE>and the Java class name of the newly instantiated MBean.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>
        *      java.lang.ClassNotFoundException</CODE> or a <CODE>
        *      java.lang.Exception</CODE> that occurred when trying to invoke the
        *      MBean's constructor.
  -     * @exception javax.management.InstanceAlreadyExistsException The MBean is already under the
  +     * @throws javax.management.InstanceAlreadyExistsException The MBean is already under the
        *      control of the MBean server.
  -     * @exception javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
  +     * @throws javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
        *      <CODE>MBeanRegistration</CODE> interface) method of the MBean has
        *      thrown an exception. The MBean will not be registered.
  -     * @exception javax.management.MBeanException The constructor of the MBean has thrown an
  +     * @throws javax.management.MBeanException The constructor of the MBean has thrown an
        *      exception
  -     * @exception javax.management.InstanceNotFoundException The specified class loader is not
  +     * @throws javax.management.InstanceNotFoundException The specified class loader is not
        *      registered in the MBean server.
  -     * @exception javax.management.NotCompliantMBeanException DOC: Insert Description of
  +     * @throws javax.management.NotCompliantMBeanException DOC: Insert Description of
        *      Exception
  -     * @exception java.rmi.RemoteException RMI Exception
  +     * @throws java.rmi.RemoteException RMI Exception
        */
       ObjectInstance createMBean( String className,
                                   ObjectName name,
  @@ -296,14 +296,14 @@
        * @param name The object name of the MBean. May be null.
        * @return The <CODE>ObjectInstance</CODE> for the MBean that has been
        *      registered.
  -     * @exception javax.management.InstanceAlreadyExistsException The MBean is already under the
  +     * @throws javax.management.InstanceAlreadyExistsException The MBean is already under the
        *      control of the MBean server.
  -     * @exception javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
  +     * @throws javax.management.MBeanRegistrationException The <CODE>preRegister</CODE> (
        *      <CODE>MBeanRegistration</CODE> interface) method of the MBean has
        *      thrown an exception. The MBean will not be registered.
  -     * @exception javax.management.NotCompliantMBeanException This object is not a JMX compliant
  +     * @throws javax.management.NotCompliantMBeanException This object is not a JMX compliant
        *      MBean
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       ObjectInstance registerMBean( Object object, ObjectName name )
           throws InstanceAlreadyExistsException, MBeanRegistrationException,
  @@ -315,12 +315,12 @@
        * longer be accessed by its object name.
        *
        * @param name The object name of the MBean to be de-registered.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception javax.management.MBeanRegistrationException The preDeregister (( <CODE>
  +     * @throws javax.management.MBeanRegistrationException The preDeregister (( <CODE>
        *      MBeanRegistration</CODE> interface) method of the MBean has thrown
        *      an exception.
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       void unregisterMBean( ObjectName name )
           throws InstanceNotFoundException, MBeanRegistrationException, RemoteException;
  @@ -332,9 +332,9 @@
        * @param name The object name of the MBean.
        * @return The <CODE>ObjectInstance</CODE> associated to the MBean specified
        *      by <VAR>name</VAR> .
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       ObjectInstance getObjectInstance( ObjectName name )
           throws InstanceNotFoundException, RemoteException;
  @@ -357,7 +357,7 @@
        * @return A set containing the <CODE>ObjectInstance</CODE> objects for the
        *      selected MBeans. If no MBean satisfies the query an empty list is
        *      returned.
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       Set queryMBeans( ObjectName name, QueryExp query )
           throws RemoteException;
  @@ -379,7 +379,7 @@
        *      null no query expression will be applied for selecting MBeans.
        * @return A set containing the ObjectNames for the MBeans selected. If no
        *      MBean satisfies the query, an empty list is returned.
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       Set queryNames( ObjectName name, QueryExp query )
           throws RemoteException;
  @@ -391,7 +391,7 @@
        * @param name The object name of the MBean to be checked.
        * @return True if the MBean is already registered in the MBean server,
        *      false otherwise.
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       boolean isRegistered( ObjectName name )
           throws RemoteException;
  @@ -400,7 +400,7 @@
        * Returns the number of MBeans registered in the MBean server.
        *
        * @return The MBeanCount value
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       Integer getMBeanCount()
           throws RemoteException;
  @@ -414,15 +414,15 @@
        * @param attribute A String specifying the name of the attribute to be
        *      retrieved.
        * @return The value of the retrieved attribute.
  -     * @exception javax.management.AttributeNotFoundException The attribute specified is not
  +     * @throws javax.management.AttributeNotFoundException The attribute specified is not
        *      accessible in the MBean.
  -     * @exception javax.management.MBeanException Wraps an exception thrown by the MBean's
  +     * @throws javax.management.MBeanException Wraps an exception thrown by the MBean's
        *      getter.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>java.lang.Exception</CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>java.lang.Exception</CODE>
        *      thrown when trying to invoke the setter.
  -     * @exception java.rmi.RemoteException DOC: Insert Description of Exception
  +     * @throws java.rmi.RemoteException DOC: Insert Description of Exception
        */
       Object getAttribute( ObjectName name, String attribute )
           throws MBeanException, AttributeNotFoundException, InstanceNotFoundException,
  @@ -436,11 +436,11 @@
        *      retrieved.
        * @param attributes A list of the attributes to be retrieved.
        * @return The list of the retrieved attributes.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception javax.management.ReflectionException An exception occurred when trying to
  +     * @throws javax.management.ReflectionException An exception occurred when trying to
        *      invoke the getAttributes method of a Dynamic MBean.
  -     * @exception java.rmi.RemoteException RMI Exception
  +     * @throws java.rmi.RemoteException RMI Exception
        */
       AttributeList getAttributes( ObjectName name, String[] attributes )
           throws InstanceNotFoundException, ReflectionException, RemoteException;
  @@ -453,17 +453,17 @@
        *      set.
        * @param attribute The identification of the attribute to be set and the
        *      value it is to be set to.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception javax.management.AttributeNotFoundException The attribute specified is not
  +     * @throws javax.management.AttributeNotFoundException The attribute specified is not
        *      accessible in the MBean.
  -     * @exception javax.management.InvalidAttributeValueException The value specified for the
  +     * @throws javax.management.InvalidAttributeValueException The value specified for the
        *      attribute is not valid.
  -     * @exception javax.management.MBeanException Wraps an exception thrown by the MBean's
  +     * @throws javax.management.MBeanException Wraps an exception thrown by the MBean's
        *      setter.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>java.lang.Exception</CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>java.lang.Exception</CODE>
        *      thrown when trying to invoke the setter.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       void setAttribute( ObjectName name, Attribute attribute )
           throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException,
  @@ -478,11 +478,11 @@
        * @param attributes A list of attributes: The identification of the
        *      attributes to be set and the values they are to be set to.
        * @return The list of attributes that were set, with their new values.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception javax.management.ReflectionException An exception occurred when trying to
  +     * @throws javax.management.ReflectionException An exception occurred when trying to
        *      invoke the getAttributes method of a Dynamic MBean.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       AttributeList setAttributes( ObjectName name, AttributeList attributes )
           throws InstanceNotFoundException, ReflectionException, RemoteException;
  @@ -500,13 +500,13 @@
        *      used for loading the MBean on which the operation was invoked.
        * @return The object returned by the operation, which represents the result
        *      ofinvoking the operation on the MBean specified.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception javax.management.MBeanException Wraps an exception thrown by the MBean's
  +     * @throws javax.management.MBeanException Wraps an exception thrown by the MBean's
        *      invoked method.
  -     * @exception javax.management.ReflectionException Wraps a <CODE>java.lang.Exception</CODE>
  +     * @throws javax.management.ReflectionException Wraps a <CODE>java.lang.Exception</CODE>
        *      thrown while trying to invoke the method.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       Object invoke( ObjectName name, String operationName, Object params[], String signature[] )
           throws InstanceNotFoundException, MBeanException, ReflectionException, RemoteException;
  @@ -517,7 +517,7 @@
        * is specified by the user.
        *
        * @return The DefaultDomain value
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       String getDefaultDomain()
           throws RemoteException;
  @@ -532,9 +532,9 @@
        *      performed before handling notifications.
        * @param handback The context to be sent to the listener when a
        *      notification is emitted.
  -     * @exception javax.management.InstanceNotFoundException The MBean name provided does not
  +     * @throws javax.management.InstanceNotFoundException The MBean name provided does not
        *      match any of the registered MBeans.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       void addNotificationListener( ObjectName name,
                                     NotificationListener listener,
  @@ -552,10 +552,10 @@
        *      performed before handling notifications.
        * @param handback The context to be sent to the listener when a
        *      notification is emitted.
  -     * @exception javax.management.InstanceNotFoundException The MBean name of the notification
  +     * @throws javax.management.InstanceNotFoundException The MBean name of the notification
        *      listener or of the notification broadcaster does not match any of
        *      the registered MBeans.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       void addNotificationListener( ObjectName name,
                                     ObjectName listener,
  @@ -571,11 +571,11 @@
        * @param listener The listener object which will handle the notifications
        *      emitted by the registered MBean. This method will remove all the
        *      information related to this listener.
  -     * @exception javax.management.InstanceNotFoundException The MBean name provided does not
  +     * @throws javax.management.InstanceNotFoundException The MBean name provided does not
        *      match any of the registered MBeans.
  -     * @exception javax.management.ListenerNotFoundException The listener is not registered in
  +     * @throws javax.management.ListenerNotFoundException The listener is not registered in
        *      the MBean.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       void removeNotificationListener( ObjectName name, NotificationListener listener )
           throws InstanceNotFoundException, ListenerNotFoundException, RemoteException;
  @@ -588,11 +588,11 @@
        * @param listener The object name of the listener which will handle the
        *      notifications emitted by the registered MBean. This method will
        *      remove all the information related to this listener.
  -     * @exception javax.management.InstanceNotFoundException The MBean name provided does not
  +     * @throws javax.management.InstanceNotFoundException The MBean name provided does not
        *      match any of the registered MBeans.
  -     * @exception javax.management.ListenerNotFoundException The listener is not registered in
  +     * @throws javax.management.ListenerNotFoundException The listener is not registered in
        *      the MBean.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       void removeNotificationListener( ObjectName name, ObjectName listener )
           throws InstanceNotFoundException, ListenerNotFoundException, RemoteException;
  @@ -604,12 +604,12 @@
        * @param name The name of the MBean to analyze
        * @return An instance of <CODE>MBeanInfo</CODE> allowing the retrieval of
        *      all attributes and operations of this MBean.
  -     * @exception javax.management.IntrospectionException An exception occurs during
  +     * @throws javax.management.IntrospectionException An exception occurs during
        *      introspection.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not found.
  -     * @exception javax.management.ReflectionException An exception occurred when trying to
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not found.
  +     * @throws javax.management.ReflectionException An exception occurred when trying to
        *      invoke the getMBeanInfo of a Dynamic MBean.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       MBeanInfo getMBeanInfo( ObjectName name )
           throws InstanceNotFoundException, IntrospectionException, ReflectionException, RemoteException;
  @@ -622,9 +622,9 @@
        * @param className The name of the class.
        * @return true if the MBean specified is an instance of the specified
        *      class, false otherwise.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not
        *      registered in the MBean server.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       boolean isInstanceOf( ObjectName name, String className )
           throws InstanceNotFoundException, RemoteException;
  @@ -637,10 +637,10 @@
        *      the de-serialization.
        * @param data The byte array to be de-sererialized.
        * @return The de-serialized object stream.
  -     * @exception javax.management.InstanceNotFoundException The MBean specified is not found.
  -     * @exception javax.management.OperationsException Any of the usual Input/Output related
  +     * @throws javax.management.InstanceNotFoundException The MBean specified is not found.
  +     * @throws javax.management.OperationsException Any of the usual Input/Output related
        *      exceptions.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       ObjectInputStream deserialize( ObjectName name, byte[] data )
           throws InstanceNotFoundException, OperationsException, RemoteException;
  @@ -652,11 +652,11 @@
        * @param data The byte array to be de-sererialized.
        * @param className DOC: Insert Description of Parameter
        * @return The de-serialized object stream.
  -     * @exception javax.management.OperationsException Any of the usual Input/Output related
  +     * @throws javax.management.OperationsException Any of the usual Input/Output related
        *      exceptions.
  -     * @exception javax.management.ReflectionException The specified class could not be loaded by
  +     * @throws javax.management.ReflectionException The specified class could not be loaded by
        *      the default loader repository
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       ObjectInputStream deserialize( String className, byte[] data )
           throws OperationsException, ReflectionException, RemoteException;
  @@ -673,13 +673,13 @@
        *      used.
        * @param className DOC: Insert Description of Parameter
        * @return The de-serialized object stream.
  -     * @exception javax.management.InstanceNotFoundException The specified class loader MBean is
  +     * @throws javax.management.InstanceNotFoundException The specified class loader MBean is
        *      not found.
  -     * @exception javax.management.OperationsException Any of the usual Input/Output related
  +     * @throws javax.management.OperationsException Any of the usual Input/Output related
        *      exceptions.
  -     * @exception javax.management.ReflectionException The specified class could not be loaded by
  +     * @throws javax.management.ReflectionException The specified class could not be loaded by
        *      the specified class loader.
  -     * @exception RemoteException DOC: Insert Description of Exception
  +     * @throws RemoteException DOC: Insert Description of Exception
        */
       ObjectInputStream deserialize( String className, ObjectName loaderName, byte[] data )
           throws InstanceNotFoundException, OperationsException, ReflectionException, RemoteException;
  
  
  
  1.30      +4 -4      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- CLIMain.java	27 Mar 2002 11:19:40 -0000	1.29
  +++ CLIMain.java	10 May 2002 02:43:04 -0000	1.30
  @@ -45,9 +45,9 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( CLIMain.class );
   
  -    private static final String DEFAULT_LOG_FILE = 
  +    private static final String DEFAULT_LOG_FILE =
           File.separator + "logs" + File.separator + "phoenix.log";
  -    private static final String DEFAULT_CONF_FILE = 
  +    private static final String DEFAULT_CONF_FILE =
           File.separator + "conf" + File.separator + "kernel.xml";
   
       private final static String DEFAULT_FORMAT =
  @@ -91,7 +91,7 @@
               if( !parameters.isParameter( "phoenix.configfile" ) )
               {
                   final File configFile = new File( phoenixHome + DEFAULT_CONF_FILE );
  -                parameters.setParameter( "phoenix.configfile", 
  +                parameters.setParameter( "phoenix.configfile",
                                            configFile.getCanonicalFile().toString() );  // setting default
               }
   
  @@ -108,7 +108,7 @@
       /**
        * Actually create and execute the main component of embeddor.
        *
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private void execute( final Parameters parameters,
                             final Hashtable data,
  
  
  
  1.8       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
  
  Index: ApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ApplicationContext.java	9 Apr 2002 10:55:50 -0000	1.7
  +++ ApplicationContext.java	10 May 2002 02:43:04 -0000	1.8
  @@ -80,7 +80,7 @@
        *
        * @param name the name of thread pool
        * @return the threadpool
  -     * @exception IllegalArgumentException if the name of thread pool is
  +     * @throws IllegalArgumentException if the name of thread pool is
        *            invalid or named pool does not exist
        */
       ThreadPool getThreadPool( String name )
  
  
  
  1.5       +6 -6      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationMBean.java
  
  Index: ApplicationMBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApplicationMBean.java	5 Mar 2002 12:39:22 -0000	1.4
  +++ ApplicationMBean.java	10 May 2002 02:43:04 -0000	1.5
  @@ -59,8 +59,8 @@
        * This is only valid when isRunning() returns false,
        * otherwise it will generate an IllegalStateException.
        *
  -     * @exception IllegalStateException if application is already running
  -     * @exception ApplicationException if the application failed to start.
  +     * @throws IllegalStateException if application is already running
  +     * @throws ApplicationException if the application failed to start.
        *            the message part of exception will contain more information
        *            pertaining to why the application failed to startup
        */
  @@ -74,8 +74,8 @@
        * This is equivelent to  calling stop() and then start()
        * in succession.
        *
  -     * @exception IllegalStateException if application is not already running
  -     * @exception ApplicationException if the application failed to stop or start.
  +     * @throws IllegalStateException if application is not already running
  +     * @throws ApplicationException if the application failed to stop or start.
        *            the message part of exception will contain more information
        *            pertaining to why the application failed to startup/shutdown
        */
  @@ -87,8 +87,8 @@
        * This is only valid when isRunning() returns true,
        * otherwise it will generate an IllegalStateException.
        *
  -     * @exception IllegalStateException if application is not already running
  -     * @exception ApplicationException if the application failed to shutdown.
  +     * @throws IllegalStateException if application is not already running
  +     * @throws ApplicationException if the application failed to shutdown.
        *            the message part of exception will contain more information
        *            pertaining to why the application failed to shutodwn
        */
  
  
  
  1.9       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ClassLoaderManager.java
  
  Index: ClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ClassLoaderManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClassLoaderManager.java	17 Feb 2002 11:15:28 -0000	1.8
  +++ ClassLoaderManager.java	10 May 2002 02:43:04 -0000	1.9
  @@ -34,7 +34,7 @@
        * @param baseDirectory the base directory of application
        * @param classPath the list of URLs in applications deployment
        * @return the ClassLoader created
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       ClassLoader createClassLoader( Configuration server,
                                      File source,
  
  
  
  1.7       +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Deployer.java
  
  Index: Deployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Deployer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Deployer.java	26 Mar 2002 11:03:11 -0000	1.6
  +++ Deployer.java	10 May 2002 02:43:04 -0000	1.7
  @@ -30,7 +30,7 @@
        *
        * @param name the name of deployment
        * @param location the installation to deploy
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       void deploy( String name, URL location )
           throws DeploymentException;
  @@ -39,7 +39,7 @@
        * undeploy a resource from a location.
        *
        * @param name the name of deployment
  -     * @exception DeploymentException if an error occurs
  +     * @throws DeploymentException if an error occurs
        */
       void undeploy( String name )
           throws DeploymentException;
  
  
  
  1.6       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/EmbeddorMBean.java
  
  Index: EmbeddorMBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/EmbeddorMBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EmbeddorMBean.java	17 Feb 2002 11:15:28 -0000	1.5
  +++ EmbeddorMBean.java	10 May 2002 02:43:04 -0000	1.6
  @@ -76,7 +76,7 @@
       /**
        * Request the embeddor to restart.
        *
  -     * @exception UnsupportedOperationException if restart not a supported operation
  +     * @throws UnsupportedOperationException if restart not a supported operation
        */
       void restart()
           throws UnsupportedOperationException;
  
  
  
  1.5       +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/SystemManager.java
  
  Index: SystemManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/SystemManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SystemManager.java	17 Feb 2002 11:15:28 -0000	1.4
  +++ SystemManager.java	10 May 2002 02:43:04 -0000	1.5
  @@ -33,10 +33,10 @@
        * @param name the name to register object under
        * @param object the object
        * @param interfaces the interfaces to register the component under
  -     * @exception ManagerException if an error occurs. An error could occur if the object doesn't
  +     * @throws ManagerException if an error occurs. An error could occur if the object doesn't
        *            implement the interfaces, the interfaces parameter contain non-instance
        *            classes, the name is already registered etc.
  -     * @exception IllegalArgumentException if object or interfaces is null
  +     * @throws IllegalArgumentException if object or interfaces is null
        */
       void register( String name, Object object, Class[] interfaces )
           throws ManagerException, IllegalArgumentException;
  @@ -49,8 +49,8 @@
        *
        * @param name the name to register object under
        * @param object the object
  -     * @exception ManagerException if an error occurs such as name already registered.
  -     * @exception IllegalArgumentException if object is null
  +     * @throws ManagerException if an error occurs such as name already registered.
  +     * @throws IllegalArgumentException if object is null
        */
       void register( String name, Object object )
           throws ManagerException, IllegalArgumentException;
  @@ -59,7 +59,7 @@
        * Unregister named object.
        *
        * @param name the name of object to unregister
  -     * @exception ManagerException if an error occurs such as when no such object registered.
  +     * @throws ManagerException if an error occurs such as when no such object registered.
        */
       void unregister( String name )
           throws ManagerException;
  
  
  
  1.13      +3 -3      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Main.java	27 Mar 2002 11:18:23 -0000	1.12
  +++ Main.java	10 May 2002 02:43:04 -0000	1.13
  @@ -36,7 +36,7 @@
        * Main entry point for Phoenix.
        *
        * @param args the command line arguments
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       public final static void main( final String[] args )
           throws Exception
  @@ -56,7 +56,7 @@
        *
        * @returns the exit code which should be used to exit the JVM
        *
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       protected final static int startup( final String[] args,
                                           final Hashtable data,
  @@ -130,7 +130,7 @@
        * Find the "engine" jar from which to run main phoenix kernel.
        *
        * @return the engine file
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private final static File findEngineJar()
           throws Exception
  
  
  
  1.11      +8 -8      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java
  
  Index: Assembler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Assembler.java	16 Mar 2002 00:11:56 -0000	1.10
  +++ Assembler.java	10 May 2002 02:43:04 -0000	1.11
  @@ -30,7 +30,7 @@
    * and is in the format specified for <code>assembly.xml</code> files.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.10 $ $Date: 2002/03/16 00:11:56 $
  + * @version $Revision: 1.11 $ $Date: 2002/05/10 02:43:04 $
    */
   public class Assembler
       extends AbstractLogEnabled
  @@ -61,7 +61,7 @@
        * @param directory the directory Sar installed to
        * @param classPath the URL array to represent Sar ClassPath
        * @return the new SarMetaData
  -     * @exception AssemblyException if an error occurs
  +     * @throws AssemblyException if an error occurs
        */
       public SarMetaData assembleSar( final String name,
                                       final Configuration assembly,
  @@ -110,7 +110,7 @@
        *
        * @param blocks the list of Configuration objects for blocks
        * @return the BlockMetaData array
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       private BlockMetaData[] buildBlocks( final Configuration[] blocks,
                                            final ClassLoader classLoader )
  @@ -133,7 +133,7 @@
        *
        * @param block the Configuration object for block
        * @return the BlockMetaData object
  -     * @exception AssemblyException if an error occurs
  +     * @throws AssemblyException if an error occurs
        */
       private BlockMetaData buildBlock( final Configuration block,
                                         final ClassLoader classLoader )
  @@ -167,7 +167,7 @@
        * @param classname the name of Blocks class
        * @param cache the place to cache BlockInfo objects
        * @return the BlockInfo for specified block
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private BlockInfo getBlockInfo( final String name,
                                       final String classname,
  @@ -206,7 +206,7 @@
        *
        * @param listeners the list of Configuration objects for listeners
        * @return the BlockListenerMetaData array
  -     * @exception AssemblyException if an error occurs
  +     * @throws AssemblyException if an error occurs
        */
       private BlockListenerMetaData[] buildBlockListeners( final Configuration[] listeners )
           throws AssemblyException
  @@ -227,7 +227,7 @@
        *
        * @param listener the Configuration object for listener
        * @return the BlockListenerMetaData object
  -     * @exception AssemblyException if an error occurs
  +     * @throws AssemblyException if an error occurs
        */
       private BlockListenerMetaData buildBlockListener( final Configuration listener )
           throws AssemblyException
  @@ -252,7 +252,7 @@
        *
        * @param provides the set of provides elements for block
        * @return the created DependencyMetaData array
  -     * @exception ConfigurationException if config data is malformed
  +     * @throws ConfigurationException if config data is malformed
        */
       private DependencyMetaData[] buildDependencyMetaDatas( final Configuration[] provides )
           throws ConfigurationException
  
  
  
  1.12      +8 -8      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java
  
  Index: BlockInfoBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BlockInfoBuilder.java	16 Mar 2002 00:11:56 -0000	1.11
  +++ BlockInfoBuilder.java	10 May 2002 02:43:04 -0000	1.12
  @@ -25,7 +25,7 @@
    * is specified in the BlockInfo specification.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.11 $ $Date: 2002/03/16 00:11:56 $
  + * @version $Revision: 1.12 $ $Date: 2002/05/10 02:43:04 $
    */
   public final class BlockInfoBuilder
       extends AbstractLogEnabled
  @@ -40,7 +40,7 @@
        * @param classname The classname of Block
        * @param info the BlockInfo configuration
        * @return the created BlockInfo
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public BlockInfo build( final String classname, final Configuration info )
           throws Exception
  @@ -94,7 +94,7 @@
        * @param classname The classname of Block (used for logging purposes)
        * @param configuration the dependencies configuration
        * @return the created DependencyDescriptor
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private DependencyDescriptor[] buildDependencies( final String classname,
                                                         final Configuration configuration )
  @@ -120,7 +120,7 @@
        * @param classname The classname of Block (used for logging purposes)
        * @param dependency the dependency configuration
        * @return the created DependencyDescriptor
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private DependencyDescriptor buildDependency( final String classname,
                                                     final Configuration dependency )
  @@ -152,7 +152,7 @@
        *
        * @param servicesSet the services configuration
        * @return the created ServiceDescriptor
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private ServiceDescriptor[] buildServices( final Configuration servicesSet )
           throws ConfigurationException
  @@ -175,7 +175,7 @@
        *
        * @param service the service Configuration
        * @return the created ServiceDescriptor
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private ServiceDescriptor buildService( final Configuration service )
           throws ConfigurationException
  @@ -197,7 +197,7 @@
        * @param classname The classname of Block (used to create descriptor)
        * @param block the Block Configuration
        * @return the created BlockDescriptor
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private BlockDescriptor buildBlockDescriptor( final String classname,
                                                     final Configuration block )
  @@ -221,7 +221,7 @@
        *
        * @param version the version string
        * @return the created Version object
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       private Version buildVersion( final String version )
           throws ConfigurationException
  
  
  
  1.32      +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java
  
  Index: Installer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Installer.java	21 Mar 2002 08:20:42 -0000	1.31
  +++ Installer.java	10 May 2002 02:43:04 -0000	1.32
  @@ -34,7 +34,7 @@
    * and installing it as appropriate.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.31 $ $Date: 2002/03/21 08:20:42 $
  + * @version $Revision: 1.32 $ $Date: 2002/05/10 02:43:04 $
    */
   public class Installer
       extends AbstractLogEnabled
  @@ -64,7 +64,7 @@
        * Uninstall the Sar designated installation.
        *
        * @param installation the installation
  -     * @exception InstallationException if an error occurs
  +     * @throws InstallationException if an error occurs
        */
       public void uninstall( final Installation installation )
           throws InstallationException
  @@ -134,7 +134,7 @@
        * Install the Sar designated by url.
        *
        * @param url the url of instalation
  -     * @exception InstallationException if an error occurs
  +     * @throws InstallationException if an error occurs
        */
       public Installation install( final URL url )
           throws InstallationException
  @@ -452,7 +452,7 @@
        *
        * @param url the url of deployment
        * @return the File for deployment
  -     * @exception InstallationException if an error occurs
  +     * @throws InstallationException if an error occurs
        */
       private File getFileFor( final URL url )
           throws InstallationException
  @@ -482,7 +482,7 @@
        * @param entry the zip entry
        * @param file the file to extract to
        * @param digests the digests for the expanded files.
  -     * @exception InstallationException if an error occurs
  +     * @throws InstallationException if an error occurs
        */
       private void expandZipEntry( final ZipFile zipFile,
                                    final ZipEntry entry,
  
  
  
  1.11      +18 -18    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SarVerifier.java	26 Feb 2002 11:13:03 -0000	1.10
  +++ SarVerifier.java	10 May 2002 02:43:04 -0000	1.11
  @@ -49,7 +49,7 @@
    * </ul>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.10 $ $Date: 2002/02/26 11:13:03 $
  + * @version $Revision: 1.11 $ $Date: 2002/05/10 02:43:04 $
    */
   public class SarVerifier
       extends AbstractLogEnabled
  @@ -66,7 +66,7 @@
        * @param classLoader the ClassLoader used to load types. This is used
        *                    to verify that specified Class objects exist and
        *                    implement the correct interfaces.
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       public void verifySar( final SarMetaData sar, final ClassLoader classLoader )
           throws VerifyException
  @@ -111,7 +111,7 @@
        * Verfiy that all Blocks have the needed dependencies specified correctly.
        *
        * @param blocks the BlockMetaData objects for the blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyValidDependencies( final BlockMetaData[] blocks )
           throws VerifyException
  @@ -126,7 +126,7 @@
        * Verfiy that there are no circular references between Blocks.
        *
        * @param blocks the BlockMetaData objects for the blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyNoCircularDependencies( final BlockMetaData[] blocks )
           throws VerifyException
  @@ -146,7 +146,7 @@
        * Verfiy that there are no circular references between Blocks.
        *
        * @param blocks the BlockMetaData objects for the blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyNoCircularDependencies( final BlockMetaData block,
                                                  final BlockMetaData[] blocks,
  @@ -226,7 +226,7 @@
        * Verfiy that the inter-Block dependencies are valid.
        *
        * @param blocks the BlockMetaData objects for the blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyDependencyReferences( final BlockMetaData[] blocks )
           throws VerifyException
  @@ -242,7 +242,7 @@
        *
        * @param block the BlockMetaData object for the block
        * @param others the BlockMetaData objects for the other blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyDependencyReferences( final BlockMetaData block,
                                                final BlockMetaData[] others )
  @@ -304,7 +304,7 @@
        * advertised interfaces.
        *
        * @param blocks the BlockMetaData objects for the blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyBlocksType( final BlockMetaData[] blocks, final ClassLoader classLoader )
           throws VerifyException
  @@ -320,7 +320,7 @@
        * advertised interfaces.
        *
        * @param block the BlockMetaData object for the blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyBlockType( final BlockMetaData block, final ClassLoader classLoader )
           throws VerifyException
  @@ -362,7 +362,7 @@
        * Verfiy that all listeners implement BlockListener.
        *
        * @param listeners the BlockListenerMetaData objects for the listeners
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyListenersType( final BlockListenerMetaData[] listeners,
                                         final ClassLoader classLoader )
  @@ -378,7 +378,7 @@
        * Verfiy that specified Listener class implements the BlockListener interface.
        *
        * @param listener the BlockListenerMetaData object for the listener
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyListenerType( final BlockListenerMetaData listener,
                                        final ClassLoader classLoader )
  @@ -411,7 +411,7 @@
        * Verify that the Sat name specified is valid.
        *
        * @param name the sar name
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifySarName( final String name )
           throws VerifyException
  @@ -427,7 +427,7 @@
        * Verify that the names of the specified blocks are valid.
        *
        * @param blocks the Blocks
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyValidNames( final BlockMetaData[] blocks )
           throws VerifyException
  @@ -447,7 +447,7 @@
        * Verify that the names of the specified listeners are valid.
        *
        * @param listeners the listeners
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyValidNames( final BlockListenerMetaData[] listeners )
           throws VerifyException
  @@ -493,7 +493,7 @@
        *
        * @param blocks the Blocks
        * @param listeners the listeners
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void checkNamesUnique( final BlockMetaData[] blocks,
                                      final BlockListenerMetaData[] listeners )
  @@ -523,7 +523,7 @@
        *                   match in name (or -1 if name designates a listener)
        * @param listenerIndex the index of listener that is allowed to
        *                      match in name (or -1 if name designates a block)
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void checkNameUnique( final String name,
                                     final BlockMetaData[] blocks,
  @@ -561,7 +561,7 @@
        * in BlockInfo.
        *
        * @param block the BlockMetaData describing the block
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private void verifyDependenciesMap( final BlockMetaData block )
           throws VerifyException
  @@ -612,7 +612,7 @@
        * @param services the services the Block offers
        * @param classLoader the classLoader
        * @return an array of Classes for all the services
  -     * @exception VerifyException if an error occurs
  +     * @throws VerifyException if an error occurs
        */
       private Class[] getServiceClasses( final String name,
                                          final ServiceDescriptor[] services,
  
  
  

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