mcconnell 2002/08/15 21:14:32
Modified: . build.xml
src/java/org/apache/avalon/cornerstone/blocks/connection
DefaultConnectionManager.java
src/java/org/apache/avalon/cornerstone/blocks/datasource
DefaultDataSourceSelector.java
src/java/org/apache/avalon/cornerstone/blocks/masterstore
RepositoryManager.java
src/java/org/apache/avalon/cornerstone/blocks/scheduler
DefaultTimeScheduler.java
src/java/org/apache/avalon/cornerstone/blocks/sockets
DefaultServerSocketFactory.java
DefaultSocketFactory.java DefaultSocketManager.java
TLSServerSocketFactory.java TLSSocketFactory.java
src/java/org/apache/avalon/cornerstone/blocks/threads
DefaultThreadManager.java
src/java/org/apache/avalon/cornerstone/services/connection
AdaptingComponentManager.java
Added: src/java/org/apache/avalon/cornerstone/blocks/connection
DefaultConnectionManager.xtype
src/java/org/apache/avalon/cornerstone/blocks/datasource
DefaultDataSourceSelector.xtype
src/java/org/apache/avalon/cornerstone/blocks/masterstore
RepositoryManager.xprofile RepositoryManager.xtype
src/java/org/apache/avalon/cornerstone/blocks/sockets
DefaultSocketManager.xtype
src/java/org/apache/avalon/cornerstone/blocks/threads
DefaultThreadManager.xprofile
DefaultThreadManager.xtype
Log:
Updates to provides support for James execution under Merlin.
Revision Changes Path
1.111 +3 -0 jakarta-avalon-cornerstone/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/build.xml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- build.xml 13 Jul 2002 19:53:01 -0000 1.110
+++ build.xml 16 Aug 2002 04:14:31 -0000 1.111
@@ -168,6 +168,9 @@
</fileset>
<fileset dir="${src.dir}/java">
<include name="**/*-schema.xml"/>
+ <include name="**/*.xtype"/>
+ <include name="**/*.xconfig"/>
+ <include name="**/*.xprofile"/>
</fileset>
</jar>
1.21 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java
Index: DefaultConnectionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultConnectionManager.java 5 Aug 2002 14:12:13 -0000 1.20
+++ DefaultConnectionManager.java 16 Aug 2002 04:14:31 -0000 1.21
@@ -18,6 +18,7 @@
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.component.Component; // backward compatibility
/**
* This is the service through which ConnectionManagement occurs.
@@ -29,7 +30,7 @@
*/
public class DefaultConnectionManager
extends AbstractLogEnabled
- implements ConnectionManager, Serviceable, Disposable
+ implements ConnectionManager, Serviceable, Disposable, Component
{
private final HashMap m_connections = new HashMap();
private ThreadManager m_threadManager;
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.xtype
Index: DefaultConnectionManager.xtype
===================================================================
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
"http://jakarta.apache.org/avalon/type_1_0.dtd"; >
<type>
<component>
<name>connections</name>
<version>1.0</version>
</component>
<services>
<service>
<reference
type="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
</service>
</services>
<dependencies>
<dependency>
<reference
type="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
</dependency>
</dependencies>
</type>
1.22 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
Index: DefaultDataSourceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultDataSourceSelector.java 13 Jul 2002 19:55:38 -0000 1.21
+++ DefaultDataSourceSelector.java 16 Aug 2002 04:14:31 -0000 1.22
@@ -48,7 +48,7 @@
*/
public class DefaultDataSourceSelector
extends AbstractLogEnabled
- implements DataSourceSelector, Configurable, Initializable, Disposable
+ implements DataSourceSelector, Configurable, Initializable, Disposable,
Component
{
private Configuration m_configuration;
private Map m_dataSources;
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.xtype
Index: DefaultDataSourceSelector.xtype
===================================================================
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
"http://jakarta.apache.org/avalon/type_1_0.dtd"; >
<type>
<component>
<name>datasource</name>
<version>1.0</version>
</component>
<services>
<service>
<reference
type="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector"/>
</service>
</services>
</type>
1.9 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RepositoryManager.java 18 May 2002 13:30:08 -0000 1.8
+++ RepositoryManager.java 16 Aug 2002 04:14:32 -0000 1.9
@@ -32,7 +32,7 @@
*/
public class RepositoryManager
extends AbstractLogEnabled
- implements Store, Contextualizable, Composable, Configurable
+ implements Store, Contextualizable, Composable, Configurable, Component
{
private static final String REPOSITORY_NAME = "Repository";
private static long id = 0;
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.xprofile
Index: RepositoryManager.xprofile
===================================================================
<?xml version="1.0"?>
<!--
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.txt file.
@author Stephen McConnell
@version 1.0 12/08/2002
-->
<profiles>
<component name="store"
class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager">
<context class="org.apache.excalibur.merlin.toolkit.GenericBlockContext">
<import key="app.home" name="avalon:home"/>
<entry key="block.name" value="repository"/>
</context>
<configuration>
<repositories>
<repository
class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Object_Repository">
<protocols>
<protocol>file</protocol>
</protocols>
<types>
<type>OBJECT</type>
</types>
<models>
<model>SYNCHRONOUS</model>
<model>ASYNCHRONOUS</model>
<model>CACHE</model>
</models>
</repository>
<repository
class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Stream_Repository">
<protocols>
<protocol>file</protocol>
</protocols>
<types>
<type>STREAM</type>
</types>
<models>
<model>SYNCHRONOUS</model>
<model>ASYNCHRONOUS</model>
<model>CACHE</model>
</models>
</repository>
</repositories>
</configuration>
</component>
</profiles>
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.xtype
Index: RepositoryManager.xtype
===================================================================
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
"http://jakarta.apache.org/avalon/type_1_0.dtd"; >
<type>
<component>
<name>repository</name>
<version>1.0</version>
</component>
<context type="BlockContext">
<entry key="block.name"/>
<entry key="app.home" type="java.io.File"/>
</context>
<services>
<service>
<reference type="org.apache.avalon.cornerstone.services.store.Store"/>
</service>
</services>
</type>
1.20 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
Index: DefaultTimeScheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultTimeScheduler.java 5 Aug 2002 14:12:13 -0000 1.19
+++ DefaultTimeScheduler.java 16 Aug 2002 04:14:32 -0000 1.20
@@ -19,6 +19,7 @@
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.component.Component; // for backward
compatibility
/**
* Default implementation of TimeScheduler service.
@@ -31,7 +32,7 @@
*/
public class DefaultTimeScheduler
extends AbstractLogEnabled
- implements TimeScheduler, Serviceable, Startable, Disposable, Runnable
+ implements TimeScheduler, Serviceable, Startable, Disposable, Runnable,
Component
{
private final Hashtable m_entries = new Hashtable();
private final PriorityQueue m_priorityQueue =
1.7 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultServerSocketFactory.java
Index: DefaultServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultServerSocketFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultServerSocketFactory.java 5 Aug 2002 14:12:14 -0000 1.6
+++ DefaultServerSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.7
@@ -11,6 +11,7 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
+import org.apache.avalon.framework.component.Component;
/**
* Factory implementation for vanilla TCP sockets.
@@ -19,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Federico Barbieri</a>
*/
public class DefaultServerSocketFactory
- implements ServerSocketFactory
+ implements ServerSocketFactory, Component
{
/**
* Creates a socket on specified port.
1.5 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketFactory.java
Index: DefaultSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultSocketFactory.java 5 Aug 2002 14:12:14 -0000 1.4
+++ DefaultSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.5
@@ -11,6 +11,7 @@
import java.net.InetAddress;
import java.net.Socket;
import org.apache.avalon.cornerstone.services.sockets.SocketFactory;
+import org.apache.avalon.framework.component.Component;
/**
* The vanilla implementation of SocketFactory.
@@ -18,7 +19,7 @@
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
*/
public class DefaultSocketFactory
- implements SocketFactory
+ implements SocketFactory, Component
{
/**
* Create a socket and connect to remote address specified.
1.13 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java
Index: DefaultSocketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultSocketManager.java 5 Aug 2002 14:12:14 -0000 1.12
+++ DefaultSocketManager.java 16 Aug 2002 04:14:32 -0000 1.13
@@ -16,6 +16,7 @@
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.component.Component; // backward compatibility
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
@@ -32,7 +33,7 @@
*/
public class DefaultSocketManager
extends AbstractLogEnabled
- implements SocketManager, Contextualizable, Configurable, Initializable
+ implements SocketManager, Contextualizable, Configurable, Initializable,
Component
{
protected final HashMap m_serverSockets = new HashMap();
protected final HashMap m_sockets = new HashMap();
1.11 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSServerSocketFactory.java
Index: TLSServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSServerSocketFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TLSServerSocketFactory.java 5 Aug 2002 14:12:14 -0000 1.10
+++ TLSServerSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.11
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.BlockContext;
@@ -42,7 +43,7 @@
*/
public class TLSServerSocketFactory
extends AbstractLogEnabled
- implements ServerSocketFactory, Contextualizable, Configurable, Initializable
+ implements ServerSocketFactory, Contextualizable, Configurable, Initializable,
Component
{
protected SSLServerSocketFactory m_factory;
protected File m_baseDirectory;
1.4 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSSocketFactory.java
Index: TLSSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSSocketFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TLSSocketFactory.java 5 Aug 2002 14:12:14 -0000 1.3
+++ TLSSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.4
@@ -28,6 +28,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.component.Component; // for backward
compatibility
import org.apache.avalon.phoenix.BlockContext;
/**
@@ -43,7 +44,7 @@
*/
public class TLSSocketFactory
extends AbstractLogEnabled
- implements SocketFactory, Contextualizable, Configurable, Initializable
+ implements SocketFactory, Contextualizable, Configurable, Initializable,
Component
{
private SSLSocketFactory m_factory;
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.xtype
Index: DefaultSocketManager.xtype
===================================================================
<?xml version="1.0"?>
<!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
"http://jakarta.apache.org/phoenix/blockinfo_1_0.dtd";>
<type>
<component>
<name>sockets</name>
<version>1.0</version>
<attributes>
<attribute key="phoenix:shema-type" value="relax-ng"/>
</attributes>
</component>
<context type="BlockContext">
<entry key="block.name"/>
<entry key="app.home" type="java.io.File"/>
</context>
<services>
<service>
<reference
type="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
</service>
</services>
</type>
1.14 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java
Index: DefaultThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultThreadManager.java 5 Aug 2002 14:12:14 -0000 1.13
+++ DefaultThreadManager.java 16 Aug 2002 04:14:32 -0000 1.14
@@ -15,6 +15,7 @@
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.component.Component; // backward compatibility
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
@@ -27,7 +28,7 @@
*/
public class DefaultThreadManager
extends AbstractLogEnabled
- implements ThreadManager, Configurable
+ implements ThreadManager, Configurable, Component
{
///Map of thread pools for application
private HashMap m_threadPools = new HashMap();
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.xprofile
Index: DefaultThreadManager.xprofile
===================================================================
<?xml version="1.0"?>
<!--
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.txt file.
@author Stephen McConnell
@version 1.0 12/08/2002
-->
<profiles>
<component name="threads">
<configuration>
<thread-group>
<name>default</name>
<!-- normal priority == 5, max-priority = 10 -->
<priority>5</priority>
<!-- are threads deamon threads ? -->
<is-daemon>false</is-daemon>
<max-threads>40</max-threads>
<!-- these are ignored at the moment but will be fixed in later revisions -->
<min-threads>20</min-threads>
<min-spare-threads>20</min-spare-threads>
</thread-group>
</configuration>
</component>
</profiles>
1.1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.xtype
Index: DefaultThreadManager.xtype
===================================================================
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
"http://jakarta.apache.org/avalon/type_1_0.dtd"; >
<type>
<component>
<name>threads</name>
<version>1.0</version>
<attributes>
<attribute key="phoenix:shema-type" value="relax-ng"/>
</attributes>
</component>
<services>
<service>
<reference
type="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
</service>
</services>
</type>
1.3 +8 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AdaptingComponentManager.java
Index: AdaptingComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AdaptingComponentManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AdaptingComponentManager.java 5 Aug 2002 14:12:14 -0000 1.2
+++ AdaptingComponentManager.java 16 Aug 2002 04:14:32 -0000 1.3
@@ -39,7 +39,13 @@
{
try
{
- return (Component)m_serviceManager.lookup( role );
+ return (Component) m_serviceManager.lookup( role );
+ }
+ catch( final ClassCastException e )
+ {
+ final String error =
+ "Manager returned a non-component for the role: " + role;
+ throw new ComponentException( error, e );
}
catch( final ServiceException se )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
