Index: C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
===================================================================
--- C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java (revision 415573)
+++ C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java (working copy)
@@ -102,7 +102,7 @@
{
getLogger().info( "Init " + getClass().getName() + " Store" );
- m_name = RepositoryManager.getName();
+ m_name = "Repository";
String m_postfix = getExtensionDecorator();
m_extension = "." + m_name + m_postfix;
m_filter = new ExtensionFileFilter(m_extension);
Index: C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/NumberedRepositoryFileFilter.java
===================================================================
--- C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/NumberedRepositoryFileFilter.java (revision 415573)
+++ C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/NumberedRepositoryFileFilter.java (working copy)
@@ -31,7 +31,7 @@
public NumberedRepositoryFileFilter(final String extension) {
postfix = extension;
- prefix = "." + RepositoryManager.getName();
+ prefix = ".Repository";
}
public boolean accept(final File file, final String name) {
Index: C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java
===================================================================
--- C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java (revision 415573)
+++ C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java (working copy)
@@ -1,220 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2000-2006 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you *
- * may not use this file except in compliance with the License. You *
- * may obtain a copy of the License at: *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, software *
- * distributed under the License is distributed on an "AS IS" BASIS, *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or *
- * implied. See the License for the specific language governing *
- * permissions and limitations under the License. *
- ***********************************************************************/
-
-package org.apache.james.mailrepository.filepair;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import org.apache.avalon.cornerstone.services.store.Repository;
-import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-/**
- * @phoenix:block
- * @phoenix:service name="org.apache.avalon.cornerstone.services.store.Store"
- *
- */
-public class RepositoryManager
- extends AbstractLogEnabled
- implements Store, Contextualizable, Serviceable, Configurable
-{
- private static final String REPOSITORY_NAME = "Repository";
- private static long id = 0;
-
- protected HashMap m_repositories = new HashMap();
- protected HashMap m_models = new HashMap();
- protected HashMap m_classes = new HashMap();
- protected ServiceManager m_componentManager;
- protected Context m_context;
-
- public void contextualize( final Context context )
- {
- m_context = context;
- }
-
- public void service( final ServiceManager componentManager )
- throws ServiceException
- {
- m_componentManager = componentManager;
- }
-
- public void configure( final Configuration configuration )
- throws ConfigurationException
- {
- final Configuration[] registeredClasses =
- configuration.getChild( "repositories" ).getChildren( "repository" );
-
- for( int i = 0; i < registeredClasses.length; i++ )
- {
- registerRepository( registeredClasses[ i ] );
- }
- }
-
- public void registerRepository( final Configuration repConf )
- throws ConfigurationException
- {
- final String className = repConf.getAttribute( "class" );
- getLogger().info( "Registering Repository " + className );
-
- final Configuration[] protocols =
- repConf.getChild( "protocols" ).getChildren( "protocol" );
- final Configuration[] types = repConf.getChild( "types" ).getChildren( "type" );
- final Configuration[] modelIterator =
- repConf.getChild( "models" ).getChildren( "model" );
-
- for( int i = 0; i < protocols.length; i++ )
- {
- final String protocol = protocols[ i ].getValue();
-
- for( int j = 0; j < types.length; j++ )
- {
- final String type = types[ j ].getValue();
-
- for( int k = 0; k < modelIterator.length; k++ )
- {
- final String model = modelIterator[ k ].getValue();
- m_classes.put( protocol + type + model, className );
- getLogger().info( " for " + protocol + "," + type + "," + model );
- }
- }
- }
- }
-
- public void release( final Object component )
- {
- }
-
- public boolean isSelectable( final Object hint )
- {
- if( hint instanceof Configuration )
- return true;
- else
- return false;
- }
-
- public Object select( final Object hint )
- throws ServiceException
- {
- Configuration repConf = null;
- try
- {
- repConf = (Configuration)hint;
- }
- catch( final ClassCastException cce )
- {
- throw new ServiceException("", "Hint is of the wrong type. " +
- "Must be a Configuration", cce );
- }
-
- URL destination = null;
- try
- {
- destination = new URL( repConf.getAttribute( "destinationURL" ) );
- }
- catch( final ConfigurationException ce )
- {
- throw new ServiceException("","Malformed configuration has no " +
- "destinationURL attribute", ce );
- }
- catch( final MalformedURLException mue )
- {
- throw new ServiceException("", "destination is malformed. " +
- "Must be a valid URL", mue );
- }
-
- try
- {
- final String type = repConf.getAttribute( "type" );
- final String repID = destination + type;
- Repository reply = (Repository)m_repositories.get( repID );
- final String model = (String)repConf.getAttribute( "model" );
-
- if( null != reply )
- {
- if( m_models.get( repID ).equals( model ) )
- {
- return reply;
- }
- else
- {
- final String message = "There is already another repository with the " +
- "same destination and type but with different model";
- throw new ServiceException("", message );
- }
- }
- else
- {
- final String protocol = destination.getProtocol();
- final String repClass = (String)m_classes.get( protocol + type + model );
-
- getLogger().debug( "Need instance of " + repClass + " to handle: " +
- protocol + type + model );
-
- try
- {
- reply = (Repository)Class.forName( repClass ).newInstance();
- setupLogger( reply, "repository" );
-
- ContainerUtil.contextualize(reply,m_context);
- ContainerUtil.service(reply,m_componentManager);
-
- if (reply instanceof Composable) {
- final String error = "no implementation in place to support Composable";
- getLogger().error( error );
- throw new IllegalArgumentException( error );
- }
-
- ContainerUtil.configure(reply,repConf);
- ContainerUtil.initialize(reply);
-
- m_repositories.put( repID, reply );
- m_models.put( repID, model );
- getLogger().info( "New instance of " + repClass + " created for " +
- destination );
- return reply;
- }
- catch( final Exception e )
- {
- final String message = "Cannot find or init repository: " + e.getMessage();
- getLogger().warn( message, e );
-
- throw new ServiceException("", message, e );
- }
- }
- }
- catch( final ConfigurationException ce )
- {
- throw new ServiceException("", "Malformed configuration", ce );
- }
- }
-
- public static final String getName()
- {
- return REPOSITORY_NAME;
- }
-}
Index: C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.xinfo
===================================================================
--- C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.xinfo (revision 415573)
+++ C:/Lab/VOID/projects/james-trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.xinfo (working copy)
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
- 1.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: C:/Lab/VOID/projects/james-trunk/build.xml
===================================================================
--- C:/Lab/VOID/projects/james-trunk/build.xml (revision 415573)
+++ C:/Lab/VOID/projects/james-trunk/build.xml (working copy)
@@ -517,7 +517,6 @@
-
Index: C:/Lab/VOID/projects/james-trunk/include.properties
===================================================================
--- C:/Lab/VOID/projects/james-trunk/include.properties (revision 415573)
+++ C:/Lab/VOID/projects/james-trunk/include.properties (working copy)
@@ -63,7 +63,6 @@
# ----- Cornerstone masterstore, version 1.0 or later -----
cornerstone-store-api.jar=cornerstone-store-api-2.1.jar
-cornerstone-store-impl.jar=cornerstone-store-impl-2.1.jar
# ----- Cornerstone sockets, version 1.0 or later -----
cornerstone-sockets-api.jar=cornerstone-sockets-api-2.1.jar