? .classpath
? .project
? d
? gen
? velocity.log
Index: src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
retrieving revision 1.7
diff -u -r1.7 AbstractFileRepository.java
--- src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java 18 May 2002 09:50:38 -0000 1.7
+++ src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java 23 Sep 2002 22:49:18 -0000
@@ -19,9 +19,9 @@
import org.apache.avalon.cornerstone.services.store.Repository;
import org.apache.avalon.excalibur.io.ExtensionFileFilter;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -38,7 +38,7 @@
*/
public abstract class AbstractFileRepository
extends AbstractLogEnabled
- implements Repository, Contextualizable, Composable, Configurable, Initializable
+ implements Repository, Contextualizable, Serviceable, Configurable, Initializable
{
protected static final boolean DEBUG = false;
@@ -56,7 +56,7 @@
protected FilenameFilter m_filter;
protected File m_baseDirectory;
- protected ComponentManager m_componentManager;
+ protected ServiceManager m_serviceManager;
protected BlockContext m_context;
protected abstract String getExtensionDecorator();
@@ -67,10 +67,10 @@
m_baseDirectory = blockContext.getBaseDirectory();
}
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_componentManager = componentManager;
+ m_serviceManager = serviceManager;
}
public void configure( final Configuration configuration )
@@ -157,11 +157,11 @@
try
{
- child.compose( m_componentManager );
+ child.service( m_serviceManager );
}
- catch( final ComponentException cme )
+ catch( final ServiceException cme )
{
- throw new RuntimeException( "Cannot compose child " +
+ throw new RuntimeException( "Cannot service child " +
"repository " + childName +
" : " + cme );
}
Index: src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.10
diff -u -r1.10 RepositoryManager.java
--- src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java 17 Aug 2002 02:24:24 -0000 1.10
+++ src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java 23 Sep 2002 22:49:18 -0000
@@ -13,10 +13,9 @@
import org.apache.avalon.cornerstone.services.store.Repository;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -32,7 +31,7 @@
*/
public class RepositoryManager
extends AbstractLogEnabled
- implements Store, Contextualizable, Composable, Configurable
+ implements Store, Contextualizable, Serviceable, Configurable
{
private static final String REPOSITORY_NAME = "Repository";
private static long id = 0;
@@ -40,7 +39,7 @@
protected HashMap m_repositories = new HashMap();
protected HashMap m_models = new HashMap();
protected HashMap m_classes = new HashMap();
- protected ComponentManager m_componentManager;
+ protected ServiceManager m_serviceManager;
protected Context m_context;
public void contextualize( final Context context )
@@ -48,10 +47,10 @@
m_context = context;
}
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service (final ServiceManager serviceManager )
+ throws ServiceException
{
- m_componentManager = componentManager;
+ m_serviceManager = serviceManager;
}
public void configure( final Configuration configuration )
@@ -96,29 +95,29 @@
}
}
- public void release( final Component component )
+ public void release( final Object service )
{
}
- public boolean hasComponent( final Object hint )
+ public boolean isSelectable( final Object policy )
{
- if( hint instanceof Configuration )
+ if( policy instanceof Configuration )
return true;
else
return false;
}
-
- public Component select( final Object hint )
- throws ComponentException
+
+ public Object select( final Object policy )
+ throws ServiceException
{
Configuration repConf = null;
try
{
- repConf = (Configuration)hint;
+ repConf = (Configuration)policy;
}
catch( final ClassCastException cce )
{
- throw new ComponentException( "Hint is of the wrong type. " +
+ throw new ServiceException( "Hint is of the wrong type. " +
"Must be a Configuration", cce );
}
@@ -129,12 +128,12 @@
}
catch( final ConfigurationException ce )
{
- throw new ComponentException( "Malformed configuration has no " +
+ throw new ServiceException( "Malformed configuration has no " +
"destinationURL attribute", ce );
}
catch( final MalformedURLException mue )
{
- throw new ComponentException( "destination is malformed. " +
+ throw new ServiceException( "destination is malformed. " +
"Must be a valid URL", mue );
}
@@ -155,7 +154,7 @@
{
final String message = "There is already another repository with the " +
"same destination and type but with different model";
- throw new ComponentException( message );
+ throw new ServiceException( message );
}
}
else
@@ -176,9 +175,9 @@
( (Contextualizable)reply ).contextualize( m_context );
}
- if( reply instanceof Composable )
+ if( reply instanceof Serviceable )
{
- ( (Composable)reply ).compose( m_componentManager );
+ ( (Serviceable)reply ).service( m_serviceManager );
}
if( reply instanceof Configurable )
@@ -202,13 +201,13 @@
final String message = "Cannot find or init repository: " + e.getMessage();
getLogger().warn( message, e );
- throw new ComponentException( message, e );
+ throw new ServiceException( message, e );
}
}
}
catch( final ConfigurationException ce )
{
- throw new ComponentException( "Malformed configuration", ce );
+ throw new ServiceException( "Malformed configuration", ce );
}
}
Index: src/java/org/apache/avalon/cornerstone/services/store/Repository.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/store/Repository.java,v
retrieving revision 1.2
diff -u -r1.2 Repository.java
--- src/java/org/apache/avalon/cornerstone/services/store/Repository.java 11 Dec 2001 10:49:21 -0000 1.2
+++ src/java/org/apache/avalon/cornerstone/services/store/Repository.java 23 Sep 2002 22:49:19 -0000
@@ -7,15 +7,12 @@
*/
package org.apache.avalon.cornerstone.services.store;
-import org.apache.avalon.framework.component.Component;
-
/**
* Generic Repository interface
*
* @author Federico Barbieri
*/
public interface Repository
- extends Component
{
Repository getChildRepository( String childName );
}
Index: src/java/org/apache/avalon/cornerstone/services/store/Store.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/store/Store.java,v
retrieving revision 1.6
diff -u -r1.6 Store.java
--- src/java/org/apache/avalon/cornerstone/services/store/Store.java 16 Mar 2002 00:18:36 -0000 1.6
+++ src/java/org/apache/avalon/cornerstone/services/store/Store.java 23 Sep 2002 22:49:19 -0000
@@ -7,20 +7,19 @@
*/
package org.apache.avalon.cornerstone.services.store;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
/**
* @author Federico Barbieri
*/
public interface Store
- extends ComponentSelector
+ extends ServiceSelector
{
String ROLE = Store.class.getName();
/**
- * This method accept a Configuration object as hint and return the
+ * This method accept a Configuration object as policy and returns the
* corresponding Repository.
* The Configuration must be in the form of:
*
*/
- Component select( Object hint )
- throws ComponentException;
+ Object select( Object policy )
+ throws ServiceException;
}