You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by fe...@apache.org on 2001/02/27 12:02:53 UTC
cvs commit: jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container Entry.java Locator.java MetaInfo.java Registry.java
fede 01/02/27 03:02:53
Modified: proposal/4.0/src/java/org/apache/avalon changes.txt
proposal/4.0/src/java/org/apache/avalon/camelot
AbstractCamelotDeployer.java AbstractContainer.java
AbstractDeployer.java AbstractZipDeployer.java
AvalonState.java CamelotUtil.java
DefaultFactory.java DefaultLoader.java
DefaultLocator.java DefaultLocatorRegistry.java
DefaultRegistry.java DeployerUtil.java
proposal/4.0/src/java/org/apache/avalon/container Entry.java
Locator.java MetaInfo.java Registry.java
Log:
explicit import statements.
removed container.Info
Revision Changes Path
1.5 +2 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/changes.txt
Index: changes.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/changes.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.txt 2001/02/27 09:01:58 1.4
+++ changes.txt 2001/02/27 11:02:29 1.5
@@ -30,4 +30,5 @@
-ThreadManager do not extend any more Component.
-ObjectFactory do not extend any more Component.
-Pool do not extend any more Component.
--Split avalon.container into avalon.container (Component unaware interfaces) and avalon.camelot (Component aware classes).
\ No newline at end of file
+-Split avalon.container into avalon.container (Component unaware interfaces) and avalon.camelot (Component aware classes).
+-Removed container.Info. Entry now returns MetaInfo
\ No newline at end of file
1.2 +10 -3 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AbstractCamelotDeployer.java
Index: AbstractCamelotDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AbstractCamelotDeployer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractCamelotDeployer.java 2001/02/27 08:42:29 1.1
+++ AbstractCamelotDeployer.java 2001/02/27 11:02:32 1.2
@@ -10,7 +10,14 @@
import java.net.URL;
import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.Composer;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.DeploymentException;
+import org.apache.avalon.container.ContainerException;
+import org.apache.avalon.container.RegistryException;
+import org.apache.avalon.container.Container;
+import org.apache.avalon.container.Registry;
+import org.apache.avalon.container.LocatorRegistry;
+import org.apache.avalon.container.Entry;
+import org.apache.avalon.container.MetaInfo;
/**
* This class deploys resources from camelot based system.
@@ -87,7 +94,7 @@
getLogger().debug( "Registered " + m_type + " " + name + " as " + classname );
}
- protected void addInfo( final String name, final Info info )
+ protected void addInfo( final String name, final MetaInfo info )
throws DeploymentException
{
try { m_infoRegistry.register( name, info ); }
@@ -97,6 +104,6 @@
re );
}
- getLogger().debug( "Registered Info " + m_type + " " + name );
+ getLogger().debug( "Registered MetaInfo " + m_type + " " + name );
}
}
1.2 +3 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/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/27 08:42:29 1.1
+++ AbstractContainer.java 2001/02/27 11:02:32 1.2
@@ -11,7 +11,9 @@
import java.util.Iterator;
import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.component.Component;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.ContainerException;
+import org.apache.avalon.container.Entry;
+import org.apache.avalon.container.Container;
/**
* This contains it during execution and may provide certain
1.2 +3 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AbstractDeployer.java
Index: AbstractDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AbstractDeployer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDeployer.java 2001/02/27 08:42:29 1.1
+++ AbstractDeployer.java 2001/02/27 11:02:33 1.2
@@ -19,7 +19,9 @@
import org.apache.avalon.component.ComponentNotFoundException;
import org.apache.aut.io.FileUtil;
import org.apache.log.Logger;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.Deployer;
+import org.apache.avalon.container.DeploymentException;
+
/**
* A Deployer is responsible for taking a URL (ie a jar/war/ear) and deploying
1.2 +2 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AbstractZipDeployer.java
Index: AbstractZipDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/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/27 08:42:29 1.1
+++ AbstractZipDeployer.java 2001/02/27 11:02:33 1.2
@@ -13,7 +13,8 @@
import java.net.URL;
import java.util.zip.ZipFile;
import org.apache.avalon.component.Composer;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.DeploymentException;
+
/**
* This class deploys a .zip file into a registry.
1.2 +3 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AvalonState.java
Index: AvalonState.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/AvalonState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonState.java 2001/02/27 08:42:29 1.1
+++ AvalonState.java 2001/02/27 11:02:34 1.2
@@ -6,7 +6,9 @@
* the LICENSE file.
*/
package org.apache.avalon.camelot;
-import org.apache.avalon.container.*;
+
+import org.apache.avalon.container.State;
+
public final class AvalonState
extends State
1.2 +3 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/CamelotUtil.java
Index: CamelotUtil.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/CamelotUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CamelotUtil.java 2001/02/27 08:42:29 1.1
+++ CamelotUtil.java 2001/02/27 11:02:35 1.2
@@ -13,7 +13,9 @@
import java.util.Iterator;
import org.apache.avalon.component.Component;
import org.apache.aut.io.ExtensionFileFilter;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.Deployer;
+import org.apache.avalon.container.DeploymentException;
+
/**
* Utility methods for Camelot related facilities.
1.2 +5 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/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/27 08:42:29 1.1
+++ DefaultFactory.java 2001/02/27 11:02:36 1.2
@@ -11,7 +11,11 @@
import java.util.HashMap;
import org.apache.avalon.component.Component;
import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.Loader;
+import org.apache.avalon.container.FactoryException;
+import org.apache.avalon.container.Factory;
+import org.apache.avalon.container.Locator;
+
/**
1.2 +3 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLoader.java
Index: DefaultLoader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLoader.java 2001/02/27 08:42:29 1.1
+++ DefaultLoader.java 2001/02/27 11:02:36 1.2
@@ -12,7 +12,9 @@
import org.apache.aut.ObjectUtil;
import org.apache.aut.ExceptionUtil;
import org.apache.avalon.component.Component;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.FactoryException;
+import org.apache.avalon.container.Loader;
+
/**
* Class used to load resources from a source.
1.2 +2 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLocator.java
Index: DefaultLocator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLocator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLocator.java 2001/02/27 08:42:29 1.1
+++ DefaultLocator.java 2001/02/27 11:02:37 1.2
@@ -9,7 +9,8 @@
import java.net.URL;
import org.apache.avalon.component.Component;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.Locator;
+
/**
* This contains information required to locate a component.
1.2 +3 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLocatorRegistry.java
Index: DefaultLocatorRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLocatorRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLocatorRegistry.java 2001/02/27 08:42:29 1.1
+++ DefaultLocatorRegistry.java 2001/02/27 11:02:37 1.2
@@ -8,7 +8,9 @@
package org.apache.avalon.camelot;
import org.apache.avalon.component.Component;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.Locator;
+import org.apache.avalon.container.LocatorRegistry;
+import org.apache.avalon.container.RegistryException;
/**
* Represents a Registry of locators.
1.2 +8 -5 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultRegistry.java
Index: DefaultRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultRegistry.java 2001/02/27 08:42:29 1.1
+++ DefaultRegistry.java 2001/02/27 11:02:38 1.2
@@ -10,8 +10,11 @@
import java.util.HashMap;
import java.util.Iterator;
import org.apache.avalon.component.Component;
-import org.apache.avalon.container.*;
+import org.apache.avalon.container.Registry;
+import org.apache.avalon.container.RegistryException;
+import org.apache.avalon.container.MetaInfo;
+
/**
* Represents a Registry of names to types.
*
@@ -28,7 +31,7 @@
m_infoClass = clazz;
}
- public void register( final String name, final Info info )
+ public void register( final String name, final MetaInfo info )
throws RegistryException
{
if( null != m_infos.get( name ) )
@@ -51,10 +54,10 @@
}
}
- public Info getInfo( final String name )
+ public MetaInfo getInfo( final String name )
throws RegistryException
{
- final Info info = (Info)m_infos.get( name );
+ final MetaInfo info = (MetaInfo)m_infos.get( name );
if( null == info )
{
@@ -71,7 +74,7 @@
return m_infos.keySet().iterator();
}
- protected void checkInfo( final String name, final Info info )
+ protected void checkInfo( final String name, final MetaInfo info )
throws RegistryException
{
if( !m_infoClass.isAssignableFrom( info.getClass() ) )
1.2 +2 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DeployerUtil.java
Index: DeployerUtil.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/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/27 08:42:29 1.1
+++ DeployerUtil.java 2001/02/27 11:02:38 1.2
@@ -7,7 +7,6 @@
*/
package org.apache.avalon.camelot;
-import org.apache.avalon.container.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +26,8 @@
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.DefaultConfigurationBuilder;
import org.xml.sax.SAXException;
+import org.apache.avalon.container.DeploymentException;
+
/**
* This class deploys resources from camelot based system.
1.2 +6 -6 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/Entry.java
Index: Entry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/Entry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Entry.java 2001/02/25 10:45:45 1.1
+++ Entry.java 2001/02/27 11:02:47 1.2
@@ -19,7 +19,7 @@
public class Entry
implements Component
{
- protected Info m_info;
+ protected MetaInfo m_info;
protected Object m_instance;
protected State m_state;
@@ -27,7 +27,7 @@
{
}
- public Entry( final Info info, final Object instance, final State state )
+ public Entry( final MetaInfo info, final Object instance, final State state )
{
m_info = info;
m_instance = instance;
@@ -35,11 +35,11 @@
}
/**
- * Retrieve Info describing instance.
+ * Retrieve MetaInfo describing instance.
*
* @return the info
*/
- public Info getInfo()
+ public MetaInfo getInfo()
{
return m_info;
}
@@ -47,9 +47,9 @@
/**
* Mutator for info property.
*
- * @param info the Info
+ * @param info the MetaInfo
*/
- public void setInfo( final Info info )
+ public void setInfo( final MetaInfo info )
{
m_info = info;
}
1.2 +1 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/Locator.java
Index: Locator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/Locator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Locator.java 2001/02/25 10:45:45 1.1
+++ Locator.java 2001/02/27 11:02:48 1.2
@@ -16,7 +16,7 @@
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Locator
- extends Info
+ extends MetaInfo
{
/**
* Retrieve "name" of component type.
1.2 +0 -1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/MetaInfo.java
Index: MetaInfo.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/MetaInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetaInfo.java 2001/02/25 10:45:45 1.1
+++ MetaInfo.java 2001/02/27 11:02:48 1.2
@@ -13,6 +13,5 @@
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface MetaInfo
- extends Info
{
}
1.2 +4 -4 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/Registry.java
Index: Registry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/container/Registry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Registry.java 2001/02/25 10:45:45 1.1
+++ Registry.java 2001/02/27 11:02:49 1.2
@@ -25,7 +25,7 @@
* @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, MetaInfo info ) throws RegistryException;
/**
* unregister an info.
@@ -36,13 +36,13 @@
void unregister( String name ) throws RegistryException;
/**
- * Retrieve an Info by name.
+ * Retrieve an MetaInfo by name.
*
* @param name the name
- * @return the Info
+ * @return the MetaInfo
* @exception RegistryException if an error occurs
*/
- Info getInfo( String name ) throws RegistryException;
+ MetaInfo getInfo( String name ) throws RegistryException;
/**
* Return an iterator of all names of infos registered.