donaldp 01/04/14 17:26:26
Modified: src/java/org/apache/avalon/camelot
AbstractCamelotDeployer.java AbstractContainer.java
AbstractZipDeployer.java CamelotUtil.java
Container.java ContainerException.java
DefaultFactory.java DefaultLoader.java
DefaultRegistry.java Deployer.java
DeployerUtil.java DeploymentException.java
Descriptor.java Entry.java Factory.java
FactoryException.java Info.java Loader.java
Locator.java Registry.java RegistryException.java
State.java
Log:
Remove spaces at end of lines.
Revision Changes Path
1.3 +7 -9
jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractCamelotDeployer.java
Index: AbstractCamelotDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractCamelotDeployer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractCamelotDeployer.java 2001/04/02 09:09:03 1.2
+++ AbstractCamelotDeployer.java 2001/04/15 00:26:18 1.3
@@ -10,7 +10,6 @@
import java.net.URL;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.Composer;
/**
@@ -29,13 +28,12 @@
protected Registry m_locatorRegistry;
protected Container m_container;
protected Registry m_infoRegistry;
-
+
/**
* Retrieve relevent services needed to deploy.
*
* @param componentManager the ComponentManager
- * @exception ComponentNotFoundException if an error occurs
- * @exception ComponentNotAccessibleException if an error occurs
+ * @exception ComponentManagerException if an error occurs
*/
public void compose( final ComponentManager componentManager )
throws ComponentManagerException
@@ -69,23 +67,23 @@
}
getLogger().debug( "Adding " + m_type + "Entry " + name + " as " + entry );
- }
+ }
protected void addLocator( final String name, final String classname, final URL
url )
throws DeploymentException
{
final DefaultLocator locator = new DefaultLocator( classname, url );
-
+
try { m_locatorRegistry.register( name, locator ); }
catch( final RegistryException re )
{
throw new DeploymentException( "Error registering " + name + " due to "
+ re,
re );
}
-
+
getLogger().debug( "Registered " + m_type + " " + name + " as " + classname
);
}
-
+
protected void addInfo( final String name, final Info info )
throws DeploymentException
{
@@ -95,7 +93,7 @@
throw new DeploymentException( "Error registering " + name + " due to "
+ re,
re );
}
-
+
getLogger().debug( "Registered Info " + m_type + " " + name );
}
}
1.2 +20 -20
jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractContainer.java 2001/02/24 04:00:36 1.1
+++ AbstractContainer.java 2001/04/15 00:26:18 1.2
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
@@ -13,7 +13,7 @@
import org.apache.avalon.Component;
/**
- * This contains it during execution and may provide certain
+ * This contains it during execution and may provide certain
* facilities (like a thread per EJB etc).
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
@@ -69,7 +69,7 @@
throws ContainerException
{
final Entry entry = (Entry)m_entries.get( name );
-
+
if( null == entry )
{
throw new ContainerException( "Name " + name + " not contained" );
@@ -91,7 +91,7 @@
}
/**
- * This method is called before entry is added to give chance for
+ * This method is called before entry is added to give chance for
* sub-class to veto removal.
*
* @param name the name of entry
@@ -104,7 +104,7 @@
}
/**
- * This method is called after entry is added to give chance for
+ * This method is called after entry is added to give chance for
* sub-class to do some cleanup.
*
* @param name the name of entry
@@ -113,9 +113,9 @@
protected void postAdd( final String name, final Entry entry )
{
}
-
+
/**
- * This method is called before entry is removed to give chance for
+ * This method is called before entry is removed to give chance for
* sub-class to veto removal.
*
* @param name the name of entry
@@ -128,7 +128,7 @@
}
/**
- * This method is called after entry is removed to give chance for
+ * This method is called after entry is removed to give chance for
* sub-class to do some cleanup.
*
* @param name the name of entry
@@ -137,7 +137,7 @@
protected void postRemove( final String name, final Entry entry )
{
}
-
+
/**
* List all entries in container.
*
@@ -146,26 +146,26 @@
protected Iterator listEntries()
{
return m_entries.values().iterator();
- }
-
+ }
+
protected void checkEntry( final String name, final Entry entry )
throws ContainerException
{
if( null != m_entries.get( name ) )
{
- throw new ContainerException( "Can not add component to container
because " +
+ throw new ContainerException( "Can not add component to container
because " +
"entry already exists with name " + name
);
}
if( !isValidName( name ) )
{
- throw new ContainerException( "Can not add component to container
because " +
+ throw new ContainerException( "Can not add component to container
because " +
"invalid name " + name );
}
-
+
if( !isValidEntry( entry ) )
{
- throw new ContainerException( "Can not add component to container
because " +
+ throw new ContainerException( "Can not add component to container
because " +
"invalid entry for " + name );
}
1.2 +3 -5
jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractZipDeployer.java
Index: AbstractZipDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractZipDeployer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractZipDeployer.java 2001/02/24 04:00:36 1.1
+++ AbstractZipDeployer.java 2001/04/15 00:26:18 1.2
@@ -12,7 +12,6 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.zip.ZipFile;
-import org.apache.avalon.Composer;
/**
* This class deploys a .zip file into a registry.
@@ -21,7 +20,6 @@
*/
public abstract class AbstractZipDeployer
extends AbstractCamelotDeployer
- implements Composer
{
/**
* Deploy a file.
@@ -37,11 +35,11 @@
final ZipFile zipFile = DeployerUtil.getZipFileFor( file );
URL url = null;
-
+
try
{
try { url = file.toURL(); }
- catch( final MalformedURLException mue )
+ catch( final MalformedURLException mue )
{
throw new DeploymentException( "Unable to form url", mue );
}
@@ -55,7 +53,7 @@
}
/**
- * Overide this method to provide the actual functionality and
+ * Overide this method to provide the actual functionality and
* deploy the resources from a zip file.
*
* @param zipFile the ZipFile
1.3 +7 -7
jakarta-avalon/src/java/org/apache/avalon/camelot/CamelotUtil.java
Index: CamelotUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/CamelotUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CamelotUtil.java 2001/03/15 04:56:23 1.2
+++ CamelotUtil.java 2001/04/15 00:26:18 1.3
@@ -8,13 +8,13 @@
package org.apache.avalon.camelot;
import java.io.File;
-import java.io.IOException;
import java.io.FilenameFilter;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Iterator;
import org.apache.avalon.Component;
-import org.apache.avalon.util.io.ExtensionFileFilter;
import org.apache.avalon.util.io.DirectoryFileFilter;
+import org.apache.avalon.util.io.ExtensionFileFilter;
/**
* Utility methods for Camelot related facilities.
@@ -68,14 +68,14 @@
for( int i = 0; i < files.length; i++ )
{
final String filename = files[ i ].getName();
-
+
int index = filename.lastIndexOf( '.' );
if( -1 == index ) index = filename.length();
-
+
final String name = filename.substring( 0, index );
-
+
try
- {
+ {
final File file = files[ i ].getCanonicalFile();
deployer.deploy( name, file.toURL() );
}
@@ -85,7 +85,7 @@
}
catch( final IOException ioe )
{
- throw new DeploymentException( "Unable to get canonical
representation " +
+ throw new DeploymentException( "Unable to get canonical
representation " +
"for file " + files[ i ], ioe );
}
}
1.2 +7 -7 jakarta-avalon/src/java/org/apache/avalon/camelot/Container.java
Index: Container.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Container.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Container.java 2001/02/24 04:00:36 1.1
+++ Container.java 2001/04/15 00:26:19 1.2
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
@@ -11,7 +11,7 @@
import org.apache.avalon.Component;
/**
- * This contains it during execution and may provide certain
+ * This contains it during execution and may provide certain
* facilities (like a thread per EJB etc).
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
1.2 +4 -4
jakarta-avalon/src/java/org/apache/avalon/camelot/ContainerException.java
Index: ContainerException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/ContainerException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerException.java 2001/02/24 04:00:36 1.1
+++ ContainerException.java 2001/04/15 00:26:19 1.2
@@ -11,10 +11,10 @@
/**
* Exception to indicate error manipulating container.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public final class ContainerException
+public final class ContainerException
extends CascadingException
{
/**
@@ -22,7 +22,7 @@
*
* @param message The detail message for this exception.
*/
- public ContainerException( final String message )
+ public ContainerException( final String message )
{
this( message, null );
}
@@ -33,7 +33,7 @@
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
- public ContainerException( final String message, final Throwable throwable )
+ public ContainerException( final String message, final Throwable throwable )
{
super( message, throwable );
}
1.2 +1 -1
jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFactory.java 2001/02/24 04:00:36 1.1
+++ DefaultFactory.java 2001/04/15 00:26:19 1.2
@@ -9,8 +9,8 @@
import java.net.URL;
import java.util.HashMap;
-import org.apache.avalon.Component;
import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.Component;
/**
* This is the component that creates the components.
1.4 +10 -10
jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultLoader.java
Index: DefaultLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLoader.java 2001/03/28 09:45:03 1.3
+++ DefaultLoader.java 2001/04/15 00:26:19 1.4
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
@@ -13,7 +13,7 @@
/**
* Class used to load resources from a source.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultLoader
@@ -34,7 +34,7 @@
public DefaultLoader( final URL location )
{
this( location, Thread.currentThread().getContextClassLoader() );
- }
+ }
public DefaultLoader()
{
@@ -90,13 +90,13 @@
}
catch( final IllegalAccessException iae )
{
- throw new FactoryException( "Failed to instantiate class " + classname
+
+ throw new FactoryException( "Failed to instantiate class " + classname +
" as it does not have a publicly accesable
" +
"default constructor", iae );
}
catch( final Throwable t )
{
- throw new FactoryException( "Failed to get class " + classname +
+ throw new FactoryException( "Failed to get class " + classname +
" due to " + StringUtil.printStackTrace( t,
5, true ),
t );
}
1.3 +1 -1
jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultRegistry.java
Index: DefaultRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultRegistry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultRegistry.java 2001/04/02 09:09:04 1.2
+++ DefaultRegistry.java 2001/04/15 00:26:20 1.3
@@ -61,7 +61,7 @@
else if( !clazz.isInstance( info ) )
{
throw new RegistryException( "Info of type " +
info.getClass().getName() +
- " not compatable with expected type " +
clazz.getName() );
+ " not compatable with expected type " +
clazz.getName() );
}
else
{
1.2 +6 -7 jakarta-avalon/src/java/org/apache/avalon/camelot/Deployer.java
Index: Deployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Deployer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Deployer.java 2001/02/24 04:00:36 1.1
+++ Deployer.java 2001/04/15 00:26:20 1.2
@@ -1,14 +1,13 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
import java.net.URL;
-import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.Component;
/**
1.2 +27 -27
jakarta-avalon/src/java/org/apache/avalon/camelot/DeployerUtil.java
Index: DeployerUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DeployerUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeployerUtil.java 2001/02/24 04:00:36 1.1
+++ DeployerUtil.java 2001/04/15 00:26:20 1.2
@@ -62,13 +62,13 @@
* @exception DeploymentException if an error occurs
*/
/*
- public final static ZipFile getZipFileFor( final URL url )
- throws DeploymentException
- {
- final File file = getFileFor( url );
- return getZipFileFor( file );
- }
-*/
+ public final static ZipFile getZipFileFor( final URL url )
+ throws DeploymentException
+ {
+ final File file = getFileFor( url );
+ return getZipFileFor( file );
+ }
+*/
/**
* Retrieve zip file for file.
*
@@ -82,12 +82,12 @@
try { return new ZipFile( file ); }
catch( final IOException ioe )
{
- throw new DeploymentException( "Error opening " + file +
+ throw new DeploymentException( "Error opening " + file +
" due to " + ioe.getMessage(),
ioe );
- }
+ }
}
-
+
/**
* Utility method to load configuration from zip.
*
@@ -96,13 +96,13 @@
* @return the Configuration
* @exception DeploymentException if an error occurs
*/
- public final static Configuration loadConfiguration( final ZipFile zipFile,
+ public final static Configuration loadConfiguration( final ZipFile zipFile,
final String filename )
throws DeploymentException
{
return buildConfiguration( loadResourceStream( zipFile, filename ) );
}
-
+
/**
* Build a configuration tree based on input stream.
*
@@ -127,7 +127,7 @@
throw new DeploymentException( "Error reading configuration", ioe );
}
}
-
+
/**
* Utility method to load a manifest from a zip file.
*
@@ -138,9 +138,9 @@
throws DeploymentException
{
final InputStream input = loadResourceStream( zipFile,
"META-INF/MANIFEST.MF" );
-
+
try { return new Manifest( input ); }
- catch( final IOException ioe )
+ catch( final IOException ioe )
{
throw new DeploymentException( "Error reading manifest", ioe );
}
@@ -150,7 +150,7 @@
catch( final IOException ioe ) {}
}
}
-
+
/**
* Utility method to load properties from zip.
*
@@ -159,23 +159,23 @@
* @return the Properties
* @exception DeploymentException if an error occurs
*/
- public final static Properties loadProperties( final ZipFile zipFile,
+ public final static Properties loadProperties( final ZipFile zipFile,
final String filename )
throws DeploymentException
{
final Properties properties = new Properties();
-
+
try { properties.load( loadResourceStream( zipFile, filename ) ); }
catch( final IOException ioe )
{
- throw new DeploymentException( "Error reading " + filename +
+ throw new DeploymentException( "Error reading " + filename +
" from " + zipFile.getName(),
ioe );
}
-
+
return properties;
}
-
+
/**
* Load a resource from a zip file.
*
@@ -184,24 +184,24 @@
* @return the InputStream
* @exception DeploymentException if an error occurs
*/
- public final static InputStream loadResourceStream( final ZipFile zipFile,
+ public final static InputStream loadResourceStream( final ZipFile zipFile,
final String filename )
throws DeploymentException
{
final ZipEntry entry = zipFile.getEntry( filename );
-
+
if( null == entry )
{
- throw new DeploymentException( "Unable to locate " + filename +
+ throw new DeploymentException( "Unable to locate " + filename +
" in " + zipFile.getName() );
}
-
+
try { return zipFile.getInputStream( entry ); }
catch( final IOException ioe )
{
- throw new DeploymentException( "Error reading " + filename +
+ throw new DeploymentException( "Error reading " + filename +
" from " + zipFile.getName(),
ioe );
- }
+ }
}
}
1.2 +4 -4
jakarta-avalon/src/java/org/apache/avalon/camelot/DeploymentException.java
Index: DeploymentException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DeploymentException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeploymentException.java 2001/02/24 04:00:36 1.1
+++ DeploymentException.java 2001/04/15 00:26:20 1.2
@@ -11,10 +11,10 @@
/**
* Exception to indicate error deploying.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public final class DeploymentException
+public final class DeploymentException
extends CascadingException
{
/**
@@ -22,7 +22,7 @@
*
* @param message The detail message for this exception.
*/
- public DeploymentException( final String message )
+ public DeploymentException( final String message )
{
this( message, null );
}
@@ -33,7 +33,7 @@
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
- public DeploymentException( final String message, final Throwable throwable )
+ public DeploymentException( final String message, final Throwable throwable )
{
super( message, throwable );
}
1.2 +6 -6
jakarta-avalon/src/java/org/apache/avalon/camelot/Descriptor.java
Index: Descriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Descriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Descriptor.java 2001/04/02 09:09:04 1.1
+++ Descriptor.java 2001/04/15 00:26:20 1.2
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
1.2 +24 -3 jakarta-avalon/src/java/org/apache/avalon/camelot/Entry.java
Index: Entry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Entry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Entry.java 2001/02/24 04:00:36 1.1
+++ Entry.java 2001/04/15 00:26:20 1.2
@@ -19,9 +19,10 @@
public class Entry
implements Component
{
- protected Info m_info;
- protected Object m_instance;
- protected State m_state;
+ private Info m_info;
+ private Object m_instance;
+ private State m_state;
+ private Locator m_locator;
public Entry()
{
@@ -52,6 +53,26 @@
public void setInfo( final Info info )
{
m_info = info;
+ }
+
+ /**
+ * Retrieve Locator describing access path for instance.
+ *
+ * @return the locator
+ */
+ public Locator getLocator()
+ {
+ return m_locator;
+ }
+
+ /**
+ * Mutator for locator property.
+ *
+ * @param locator the Locator
+ */
+ public void setLocator( final Locator locator )
+ {
+ m_locator = locator;
}
/**
1.2 +10 -10 jakarta-avalon/src/java/org/apache/avalon/camelot/Factory.java
Index: Factory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Factory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Factory.java 2001/02/24 04:00:36 1.1
+++ Factory.java 2001/04/15 00:26:20 1.2
@@ -1,16 +1,16 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
import org.apache.avalon.Component;
/**
- * This is the component that creates the components.
+ * This is the component that creates the components.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
@@ -24,11 +24,11 @@
* @return the component
* @exception FactoryException if an error occurs
*/
- Object create( Locator locator )
+ Object create( Locator locator )
throws FactoryException;
/**
- * Create a component whos position is indicated by locator.
+ * Create a component whos position is indicated by locator.
* Make sure it is of the correct type.
*
* @param locator the locator indicating the component location
@@ -36,6 +36,6 @@
* @return the component
* @exception FactoryException if an error occurs
*/
- Object create( Locator locator, Class clazz )
+ Object create( Locator locator, Class clazz )
throws FactoryException;
}
1.2 +4 -4
jakarta-avalon/src/java/org/apache/avalon/camelot/FactoryException.java
Index: FactoryException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/FactoryException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryException.java 2001/02/24 04:00:36 1.1
+++ FactoryException.java 2001/04/15 00:26:21 1.2
@@ -11,10 +11,10 @@
/**
* Exception to indicate error creating entries in factory.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public final class FactoryException
+public final class FactoryException
extends CascadingException
{
/**
@@ -22,7 +22,7 @@
*
* @param message The detail message for this exception.
*/
- public FactoryException( final String message )
+ public FactoryException( final String message )
{
this( message, null );
}
@@ -33,7 +33,7 @@
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
- public FactoryException( final String message, final Throwable throwable )
+ public FactoryException( final String message, final Throwable throwable )
{
super( message, throwable );
}
1.3 +9 -9 jakarta-avalon/src/java/org/apache/avalon/camelot/Info.java
Index: Info.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Info.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Info.java 2001/04/02 09:09:04 1.2
+++ Info.java 2001/04/15 00:26:21 1.3
@@ -1,22 +1,22 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
import org.apache.avalon.Component;
/**
- * This contains information relating to a component.
+ * This contains information relating to a component.
* (ie BlockInfo, BeanInfo, MailetInfo etc).
*
* There is currently also two different sub-interfaces - Descriptor and Locator.
- * Descriptor describes static meta information about component while Locator
+ * Descriptor describes static meta information about component while Locator
* locates it in the system.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Info
1.3 +7 -7 jakarta-avalon/src/java/org/apache/avalon/camelot/Loader.java
Index: Loader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Loader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Loader.java 2001/03/02 06:39:16 1.2
+++ Loader.java 2001/04/15 00:26:21 1.3
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
@@ -11,7 +11,7 @@
/**
* Class used to load resources from a source.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Loader
1.2 +7 -7 jakarta-avalon/src/java/org/apache/avalon/camelot/Locator.java
Index: Locator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Locator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Locator.java 2001/02/24 04:00:36 1.1
+++ Locator.java 2001/04/15 00:26:21 1.2
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
@@ -12,7 +12,7 @@
/**
* This contains information required to locate a component.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Locator
1.3 +12 -9 jakarta-avalon/src/java/org/apache/avalon/camelot/Registry.java
Index: Registry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Registry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Registry.java 2001/04/02 09:09:04 1.2
+++ Registry.java 2001/04/15 00:26:21 1.3
@@ -1,9 +1,9 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
@@ -25,7 +25,8 @@
* @param info the info
* @exception RegistryException if info is invalid or name already contains
info under name
*/
- void register( String name, Info info ) throws RegistryException;
+ void register( String name, Info info )
+ throws RegistryException;
/**
* unregister an info.
@@ -33,7 +34,8 @@
* @param name the name of info
* @exception RegistryException if no such info exists
*/
- void unregister( String name ) throws RegistryException;
+ void unregister( String name )
+ throws RegistryException;
/**
* Retrieve an Info by name.
@@ -43,7 +45,8 @@
* @return the Info
* @exception RegistryException if an error occurs
*/
- Info getInfo( String name, Class clazz ) throws RegistryException;
+ Info getInfo( String name, Class clazz )
+ throws RegistryException;
/**
* Return an iterator of all names of infos registered.
1.2 +5 -5
jakarta-avalon/src/java/org/apache/avalon/camelot/RegistryException.java
Index: RegistryException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/RegistryException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegistryException.java 2001/02/24 04:00:36 1.1
+++ RegistryException.java 2001/04/15 00:26:21 1.2
@@ -11,10 +11,10 @@
/**
* Exception to indicate registry error.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public final class RegistryException
+public final class RegistryException
extends CascadingException
{
/**
@@ -22,18 +22,18 @@
*
* @param message The detail message for this exception.
*/
- public RegistryException( final String message )
+ public RegistryException( final String message )
{
this( message, null );
}
-
+
/**
* Construct a new <code>RegistryException</code> instance.
*
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
- public RegistryException( final String message, final Throwable throwable )
+ public RegistryException( final String message, final Throwable throwable )
{
super( message, throwable );
}
1.3 +7 -7 jakarta-avalon/src/java/org/apache/avalon/camelot/State.java
Index: State.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/State.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- State.java 2001/04/14 05:48:15 1.2
+++ State.java 2001/04/15 00:26:21 1.3
@@ -1,16 +1,16 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
import org.apache.avalon.util.ValuedEnum;
/**
- * Defines possible states for contained components.
+ * Defines possible states for contained components.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
