You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/10 04:51:14 UTC
cvs commit: jakarta-avalon-excalibur/threadcontext/src/java/org/apache/excalibur/threadcontext/impl AbstractThreadContextPolicy.java
donaldp 02/05/09 19:51:14
Modified: all/src/scratchpad/org/apache/avalon/excalibur/configuration
CascadingConfiguration.java
all/src/scratchpad/org/apache/avalon/excalibur/i18n
AbstractBundle.java Bundle.java BundleSelector.java
XmlBundle.java
all/src/scratchpad/org/apache/avalon/excalibur/service
DefaultServiceManager.java PipelineService.java
ServiceLoader.java UnitInfo.java
baxter/src/java/org/apache/excalibur/baxter
AbstractMBean.java
collections/src/java/org/apache/avalon/excalibur/collections
ArrayStack.java BinaryHeap.java PriorityQueue.java
SynchronizedPriorityQueue.java
concurrent/src/java/org/apache/avalon/excalibur/concurrent
Sync.java
extension/src/java/org/apache/avalon/excalibur/extension
DefaultPackageRepository.java DeweyDecimal.java
i18n/src/java/org/apache/avalon/excalibur/i18n
Resources.java
io/src/java/org/apache/avalon/excalibur/io
DemuxInputStream.java DemuxOutputStream.java
FileUtil.java
logger/src/java/org/apache/avalon/excalibur/logger/factory
FileTargetFactory.java SocketTargetFactory.java
thread/src/java/org/apache/avalon/excalibur/thread
ThreadControl.java
thread/src/java/org/apache/avalon/excalibur/thread/impl
DefaultThreadControl.java DefaultThreadPool.java
ExecutableRunnable.java
threadcontext/src/java/org/apache/excalibur/threadcontext
ThreadContextPolicy.java
threadcontext/src/java/org/apache/excalibur/threadcontext/impl
AbstractThreadContextPolicy.java
Log:
@exception --> @throws
Revision Changes Path
1.5 +26 -26 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/configuration/CascadingConfiguration.java
Index: CascadingConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/configuration/CascadingConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CascadingConfiguration.java 3 May 2002 03:19:27 -0000 1.4
+++ CascadingConfiguration.java 10 May 2002 02:51:13 -0000 1.5
@@ -15,7 +15,7 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
/**
- * The CascadingConfiguration is a classic Configuration backed by parent
+ * The CascadingConfiguration is a classic Configuration backed by parent
* Configuration. Operations such as getChild return a CascadingConfiguration
* encapsulating both a primary and parent configuration. Requests for attribute
* values are resolved against the base configuration initially. If the result
@@ -39,19 +39,19 @@
/**
* Create a CascadingConfiguration with specified parent. The base
- * configuration shall override a parent configuration on request for
+ * configuration shall override a parent configuration on request for
* attribute values and configuration body values. Unresolved request
* are redirected up the parent chain until a classic configuration is
- * reached. Request for child configurations will return a
- * new CascadingConfiguration referencing the child of the base and
+ * reached. Request for child configurations will return a
+ * new CascadingConfiguration referencing the child of the base and
* the child of the primary (i.e. a child configuration chain).
*
* @param base the base Configuration
- * @param parent the parent Configuration
+ * @param parent the parent Configuration
*/
public CascadingConfiguration( final Configuration base , final Configuration parent )
{
- if( base == null )
+ if( base == null )
{
m_base = new DefaultConfiguration( "-", null );
}
@@ -59,7 +59,7 @@
{
m_base = base;
}
- if( parent == null )
+ if( parent == null )
{
m_parent = new DefaultConfiguration( "-", null );
}
@@ -124,8 +124,8 @@
* @param child The name of the child node.
* @param createNew If <code>true</code>, a new <code>Configuration</code>
* will be created and returned if the specified child does not exist in either
- * the base or parent configuratioin. If <code>false</code>, <code>null</code>
- * will be returned when the specified child doesn't exist in either the base or
+ * the base or parent configuratioin. If <code>false</code>, <code>null</code>
+ * will be returned when the specified child doesn't exist in either the base or
* the parent.
* @return Configuration
*/
@@ -139,11 +139,11 @@
/**
* Return an <code>Array</code> of <code>Configuration</code>
- * elements containing all node children of both base and parent configurations.
+ * elements containing all node children of both base and parent configurations.
* The array order will reflect the order in the source config file, commencing
* with the base configuration.
*
- * @return All child nodes
+ * @return All child nodes
*/
public Configuration[] getChildren()
{
@@ -157,9 +157,9 @@
/**
* Return an <code>Array</code> of <code>Configuration</code>
- * elements containing all node children with the specified name from
+ * elements containing all node children with the specified name from
* both base and parent configurations. The array
- * order will reflect the order in the source config file commencing
+ * order will reflect the order in the source config file commencing
* with the base configuration.
*
* @param name The name of the children to get.
@@ -203,12 +203,12 @@
/**
* Return the value of specified attribute. If the base configuration
- * does not contain the attribute, the equivialent operation is applied to
+ * does not contain the attribute, the equivialent operation is applied to
* the parent configuration.
*
* @param paramName The name of the parameter you ask the value of.
* @return String value of attribute.
- * @exception ConfigurationException If no attribute with that name exists.
+ * @throws ConfigurationException If no attribute with that name exists.
*/
public String getAttribute( String paramName ) throws ConfigurationException
{
@@ -227,7 +227,7 @@
* in this node or the parent.
* @param paramName The name of the parameter you ask the value of.
* @return int value of attribute
- * @exception ConfigurationException If no parameter with that name exists.
+ * @throws ConfigurationException If no parameter with that name exists.
* or if conversion to <code>int</code> fails.
*/
public int getAttributeAsInteger( String paramName ) throws ConfigurationException
@@ -248,7 +248,7 @@
*
* @param paramName The name of the parameter you ask the value of.
* @return long value of attribute
- * @exception ConfigurationException If no parameter with that name exists.
+ * @throws ConfigurationException If no parameter with that name exists.
* or if conversion to <code>long</code> fails.
*/
public long getAttributeAsLong( String name ) throws ConfigurationException
@@ -269,7 +269,7 @@
* in this node.
* @param paramName The name of the parameter you ask the value of.
* @return float value of attribute
- * @exception ConfigurationException If no parameter with that name exists.
+ * @throws ConfigurationException If no parameter with that name exists.
* or if conversion to <code>float</code> fails.
*/
public float getAttributeAsFloat( String paramName ) throws ConfigurationException
@@ -291,7 +291,7 @@
*
* @param paramName The name of the parameter you ask the value of.
* @return boolean value of attribute
- * @exception ConfigurationException If no parameter with that name exists.
+ * @throws ConfigurationException If no parameter with that name exists.
* or if conversion to <code>boolean</code> fails.
*/
public boolean getAttributeAsBoolean( String paramName ) throws ConfigurationException
@@ -327,7 +327,7 @@
/**
* Return the <code>int</code> value of the node.
*
- * @exception ConfigurationException If conversion to <code>int</code> fails.
+ * @throws ConfigurationException If conversion to <code>int</code> fails.
*/
public int getValueAsInteger() throws ConfigurationException
{
@@ -345,7 +345,7 @@
* Return the <code>float</code> value of the node.
*
* @return the value of the node.
- * @exception ConfigurationException If conversion to <code>float</code> fails.
+ * @throws ConfigurationException If conversion to <code>float</code> fails.
*/
public float getValueAsFloat() throws ConfigurationException
{
@@ -363,7 +363,7 @@
* Return the <code>boolean</code> value of the node.
*
* @return the value of the node.
- * @exception ConfigurationException If conversion to <code>boolean</code> fails.
+ * @throws ConfigurationException If conversion to <code>boolean</code> fails.
*/
public boolean getValueAsBoolean() throws ConfigurationException
{
@@ -381,7 +381,7 @@
* Return the <code>long</code> value of the node.<br>
*
* @return the value of the node.
- * @exception ConfigurationException If conversion to <code>long</code> fails.
+ * @throws ConfigurationException If conversion to <code>long</code> fails.
*/
public long getValueAsLong() throws ConfigurationException
{
@@ -629,7 +629,7 @@
final StringBuffer buffer = new StringBuffer();
list( buffer, " ", config );
buffer.append("\n");
- return buffer.toString();
+ return buffer.toString();
}
private static void list( StringBuffer buffer, String lead, Configuration config )
@@ -641,7 +641,7 @@
{
for( int i=0; i<names.length; i++ )
{
- buffer.append( " " + names[i] + "=\"" + config.getAttribute( names[i], "???" ) + "\"" );
+ buffer.append( " " + names[i] + "=\"" + config.getAttribute( names[i], "???" ) + "\"" );
}
}
Configuration[] children = config.getChildren();
@@ -650,7 +650,7 @@
buffer.append(">");
for( int j=0; j<children.length; j++ )
{
- list( buffer, lead + " ", children[j] );
+ list( buffer, lead + " ", children[j] );
}
buffer.append( "\n" + lead + "</" + config.getName() + ">");
}
1.13 +3 -3 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/AbstractBundle.java
Index: AbstractBundle.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/AbstractBundle.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractBundle.java 7 Apr 2002 06:44:18 -0000 1.12
+++ AbstractBundle.java 10 May 2002 02:51:13 -0000 1.13
@@ -11,8 +11,8 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-public abstract class AbstractBundle
- extends AbstractLogEnabled
+public abstract class AbstractBundle
+ extends AbstractLogEnabled
implements Bundle, Component
{
@@ -100,7 +100,7 @@
* @param key key
* @param variables map with variable values
* @return value with variable values substituted
- * @exception MissingResourceException if value was not found
+ * @throws MissingResourceException if value was not found
*/
public String getString( String key, Map variables )
{
1.8 +3 -3 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/Bundle.java
Index: Bundle.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/Bundle.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Bundle.java 16 Mar 2002 00:05:47 -0000 1.7
+++ Bundle.java 10 May 2002 02:51:13 -0000 1.8
@@ -13,7 +13,7 @@
* This is the interface of the ResourceBundle, for used for i18n support.
*
* @author <a href="mailto:neeme@apache.org">Neeme Praks</a>
- * @version CVS $Revision: 1.7 $ $Date: 2002/03/16 00:05:47 $ $Author: donaldp $
+ * @version CVS $Revision: 1.8 $ $Date: 2002/05/10 02:51:13 $ $Author: donaldp $
*/
public interface Bundle
{
@@ -54,7 +54,7 @@
*
* @param key key
* @return value
- * @exception MissingResourceException if value was not found
+ * @throws MissingResourceException if value was not found
*/
String getString( String key );
@@ -64,7 +64,7 @@
* @param key key
* @param values map with variable values
* @return value with variable values substituted
- * @exception MissingResourceException if value was not found
+ * @throws MissingResourceException if value was not found
*/
String getString( String key, Map values );
1.15 +5 -5 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java
Index: BundleSelector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BundleSelector.java 14 Apr 2002 04:06:39 -0000 1.14
+++ BundleSelector.java 10 May 2002 02:51:13 -0000 1.15
@@ -23,9 +23,9 @@
*
* @author <a href="mailto:neeme@one.lv">Neeme Praks</a>
* @author <a href="mailto:mengelhart@earthtrip.com">Mike Engelhart</a>
- * @version $Id: BundleSelector.java,v 1.14 2002/04/14 04:06:39 donaldp Exp $
+ * @version $Id: BundleSelector.java,v 1.15 2002/05/10 02:51:13 donaldp Exp $
*/
-public class BundleSelector
+public class BundleSelector
extends ExcaliburComponentSelector
{
/**
@@ -69,7 +69,7 @@
* @param locale locale
* @param cacheAtStartup cache all the keys when constructing?
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @throws ComponentException if a bundle is not found
*/
public Component select( Object hint ) throws ComponentException
{
@@ -85,7 +85,7 @@
* @param name bundle name
* @param localeName locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @throws ComponentException if a bundle is not found
*/
public Component select( String name, String localeName ) throws ComponentException
{
@@ -99,7 +99,7 @@
* @param locale locale
* @param cacheAtStartup cache all the keys when constructing?
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @throws ComponentException if a bundle is not found
*/
private Component select( BundleInfo bundleInfo )
{
1.12 +11 -11 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/XmlBundle.java
Index: XmlBundle.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/XmlBundle.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XmlBundle.java 19 Apr 2002 09:13:06 -0000 1.11
+++ XmlBundle.java 10 May 2002 02:51:13 -0000 1.12
@@ -35,7 +35,7 @@
* @author <a href="mailto:mengelhart@earthtrip.com">Mike Engelhart</a>
* @author <a href="mailto:neeme@apache.org">Neeme Praks</a>
* @author <a href="mailto:oleg@one.lv">Oleg Podolsky</a>
- * @version $Id: XmlBundle.java,v 1.11 2002/04/19 09:13:06 cziegeler Exp $
+ * @version $Id: XmlBundle.java,v 1.12 2002/05/10 02:51:13 donaldp Exp $
*/
public class XmlBundle extends AbstractBundle implements Configurable, Initializable, Disposable, Composable
{
@@ -111,9 +111,9 @@
* Initalize the bundle
*
* @param uri URI of the XML source
- * @exception IOException if an IO error occurs while reading the file
- * @exception ParserConfigurationException if no parser is configured
- * @exception SAXException if an error occurs while parsing the file
+ * @throws IOException if an IO error occurs while reading the file
+ * @throws ParserConfigurationException if no parser is configured
+ * @throws SAXException if an error occurs while parsing the file
*/
public void initialize( String uri ) throws Exception
{
@@ -126,9 +126,9 @@
* Initalize the bundle
*
* @param file XML source file
- * @exception IOException if an IO error occurs while reading the file
- * @exception ParserConfigurationException if no parser is configured
- * @exception SAXException if an error occurs while parsing the file
+ * @throws IOException if an IO error occurs while reading the file
+ * @throws ParserConfigurationException if no parser is configured
+ * @throws SAXException if an error occurs while parsing the file
*/
public void initialize( Source source ) throws Exception
{
@@ -141,9 +141,9 @@
* Initalize the bundle
*
* @param inStream XML source stream
- * @exception IOException if an IO error occurs while reading the file
- * @exception ParserConfigurationException if no parser is configured
- * @exception SAXException if an error occurs while parsing the file
+ * @throws IOException if an IO error occurs while reading the file
+ * @throws ParserConfigurationException if no parser is configured
+ * @throws SAXException if an error occurs while parsing the file
*/
public void initialize( InputSource inSource ) throws Exception
{
@@ -301,7 +301,7 @@
*
* @param key key
* @return value
- * @exception MissingResourceException if value was not found
+ * @throws MissingResourceException if value was not found
*/
public String getString( String key ) throws MissingResourceException
{
1.6 +1 -1 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/DefaultServiceManager.java
Index: DefaultServiceManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/DefaultServiceManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultServiceManager.java 3 May 2002 05:08:31 -0000 1.5
+++ DefaultServiceManager.java 10 May 2002 02:51:13 -0000 1.6
@@ -42,7 +42,7 @@
* Retrieve Object by role from ServiceManager.
* @param role the role
* @return the Object
- * @exception ServiceException if an error occurs
+ * @throws ServiceException if an error occurs
*/
public Object lookup( String role ) throws ServiceException
{
1.3 +3 -3 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/PipelineService.java
Index: PipelineService.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/PipelineService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipelineService.java 3 May 2002 05:08:31 -0000 1.2
+++ PipelineService.java 10 May 2002 02:51:13 -0000 1.3
@@ -28,12 +28,12 @@
public static final String PIPELINE_SERVICE_KEY = "PIPELINE_SERVICE_KEY";
/**
- * Applies sercies logging, contextulization, configuration, initalization
+ * Applies sercies logging, contextulization, configuration, initalization
* and disposal, including dependent service composition and pipline exeecution.
- * @param target the name of the implementation class of the the component to
+ * @param target the name of the implementation class of the the component to
* load into the pipeline
* @return Object the initalized service
- * @exception Exception if no corresponding [class-name].xinfo file can be found,
+ * @throws Exception if no corresponding [class-name].xinfo file can be found,
* or if a service pipeline general execution is encountered
*/
public Object pipeline( String target ) throws Exception;
1.11 +66 -66 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceLoader.java
Index: ServiceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ServiceLoader.java 3 May 2002 05:08:31 -0000 1.10
+++ ServiceLoader.java 10 May 2002 02:51:13 -0000 1.11
@@ -94,51 +94,51 @@
* <td width="20%" valign="top">Contextualizable</td>
* <td>
* The contextualization phase hadles the capture of runtime context information
- * needed by the pipeline processor. This information must be provided in the
+ * needed by the pipeline processor. This information must be provided in the
* for of a <code>ServiceLoaderContext</code> otherwise the contextualize method will
- * throw an exception. The following information is provided by the
+ * throw an exception. The following information is provided by the
* <code>ServiceLoaderContext</code>:
* <p><table border="0" cellpadding="3" cellspacing="0" width="100%">
* <tr>
* <td width="30%" valign="top"><code>ARGS_KEY</code></td>
* <td>
- * Contains the command line arguments as a <code>String[]</code>.
+ * Contains the command line arguments as a <code>String[]</code>.
* </td></tr>
* <tr>
* <td valign="top"><code>BASE_DIRECTORY_KEY</code></td>
* <td>
- * Contains the application base directory <code>File</code>.
+ * Contains the application base directory <code>File</code>.
* </td></tr>
* <tr>
* <td valign="top"><code>TARGET_KEY</code></td>
* <td>
- * Contains the name of the target class to be instantiated.
+ * Contains the name of the target class to be instantiated.
* </td></tr>
* <tr>
* <td valign="top"><code>INCLUDES_KEY</code></td>
* <td>
* Contains an array of jar files that will be added to the pipeline classloader.
- * Jar files included in the array will be checked for block manifest entries. If
+ * Jar files included in the array will be checked for block manifest entries. If
* block entries exist that will be registered as potetentially available services
- * that may be instantiated during the recursive dependecy resolution process.
+ * that may be instantiated during the recursive dependecy resolution process.
* </td></tr>
* <tr>
* <td valign="top"><code>DISPOSAL_POLICY_KEY</code></td>
* <td>
- * A <code>Boolean</code> value that is applied on completionof the startup of a
- * <code>Startable</code> component. If the value TRUE, the component is stopped
+ * A <code>Boolean</code> value that is applied on completionof the startup of a
+ * <code>Startable</code> component. If the value TRUE, the component is stopped
* and disposed of (including termination of all dependencies) immediately following
* startup. This policy only applies to <code>Startable</code> components. Setting
* policy value to FALSE ensures that the component can respond as a server. Non
- * <code>Startable</code> target component are immediately terminated (providing a
+ * <code>Startable</code> target component are immediately terminated (providing a
* useful for component testing during development cycles).
* </td></tr>
* <tr>
* <td valign="top"><code>VERBOSE_POLICY_KEY</code></td>
* <td>
- * If this value is TRUE, debug logging entries from the pipeline processor will be
- * if the overall logging priority permits this. If FALSE (the default), the logging
- * entires generated by the pipeline processor will be limited to WARN, ERROR,
+ * If this value is TRUE, debug logging entries from the pipeline processor will be
+ * if the overall logging priority permits this. If FALSE (the default), the logging
+ * entires generated by the pipeline processor will be limited to WARN, ERROR,
* and FATAL_ERROR.
* </td></tr>
* </table>
@@ -147,12 +147,12 @@
* <tr><td width="20%">Initalizable</td>
* <td>
* The initilization phase handles the creation of a new instance of the supplied
- * target class, resolves any service dependencies, and runs the instance through
- * the lifecycle pipeline.
+ * target class, resolves any service dependencies, and runs the instance through
+ * the lifecycle pipeline.
* </td></tr>
* <tr><td width="20%" valign="top">Disposable</td>
* <td>
- * Cleanup and disposal of state members following termination and diposal of
+ * Cleanup and disposal of state members following termination and diposal of
* all current components.
* </td></tr>
* </table>
@@ -179,13 +179,13 @@
private Configuration m_config;
private ServiceManager m_manager;
-
+
/**
- * Command line entry point supporting establishment and initalization of a service
+ * Command line entry point supporting establishment and initalization of a service
* loader instance with a supplied target component and supporting services.
*
* <p><strong>java -jar form</strong></p>
- * <p>Execution using java -jar pattern requires the presence
+ * <p>Execution using java -jar pattern requires the presence
* of the following files under the same directory:</p>
* <ul>
* <li><code>merlin.jar</code>
@@ -194,21 +194,21 @@
* </ul>
* <p>An example command line is shown below:</p>
* <pre>
- * $ java -jar <strong>merlin.jar</strong> <supporting-jar-files>
- * -target <class-name>
+ * $ java -jar <strong>merlin.jar</strong> <supporting-jar-files>
+ * -target <class-name>
* </pre>
* <p><strong>java -classpath form</strong></p>
- * <p>Execution using java -classpath pattern requires the inclusions
- * of the pipeline, framework and logkit jar files in the classpath
+ * <p>Execution using java -classpath pattern requires the inclusions
+ * of the pipeline, framework and logkit jar files in the classpath
* statement.</p>
* <p>An example command line is shown below:</p>
* <pre>
- * $ java -classpath merlin.jar;avalon-framework.jar;logkit.jar
+ * $ java -classpath merlin.jar;avalon-framework.jar;logkit.jar
* <strong>org.apache.avalon.excalibur.service.ServiceLoader</strong>
- * <supporting-jar-files> -target <class-name>
+ * <supporting-jar-files> -target <class-name>
* </pre>
* </ul>
- *
+ *
* <p><table border="1" cellpadding="3" cellspacing="0" width="100%">
* <tr bgcolor="#ccccff">
* <td colspan="2"><b>Command Line Parameters and Arguments</b></td>
@@ -217,8 +217,8 @@
* <td valign="top"><code>-target <class-name></code></td>
* <td>
* <p>The class to instantiate. If the class exposes any Avalon lifecycle interface
- * (such as <code>Configurable</code>, <code>Contextualizable</code>, <code>Serviceable</code>,
- * <code>Initializable</code>, <code>Startable</code>, or <code>Disposable</code>, the
+ * (such as <code>Configurable</code>, <code>Contextualizable</code>, <code>Serviceable</code>,
+ * <code>Initializable</code>, <code>Startable</code>, or <code>Disposable</code>, the
* pipeline will automate lifecycle processing and termination.
* </p>
* </td></tr>
@@ -234,7 +234,7 @@
* <td>
* <p>A value of <code>true</code> will force debug level logging of the actual pipeline
* processor. A value of <code>false</code> will disable pipeline debug priority logging.
- * Visibility of logging infomration is dependent on the level supplied under the
+ * Visibility of logging infomration is dependent on the level supplied under the
* <code>priority</code parameter.</p>
* </td></tr>
* <tr><td valign="top"><code>-priority <priority></code></td>
@@ -254,7 +254,7 @@
* </td></tr>
* </table>
*
- * @param args a array of <code>String</code> argument values passed under the command line.
+ * @param args a array of <code>String</code> argument values passed under the command line.
*/
public static void main( String[] args )
{
@@ -287,7 +287,7 @@
catch( IllegalParameterException ipe )
{
logger.error( ipe.getMessage() );
- }
+ }
catch( PipelineException e )
{
logger.error( e.getMessage() + e.toString() );
@@ -331,14 +331,14 @@
* arguments, include files, target class, and related execution policies.
* @see ServiceLoaderContext
* @param context the pipeline context
- * @exception ContextException if the supplied context is not an instance
- * of ServiceLoaderContext, or if an internal error occurs while resolving
+ * @throws ContextException if the supplied context is not an instance
+ * of ServiceLoaderContext, or if an internal error occurs while resolving
* context information.
*/
public void contextualize( Context context ) throws ContextException
{
if( context instanceof ServiceLoaderContext ) try
- {
+ {
ServiceLoaderContext c = (ServiceLoaderContext) context;
m_includes = c.getIncludes();
m_verbose = c.getVerbose();
@@ -420,7 +420,7 @@
Vector list = new Vector();
Vector stack = new Vector();
- for (int i=0; i<m_includes.length; i++)
+ for (int i=0; i<m_includes.length; i++)
{
File target = m_includes[i];
stack.add( target );
@@ -437,7 +437,7 @@
catch( Throwable e )
{
final String error = "Unable to complete service registration.";
- throw new PipelineException( error, e );
+ throw new PipelineException( error, e );
}
}
@@ -446,7 +446,7 @@
//=======================================================================
/**
- * Initates execution of the loading of supporting services derived from a
+ * Initates execution of the loading of supporting services derived from a
* target.
*/
public Object pipeline( String target ) throws PipelineException
@@ -460,7 +460,7 @@
try
{
info = new UnitInfo( target.replace('.','/'), m_config, m_root );
- if( getVerbose() && getLogger().isDebugEnabled() )
+ if( getVerbose() && getLogger().isDebugEnabled() )
getLogger().debug( "validating target");
try
{
@@ -475,7 +475,7 @@
catch( Throwable e )
{
final String error = "Service loader exception encounter while preparing services.";
- throw new PipelineException( error, e );
+ throw new PipelineException( error, e );
}
//
@@ -489,7 +489,7 @@
catch( Throwable e )
{
final String error = "Service loader exception encounter during target execution.";
- throw new PipelineException( error, e );
+ throw new PipelineException( error, e );
}
}
@@ -506,12 +506,12 @@
// add a shutdown hook so we can stop services and target and invoke disposal
//
- Runtime.getRuntime().addShutdownHook(
+ Runtime.getRuntime().addShutdownHook(
new Thread()
{
public void run()
{
- if( getVerbose() && (getLogger() != null) && getLogger().isDebugEnabled() )
+ if( getVerbose() && (getLogger() != null) && getLogger().isDebugEnabled() )
getLogger().debug("shutdown hook");
terminate( object );
dispose();
@@ -554,7 +554,7 @@
m_terminated = true;
if( object == null ) return;
- if( getVerbose() && getLogger().isDebugEnabled() ) getLogger().debug(
+ if( getVerbose() && getLogger().isDebugEnabled() ) getLogger().debug(
"terminating " + object.getClass().getName() );
if( object instanceof Startable )
@@ -610,7 +610,7 @@
//==========================================================
// classloader
//==========================================================
-
+
private PipelineClassLoader createClassloader()
{
try
@@ -633,7 +633,7 @@
super( new URL[0], Thread.currentThread().getContextClassLoader() );
}
- protected void addURL( URL url )
+ protected void addURL( URL url )
{
try
{
@@ -649,12 +649,12 @@
protected Class loadClass( String name, boolean resolve ) throws ClassNotFoundException
{
return super.loadClass( name, resolve );
- }
+ }
}
/**
* Load the supplied jar files under the pipeline classloader.
- * For each entry in the stack, try to load it and
+ * For each entry in the stack, try to load it and
* if sucessfull, remove it from the stack - on completion
* the stack should be less than its original size - recursivly
* invoke load until the stack is empty.
@@ -693,7 +693,7 @@
while( keys.hasMoreElements() )
{
File key = (File) keys.nextElement();
- getLogger().error(
+ getLogger().error(
"Error while loading file."
+ "\n\tfile: " + key.toString(), (Throwable) errors.get( key ) );
}
@@ -706,22 +706,22 @@
//==========================================================
/**
- * Get client configuration from a file.
- */
- private static Configuration getRuntimeConfiguration( final File file )
+ * Get client configuration from a file.
+ */
+ private static Configuration getRuntimeConfiguration( final File file )
{
try
{
- DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder( );
+ DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder( );
InputStream is = new FileInputStream( file );
- if( is == null ) throw new Exception(
- "Could not load the configuration resource \"" + file + "\"" );
- return builder.build( is );
+ if( is == null ) throw new Exception(
+ "Could not load the configuration resource \"" + file + "\"" );
+ return builder.build( is );
}
catch( Throwable e )
{
final String error = "Unable to create configuration from file: " + file;
- throw new CascadingRuntimeException( error, e );
+ throw new CascadingRuntimeException( error, e );
}
}
@@ -734,7 +734,7 @@
try
{
Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- hierarchy.setDefaultLogTarget(
+ hierarchy.setDefaultLogTarget(
new StreamTarget( m_out, new AvalonFormatter( DEFAULT_FORMAT ) ) );
hierarchy.setDefaultPriority( priority );
return hierarchy;
@@ -749,14 +749,14 @@
// command-line
//==========================================================
- private static class IllegalParameterException extends Exception
+ private static class IllegalParameterException extends Exception
{
/**
- * Construct a new <code>IllegalParameterException</code> instance with the
+ * Construct a new <code>IllegalParameterException</code> instance with the
* supplied message parameter.
* @param message Message summarising the exception.
*/
- public IllegalParameterException( final String message )
+ public IllegalParameterException( final String message )
{
super( message );
}
@@ -780,7 +780,7 @@
{
if( m_args[i].toLowerCase().startsWith("-tar") )
{
- if( i+1 < m_args.length )
+ if( i+1 < m_args.length )
{
m_target = m_args[i+1];
i = i+1;
@@ -793,7 +793,7 @@
}
else if( m_args[i].toLowerCase().startsWith("-conf") )
{
- if( i+1 < m_args.length )
+ if( i+1 < m_args.length )
{
m_path = new File( m_args[i+1] );
i = i+1;
@@ -806,7 +806,7 @@
}
else if( m_args[i].toLowerCase().startsWith("-pri") )
{
- if( i+1 < m_args.length )
+ if( i+1 < m_args.length )
{
m_priority = Priority.getPriorityForName( m_args[i+1].toUpperCase() );
i = i+1;
@@ -819,7 +819,7 @@
}
else if( m_args[i].toLowerCase().startsWith("-dis") )
{
- if( i+1 < m_args.length )
+ if( i+1 < m_args.length )
{
m_policy = (m_args[i+1].toUpperCase().equals("TRUE"));
i = i+1;
@@ -832,7 +832,7 @@
}
else if( m_args[i].toLowerCase().startsWith("-ver") )
{
- if( i+1 < m_args.length )
+ if( i+1 < m_args.length )
{
m_verbose = (m_args[i+1].toUpperCase().equals("TRUE"));
i = i+1;
@@ -849,7 +849,7 @@
throw new IllegalParameterException( error );
}
else
- {
+ {
final File file = new File( m_args[i] );
if( file.exists() ) vector.add( file );
}
1.8 +28 -28 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/UnitInfo.java
Index: UnitInfo.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/UnitInfo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UnitInfo.java 3 May 2002 05:08:31 -0000 1.7
+++ UnitInfo.java 10 May 2002 02:51:13 -0000 1.8
@@ -27,7 +27,7 @@
import org.apache.avalon.framework.context.Context;
/**
- * Meta information about a <code>Serviceable</code> component.
+ * Meta information about a <code>Serviceable</code> component.
*/
public class UnitInfo
{
@@ -51,31 +51,31 @@
* the xinfo configuration:
* <pre>
* <blockinfo>
- *
+ *
* <block>
* <version>1.0</version>
* </block>
- *
+ *
* <!--
- * services that are offered by this block
+ * services that are offered by this block
* -->
- *
+ *
* <services>
* <service name="hello.Hello" version="1.0"/>
* </services>
- *
+ *
* <!--
* Implementation policy may one of the following enumerations:
* (a) SINGLETON, service is available for the lifetime of the manager
* (b) POOLED, the implementation implements Pool
* (c) TRANSIENT, manager is a factory of transient service instances
* -->
- *
+ *
* <implementation policy="SINGLETON" />
- *
+ *
* </blockinfo>
* </pre>
- *
+ *
* @param block the implementation class
* @param xinfo the xinfo meta-information in the form of a Configuration
* @param runtime the runtime profile
@@ -94,7 +94,7 @@
public UnitInfo( Class block, Configuration xinfo, Configuration conf, File root ) throws Exception
{
m_block = block;
-
+
//
// create the list of service provided by block implementation
//
@@ -194,15 +194,15 @@
}
/**
- * Creation of a new <code>UnitInfo</code> based on an existing
+ * Creation of a new <code>UnitInfo</code> based on an existing
* info and supplimentary configuration. The implementation will
* assigns the supplied configuration as the primary configuration
* backed by the info current configuration.
* @param info, the primary <code>UnitInfo</code>
- * @param config, a configuration to assign as the primary
+ * @param config, a configuration to assign as the primary
* configuration for the created info
- * @return UnitInfo an equivalent <code>UnitInfo</code> with a
- * <code>CascadingConfiguration</code> in which the supplied
+ * @return UnitInfo an equivalent <code>UnitInfo</code> with a
+ * <code>CascadingConfiguration</code> in which the supplied
* configuration is primary, backed by the supplied unit configuration
*/
public UnitInfo( UnitInfo info, Configuration config )
@@ -250,7 +250,7 @@
}
/**
- * Returns a <code>ServiceInfo</code> from the <code>UnitInfo</code> matching
+ * Returns a <code>ServiceInfo</code> from the <code>UnitInfo</code> matching
* the supplied service descriptor.
* @param info a <code>ServiceInfo</code> to locate with the <code>UnitInfo</code> instance
* @return a <code>ServiceInfo</code> instance matching the supplied service descriptor
@@ -266,8 +266,8 @@
}
/**
- * Returns a <code>TRUE</code> if the supplied <code>ServiceInfo</code> can be
- * provided by the implementation.
+ * Returns a <code>TRUE</code> if the supplied <code>ServiceInfo</code> can be
+ * provided by the implementation.
* @param service the requested service
* @return boolean TRUE if the service is available otherwise FALSE
*/
@@ -344,15 +344,15 @@
ServiceInfo[] services = getServices();
for( int i=0; i<services.length; i++ )
{
- buffer.append( "\n service: " + services[i].getInterface().getName()
+ buffer.append( "\n service: " + services[i].getInterface().getName()
+ ", version: " + services[i].getVersion() );
}
DependencyInfo[] dependencies = getDependencies();
for( int i=0; i<dependencies.length; i++ )
{
- buffer.append( "\n dependency: "
- + "role: " + dependencies[i].getRole()
- + ", service: " + dependencies[i].getService().getInterface().getName()
+ buffer.append( "\n dependency: "
+ + "role: " + dependencies[i].getRole()
+ + ", service: " + dependencies[i].getService().getInterface().getName()
+ ", version: " + dependencies[i].getService().getVersion() );
}
buffer.append("\n configuration\n");
@@ -362,12 +362,12 @@
}
/**
- * Returns a configuration resource form a jar file.
+ * Returns a configuration resource form a jar file.
* @param path the package path to the resource e.g. net/osm/xinfo.xml
- * @exception ConfigurationException if there is a problem
+ * @throws ConfigurationException if there is a problem
*/
- private static Configuration loadConfiguration( String path )
- throws ConfigurationException
+ private static Configuration loadConfiguration( String path )
+ throws ConfigurationException
{
try
{
@@ -378,10 +378,10 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Unexpected exception while attempting to load .xinfo configuration from path: ";
- throw new ConfigurationException( error + path, e );
- }
+ throw new ConfigurationException( error + path, e );
+ }
}
/**
1.3 +12 -12 jakarta-avalon-excalibur/baxter/src/java/org/apache/excalibur/baxter/AbstractMBean.java
Index: AbstractMBean.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/src/java/org/apache/excalibur/baxter/AbstractMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMBean.java 7 Apr 2002 08:23:14 -0000 1.2
+++ AbstractMBean.java 10 May 2002 02:51:13 -0000 1.3
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/04/07 08:23:14 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/05/10 02:51:13 $
*/
public abstract class AbstractMBean
extends NotificationBroadcasterSupport
@@ -110,9 +110,9 @@
*
* @param attribute The name of attribute to retrieve
* @return The Attribute value
- * @exception AttributeNotFoundException If no such attribute exists
- * @exception MBeanException if an error occurs retrieving attribute
- * @exception ReflectionException if a reflection error occurs
+ * @throws AttributeNotFoundException If no such attribute exists
+ * @throws MBeanException if an error occurs retrieving attribute
+ * @throws ReflectionException if a reflection error occurs
*/
public Object getAttribute( final String attribute )
throws AttributeNotFoundException, MBeanException, ReflectionException
@@ -176,9 +176,9 @@
* one used for loading the MBean on which the action is invoked.
* @return The object returned by the action, which represents the result of
* invoking the action on the MBean specified.
- * @exception MBeanException Wraps a <code>java.lang.Exception</code> thrown
+ * @throws MBeanException Wraps a <code>java.lang.Exception</code> thrown
* by the MBean's invoked method.
- * @exception ReflectionException Wraps a <code>java.lang.Exception</code>
+ * @throws ReflectionException Wraps a <code>java.lang.Exception</code>
* thrown while trying to invoke the method
*/
public Object invoke( final String action,
@@ -206,10 +206,10 @@
* Sets the value of a specific attribute of the Dynamic MBean
*
* @param attribute The new Attribute value
- * @exception AttributeNotFoundException if no such attribute exists
- * @exception InvalidAttributeValueException if provided value is invalid
- * @exception MBeanException if setting value raises exception
- * @exception ReflectionException if there is an error aquiring appropriate method
+ * @throws AttributeNotFoundException if no such attribute exists
+ * @throws InvalidAttributeValueException if provided value is invalid
+ * @throws MBeanException if setting value raises exception
+ * @throws ReflectionException if there is an error aquiring appropriate method
*/
public void setAttribute( final Attribute attribute )
throws AttributeNotFoundException, InvalidAttributeValueException,
@@ -345,7 +345,7 @@
*
* @param name the name of attribute
* @return the AttributeEntry
- * @exception AttributeNotFoundException if attribute not found
+ * @throws AttributeNotFoundException if attribute not found
*/
private synchronized AttributeEntry getAttributeEntry( final String name )
throws AttributeNotFoundException
@@ -368,7 +368,7 @@
* @param action the name of operation
* @param params the parameters of operation
* @return the OperationEntry
- * @exception ReflectionException if can not find operation
+ * @throws ReflectionException if can not find operation
*/
private synchronized OperationEntry getOperationEntry( final String action,
final String[] params )
1.6 +2 -2 jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/ArrayStack.java
Index: ArrayStack.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/ArrayStack.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArrayStack.java 17 Feb 2002 01:13:40 -0000 1.5
+++ ArrayStack.java 10 May 2002 02:51:13 -0000 1.6
@@ -14,7 +14,7 @@
* Unsynchronized stack.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/02/17 01:13:40 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/05/10 02:51:13 $
* @since 4.0
*/
public class ArrayStack
@@ -48,7 +48,7 @@
* Remove element from top of stack and return it
*
* @return the element from stack
- * @exception EmptyStackException if no elements left on stack
+ * @throws EmptyStackException if no elements left on stack
*/
public Object pop()
throws EmptyStackException
1.10 +3 -3 jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/BinaryHeap.java
Index: BinaryHeap.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/BinaryHeap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BinaryHeap.java 26 Mar 2002 10:45:21 -0000 1.9
+++ BinaryHeap.java 10 May 2002 02:51:13 -0000 1.10
@@ -18,7 +18,7 @@
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author <a href="mailto:ram.chidambaram@telus.com">Ram Chidambaram</a>
* @author <a href="mailto:stansburyc@earthlink.net">Chad Stansbury</a>
- * @version CVS $Revision: 1.9 $ $Date: 2002/03/26 10:45:21 $
+ * @version CVS $Revision: 1.10 $ $Date: 2002/05/10 02:51:13 $
* @since 4.0
*/
public final class BinaryHeap
@@ -185,7 +185,7 @@
* Return element on top of heap but don't remove it.
*
* @return the element at top of heap
- * @exception NoSuchElementException if isEmpty() == true
+ * @throws NoSuchElementException if isEmpty() == true
*/
public Object peek() throws NoSuchElementException
{
@@ -203,7 +203,7 @@
* Return element on top of heap and remove it.
*
* @return the element at top of heap
- * @exception NoSuchElementException if isEmpty() == true
+ * @throws NoSuchElementException if isEmpty() == true
*/
public Object pop() throws NoSuchElementException
{
1.6 +3 -3 jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/PriorityQueue.java
Index: PriorityQueue.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/PriorityQueue.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PriorityQueue.java 11 Dec 2001 09:53:27 -0000 1.5
+++ PriorityQueue.java 10 May 2002 02:51:13 -0000 1.6
@@ -14,7 +14,7 @@
* This interface does not dictate whether it is min or max heap.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/12/11 09:53:27 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/05/10 02:51:13 $
* @since 4.0
*/
public interface PriorityQueue
@@ -42,7 +42,7 @@
* Return element on top of heap but don't remove it.
*
* @return the element at top of heap
- * @exception NoSuchElementException if isEmpty() == true
+ * @throws NoSuchElementException if isEmpty() == true
*/
Object peek() throws NoSuchElementException;
@@ -50,7 +50,7 @@
* Return element on top of heap and remove it.
*
* @return the element at top of heap
- * @exception NoSuchElementException if isEmpty() == true
+ * @throws NoSuchElementException if isEmpty() == true
*/
Object pop() throws NoSuchElementException;
}
1.7 +3 -3 jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/SynchronizedPriorityQueue.java
Index: SynchronizedPriorityQueue.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/collections/src/java/org/apache/avalon/excalibur/collections/SynchronizedPriorityQueue.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SynchronizedPriorityQueue.java 16 Mar 2002 00:05:39 -0000 1.6
+++ SynchronizedPriorityQueue.java 10 May 2002 02:51:13 -0000 1.7
@@ -15,7 +15,7 @@
* defined in the PriorityQueue interface.
*
* @author <a href="mailto:ram.chidambaram@telus.com">Ram Chidambaram</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:39 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/05/10 02:51:13 $
* @since 4.0
*/
public final class SynchronizedPriorityQueue
@@ -69,7 +69,7 @@
* Return element on top of heap but don't remove it.
*
* @return the element at top of heap
- * @exception NoSuchElementException if isEmpty() == true
+ * @throws NoSuchElementException if isEmpty() == true
*/
public Object peek() throws NoSuchElementException
{
@@ -83,7 +83,7 @@
* Return element on top of heap and remove it.
*
* @return the element at top of heap
- * @exception NoSuchElementException if isEmpty() == true
+ * @throws NoSuchElementException if isEmpty() == true
*/
public Object pop() throws NoSuchElementException
{
1.6 +3 -3 jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/Sync.java
Index: Sync.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/Sync.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Sync.java 16 Mar 2002 00:05:40 -0000 1.5
+++ Sync.java 10 May 2002 02:51:14 -0000 1.6
@@ -11,7 +11,7 @@
* The interface to synchronization objects.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/03/16 00:05:40 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/05/10 02:51:14 $
* @since 4.0
*/
public interface Sync
@@ -20,7 +20,7 @@
* Aquire access to resource.
* This method will block until resource aquired.
*
- * @exception InterruptedException if an error occurs
+ * @throws InterruptedException if an error occurs
*/
void acquire()
throws InterruptedException;
@@ -31,7 +31,7 @@
*
* @param msec the duration to wait for lock to be released
* @return true if lock aquired, false on timeout
- * @exception InterruptedException if an error occurs
+ * @throws InterruptedException if an error occurs
*/
boolean attempt( long msec )
throws InterruptedException;
1.14 +2 -2 jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DefaultPackageRepository.java
Index: DefaultPackageRepository.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DefaultPackageRepository.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultPackageRepository.java 18 Apr 2002 20:16:06 -0000 1.13
+++ DefaultPackageRepository.java 10 May 2002 02:51:14 -0000 1.14
@@ -21,7 +21,7 @@
* a path to find the Optional Packages.</p>
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.13 $ $Date: 2002/04/18 20:16:06 $
+ * @version $Revision: 1.14 $ $Date: 2002/05/10 02:51:14 $
* @see OptionalPackage
* @see PackageRepository
*/
@@ -219,7 +219,7 @@
*
* @param archive the file object for Jar archive
* @return the OptionalPackage constructed
- * @exception IOException if an error occurs
+ * @throws IOException if an error occurs
*/
private OptionalPackage getOptionalPackage( final File archive )
throws IOException
1.4 +2 -2 jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DeweyDecimal.java
Index: DeweyDecimal.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DeweyDecimal.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeweyDecimal.java 27 Mar 2002 23:10:18 -0000 1.3
+++ DeweyDecimal.java 10 May 2002 02:51:14 -0000 1.4
@@ -18,7 +18,7 @@
* must begin with a number.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/27 23:10:18 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/10 02:51:14 $
*/
public final class DeweyDecimal
{
@@ -44,7 +44,7 @@
* Construct a DeweyDecimal from string in DeweyDecimal format.
*
* @param string the string in dewey decimal format
- * @exception NumberFormatException if string is malformed
+ * @throws NumberFormatException if string is malformed
*/
public DeweyDecimal( final String string )
throws NumberFormatException
1.14 +2 -2 jakarta-avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/Resources.java
Index: Resources.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/Resources.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Resources.java 26 Mar 2002 10:45:24 -0000 1.13
+++ Resources.java 10 May 2002 02:51:14 -0000 1.14
@@ -713,7 +713,7 @@
* that this Manager does not provide simplified access to.
*
* @return the ResourceBundle
- * @exception MissingResourceException if an error occurs
+ * @throws MissingResourceException if an error occurs
*/
public final ResourceBundle getBundle()
throws MissingResourceException
@@ -746,7 +746,7 @@
*
* @param key the key to resource
* @return the string resource
- * @exception MissingResourceException if an error occurs
+ * @throws MissingResourceException if an error occurs
*/
private String getPatternString( final String key )
throws MissingResourceException
1.4 +2 -2 jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/DemuxInputStream.java
Index: DemuxInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/DemuxInputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DemuxInputStream.java 26 Apr 2002 06:36:48 -0000 1.3
+++ DemuxInputStream.java 10 May 2002 02:51:14 -0000 1.4
@@ -15,7 +15,7 @@
* with this thread.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/04/26 06:36:48 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/10 02:51:14 $
*/
public final class DemuxInputStream
extends InputStream
@@ -37,7 +37,7 @@
/**
* Closes stream associated with current thread.
*
- * @exception IOException if an error occurs
+ * @throws IOException if an error occurs
*/
public void close()
throws IOException
1.4 +3 -3 jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/DemuxOutputStream.java
Index: DemuxOutputStream.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/DemuxOutputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DemuxOutputStream.java 26 Apr 2002 06:36:48 -0000 1.3
+++ DemuxOutputStream.java 10 May 2002 02:51:14 -0000 1.4
@@ -15,7 +15,7 @@
* with this thread.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/04/26 06:36:48 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/10 02:51:14 $
*/
public final class DemuxOutputStream
extends OutputStream
@@ -37,7 +37,7 @@
/**
* Closes stream associated with current thread.
*
- * @exception IOException if an error occurs
+ * @throws IOException if an error occurs
*/
public void close()
throws IOException
@@ -52,7 +52,7 @@
/**
* Flushes stream associated with current thread.
*
- * @exception IOException if an error occurs
+ * @throws IOException if an error occurs
*/
public void flush()
throws IOException
1.28 +2 -2 jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/FileUtil.java
Index: FileUtil.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/FileUtil.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- FileUtil.java 2 May 2002 10:04:04 -0000 1.27
+++ FileUtil.java 10 May 2002 02:51:14 -0000 1.28
@@ -44,7 +44,7 @@
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
- * @version CVS $Revision: 1.27 $ $Date: 2002/05/02 10:04:04 $
+ * @version CVS $Revision: 1.28 $ $Date: 2002/05/10 02:51:14 $
* @since 4.0
*/
public final class FileUtil
@@ -125,7 +125,7 @@
*
* @param files the array of files
* @return the array of URLs
- * @exception IOException if an error occurs
+ * @throws IOException if an error occurs
*/
public static URL[] toURLs( final File[] files )
throws IOException
1.2 +2 -2 jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/FileTargetFactory.java
Index: FileTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/FileTargetFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileTargetFactory.java 4 Apr 2002 02:34:15 -0000 1.1
+++ FileTargetFactory.java 10 May 2002 02:51:14 -0000 1.2
@@ -106,7 +106,7 @@
* </dl>
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/04/04 02:34:15 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/05/10 02:51:14 $
* @since 4.0
*/
public class FileTargetFactory
@@ -303,7 +303,7 @@
*
* @param rawFilename The filename with substitutable placeholders
* @return The processed file name
- * @exception ConfigurationException if substitutable values are not in the
+ * @throws ConfigurationException if substitutable values are not in the
* Context object.
*/
protected final String getFilename( String rawFilename )
1.2 +1 -1 jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SocketTargetFactory.java
Index: SocketTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SocketTargetFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketTargetFactory.java 4 Apr 2002 02:34:15 -0000 1.1
+++ SocketTargetFactory.java 10 May 2002 02:51:14 -0000 1.2
@@ -36,7 +36,7 @@
* Creates a log target based on Configuration
*
*@param conf Configuration requied for creating the log target
- *@exception ConfigurationException if something goes wrong while reading from
+ *@throws ConfigurationException if something goes wrong while reading from
* configuration
*/
public LogTarget createTarget( final Configuration conf )
1.2 +4 -4 jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/ThreadControl.java
Index: ThreadControl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/ThreadControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadControl.java 4 Apr 2002 05:09:06 -0000 1.1
+++ ThreadControl.java 10 May 2002 02:51:14 -0000 1.2
@@ -18,8 +18,8 @@
* Wait for specified time for thread to complete it's work.
*
* @param milliSeconds the duration in milliseconds to wait until the thread has finished work
- * @exception IllegalStateException if isValid() == false
- * @exception InterruptedException if another thread has interrupted the current thread.
+ * @throws IllegalStateException if isValid() == false
+ * @throws InterruptedException if another thread has interrupted the current thread.
* The interrupted status of the current thread is cleared when this exception
* is thrown.
*/
@@ -29,8 +29,8 @@
/**
* Call Thread.interupt() on thread being controlled.
*
- * @exception IllegalStateException if isValid() == false
- * @exception SecurityException if caller does not have permission to call interupt()
+ * @throws IllegalStateException if isValid() == false
+ * @throws SecurityException if caller does not have permission to call interupt()
*/
void interupt()
throws IllegalStateException, SecurityException;
1.2 +4 -4 jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadControl.java
Index: DefaultThreadControl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultThreadControl.java 4 Apr 2002 05:09:06 -0000 1.1
+++ DefaultThreadControl.java 10 May 2002 02:51:14 -0000 1.2
@@ -37,8 +37,8 @@
* Wait for specified time for thread to complete it's work.
*
* @param milliSeconds the duration in milliseconds to wait until the thread has finished work
- * @exception IllegalStateException if isValid() == false
- * @exception InterruptedException if another thread has interrupted the current thread.
+ * @throws IllegalStateException if isValid() == false
+ * @throws InterruptedException if another thread has interrupted the current thread.
* The interrupted status of the current thread is cleared when this exception
* is thrown.
*/
@@ -63,8 +63,8 @@
/**
* Call Thread.interrupt() on thread being controlled.
*
- * @exception IllegalStateException if isValid() == false
- * @exception SecurityException if caller does not have permission to call interupt()
+ * @throws IllegalStateException if isValid() == false
+ * @throws SecurityException if caller does not have permission to call interupt()
*/
public synchronized void interupt()
throws IllegalStateException, SecurityException
1.5 +3 -3 jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultThreadPool.java 9 May 2002 10:51:41 -0000 1.4
+++ DefaultThreadPool.java 10 May 2002 02:51:14 -0000 1.5
@@ -84,8 +84,8 @@
{
context = m_context.duplicate();
}
-
- final WorkerThread worker =
+
+ final WorkerThread worker =
new WorkerThread( this, name, m_pool, context );
worker.setDaemon( true );
worker.enableLogging( m_logger );
@@ -135,7 +135,7 @@
* Retrieve a worker thread from pool.
*
* @return the worker thread retrieved from pool
- * @exception Exception if an error occurs
+ * @throws Exception if an error occurs
*/
protected WorkerThread getWorker()
{
1.2 +1 -1 jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/ExecutableRunnable.java
Index: ExecutableRunnable.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/ExecutableRunnable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecutableRunnable.java 4 Apr 2002 05:09:06 -0000 1.1
+++ ExecutableRunnable.java 10 May 2002 02:51:14 -0000 1.2
@@ -39,7 +39,7 @@
/**
* Execute the underlying <code>Runnable</code> object.
*
- * @exception Exception if an error occurs
+ * @throws Exception if an error occurs
*/
public void execute()
throws Exception
1.5 +2 -2 jakarta-avalon-excalibur/threadcontext/src/java/org/apache/excalibur/threadcontext/ThreadContextPolicy.java
Index: ThreadContextPolicy.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/src/java/org/apache/excalibur/threadcontext/ThreadContextPolicy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ThreadContextPolicy.java 26 Apr 2002 06:34:49 -0000 1.4
+++ ThreadContextPolicy.java 10 May 2002 02:51:14 -0000 1.5
@@ -23,7 +23,7 @@
* <p>This interface is expected to be used as a Flyweight object.</p>
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/04/26 06:34:49 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/10 02:51:14 $
*/
public interface ThreadContextPolicy
{
@@ -51,7 +51,7 @@
*
* @param key The key
* @param value the value
- * @exception IllegalArgumentException if pair is not valid
+ * @throws IllegalArgumentException if pair is not valid
*/
void verifyKeyValue( String key, Object value )
throws IllegalArgumentException;
1.2 +2 -2 jakarta-avalon-excalibur/threadcontext/src/java/org/apache/excalibur/threadcontext/impl/AbstractThreadContextPolicy.java
Index: AbstractThreadContextPolicy.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/src/java/org/apache/excalibur/threadcontext/impl/AbstractThreadContextPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractThreadContextPolicy.java 26 Apr 2002 06:33:28 -0000 1.1
+++ AbstractThreadContextPolicy.java 10 May 2002 02:51:14 -0000 1.2
@@ -16,7 +16,7 @@
* {@link ThreadContextPolicy} objects.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/04/26 06:33:28 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/10 02:51:14 $
*/
public abstract class AbstractThreadContextPolicy
implements ThreadContextPolicy
@@ -66,7 +66,7 @@
*
* @param key The key
* @param value the value
- * @exception IllegalArgumentException if pair is not valid
+ * @throws IllegalArgumentException if pair is not valid
*/
public void verifyKeyValue( final String key, final Object value )
throws IllegalArgumentException
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>