donaldp 01/03/12 20:52:02
Modified: src/conf avalon-demo-assembly.xml
src/java/org/apache/cornerstone/blocks/masterstore
AbstractFileRepository.java
File_Persistent_Object_Repository.java
File_Persistent_Stream_Repository.java
RepositoryManager.java RepositoryManager.xinfo
src/java/org/apache/cornerstone/demos/simpleserver
SimpleServer.java SimpleServer.xinfo
src/java/org/apache/cornerstone/services Store.java
src/java/org/apache/cornerstone/services/sockets
SocketManager.java
src/manifest cornerstone.mf
Added: src/java/org/apache/cornerstone/services/store
ObjectRepository.java Repository.java Store.java
StreamRepository.java
Removed: src/java/org/apache/cornerstone/blocks/eventserver
EventServer.java EventServer.xinfo
src/java/org/apache/cornerstone/blocks/serversocket
AuthenticatedServerSocketAcceptor.java
ServerSocketAcceptor.java SocketManager.java
SocketManager.xinfo TLSServerSocketAcceptor.java
src/java/org/apache/cornerstone/services Scheduler.java
SocketServer.java
Log:
* Removed deprecated blocks eventscheduler/socketmanager
* deprecated old store interface and moved to new package services.store
* Removed inner interfaces as not all compilers compiled it correctly. Made inner
interfaces top-level classes.
Revision Changes Path
1.2 +145 -189 jakarta-avalon-cornerstone/src/conf/avalon-demo-assembly.xml
Index: avalon-demo-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/conf/avalon-demo-assembly.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-demo-assembly.xml 2001/02/22 07:57:05 1.1
+++ avalon-demo-assembly.xml 2001/03/13 04:51:55 1.2
@@ -5,200 +5,156 @@
All blocks have full defaults so nothing is needed to make them run.
-->
-<avalon>
+<phoenix>
- <!-- The Storage block -->
- <block class="org.apache.cornerstone.blocks.masterstore.RepositoryManager"
- name="objectstorage" >
-
- <configuration>
- <repositories>
- <repository
class="org.apache.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.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>
-
- </block>
+ <!-- The Storage block -->
+ <block class="org.apache.cornerstone.blocks.masterstore.RepositoryManager"
+ name="objectstorage" >
+
+ <configuration>
+ <repositories>
+ <repository
class="org.apache.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.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>
+ </block>
- <!-- The Connection Manager block -->
- <block
class="org.apache.cornerstone.blocks.connection.DefaultConnectionManager"
- name="connections" >
- </block>
-
- <!-- The Socket Manager block -->
- <block class="org.apache.cornerstone.blocks.sockets.DefaultSocketManager"
name="sockets2" >
-
- <configuration>
-
- <server-sockets>
- <factory name="plain"
-
class="org.apache.cornerstone.blocks.sockets.DefaultServerSocketFactory" />
- <!--
- <factory name="ssl"
-
class="org.apache.cornerstone.blocks.sockets.TLSServerSocketFactory">
- <keystore>
- <file>conf/keystore</file>
- <password>secret</password>
- <type>JKS</type>
- <protocol>TLS</protocol>
- <algorithm>SunX509</algorithm>
- <authenticate-client>false</authenticate-client>
- </keystore>
- </factory>
- -->
- </server-sockets>
-
- <client-sockets>
- <factory name="plain"
-
class="org.apache.cornerstone.blocks.sockets.DefaultSocketFactory" />
- </client-sockets>
-
- </configuration>
-
- </block>
-
- <!-- The Socket Manager block -->
- <!-- No longer used.. -->
- <block class="org.apache.cornerstone.blocks.serversocket.SocketManager"
name="sockets" >
-
- <configuration>
- <listenerDefinition help="These are default socket listener. An
- application can implement an use its own lstener to perform
- specific task (ex. MD5Listener etc.)" >
- <listener type="DEFAULT"
class="org.apache.cornerstone.blocks.serversocket.ServerSocketAcceptor">
- </listener>
- <listener type="IPFILTERING"
class="org.apache.cornerstone.blocks.serversocket.AuthenticatedServerSocketAcceptor">
- <denied></denied>
- </listener>
- <!-- Uncomment this listener, if you want TLS support -->
- <!--
- <listener type="TLS"
-
class="org.apache.cornerstone.blocks.serversocket.TLSServerSocketAcceptor">
- <serverKeysFile>avalonTestKeys</serverKeysFile>
- </listener>
- -->
- <!-- End TLS section -->
- </listenerDefinition>
- </configuration>
-
- </block>
-
- <!-- The Time Manager block -->
- <block class="org.apache.cornerstone.blocks.eventserver.EventServer"
name="scheduler" >
- <configuration>
- </configuration>
- </block>
-
- <!-- The TimeScheduler block -->
- <block class="org.apache.cornerstone.blocks.scheduler.DefaultTimeScheduler"
- name="scheduler2" >
- </block>
-
- <block
class="org.apache.cornerstone.demos.helloworldserver.HelloWorldServerImpl"
- name="helloworldserver" >
- <provide name="sockets2"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
- <provide name="connections"
-
role="org.apache.cornerstone.services.connection.ConnectionManager" />
-
- <configuration>
- <port>8999</port>
- <bind>127.0.0.1</bind>
- <helloworldhandler>
- <connectiontimeout> 360000 </connectiontimeout>
- </helloworldhandler>
- </configuration>
- </block>
-
- <block
class="org.apache.cornerstone.demos.httpproxy.DefaultHttpAuditingProxyServer"
- name="httpproxyserver-Auditing" >
- <provide name="sockets2"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
- <provide name="connections"
-
role="org.apache.cornerstone.services.connection.ConnectionManager" />
-
- <configuration>
- <listen-port>9997</listen-port>
- <bind> 127.0.0.1 </bind>
- <httpproxyhandler-Auditing>
- <connectiontimeout> 360000 </connectiontimeout>
- </httpproxyhandler-Auditing>
- </configuration>
- </block>
+ <!-- The Connection Manager block -->
+ <block class="org.apache.cornerstone.blocks.connection.DefaultConnectionManager"
+ name="connections" />
+
+ <!-- The Socket Manager block -->
+ <block class="org.apache.cornerstone.blocks.sockets.DefaultSocketManager"
name="sockets" >
+ <configuration>
+ <server-sockets>
+ <factory name="plain"
+
class="org.apache.cornerstone.blocks.sockets.DefaultServerSocketFactory" />
+ <!--
+ <factory name="ssl"
+
class="org.apache.cornerstone.blocks.sockets.TLSServerSocketFactory">
+ <keystore>
+ <file>conf/keystore</file>
+ <password>secret</password>
+ <type>JKS</type>
+ <protocol>TLS</protocol>
+ <algorithm>SunX509</algorithm>
+ <authenticate-client>false</authenticate-client>
+ </keystore>
+ </factory>
+ -->
+ </server-sockets>
+
+ <client-sockets>
+ <factory name="plain"
+ class="org.apache.cornerstone.blocks.sockets.DefaultSocketFactory"
/>
+ </client-sockets>
+ </configuration>
+ </block>
+
+ <!-- The TimeScheduler block -->
+ <block class="org.apache.cornerstone.blocks.scheduler.DefaultTimeScheduler"
+ name="scheduler"/>
+
+ <block class="org.apache.cornerstone.demos.helloworldserver.HelloWorldServerImpl"
+ name="helloworldserver" >
+ <provide name="sockets"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
+ <provide name="connections"
+ role="org.apache.cornerstone.services.connection.ConnectionManager" />
+
+ <configuration>
+ <port>8999</port>
+ <bind>127.0.0.1</bind>
+ <helloworldhandler>
+ <connectiontimeout>360000</connectiontimeout>
+ </helloworldhandler>
+ </configuration>
+ </block>
+
+ <block
class="org.apache.cornerstone.demos.httpproxy.DefaultHttpAuditingProxyServer"
+ name="httpproxyserver-Auditing" >
+ <provide name="sockets"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
+ <provide name="connections"
+ role="org.apache.cornerstone.services.connection.ConnectionManager" />
+
+ <configuration>
+ <listen-port>9997</listen-port>
+ <bind>127.0.0.1</bind>
+ <httpproxyhandler-Auditing>
+ <connectiontimeout>360000</connectiontimeout>
+ </httpproxyhandler-Auditing>
+ </configuration>
+ </block>
- <block
class="org.apache.cornerstone.demos.httpproxy.DefaultHttpFilteringProxyServer"
- name="httpproxyserver-Filtering" >
- <provide name="sockets2"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
- <provide name="connections"
-
role="org.apache.cornerstone.services.connection.ConnectionManager" />
-
- <configuration>
- <listen-port>9998</listen-port>
- <fforward-to-another-proxy>localhost:9997</fforward-to-another-proxy>
- <bind> 127.0.0.1 </bind>
- <httpproxyhandler-Filtering>
- <connectiontimeout> 360000 </connectiontimeout>
- </httpproxyhandler-Filtering>
+ <block
class="org.apache.cornerstone.demos.httpproxy.DefaultHttpFilteringProxyServer"
+ name="httpproxyserver-Filtering" >
+ <provide name="sockets"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
+ <provide name="connections"
+ role="org.apache.cornerstone.services.connection.ConnectionManager" />
+
+ <configuration>
+ <listen-port>9998</listen-port>
+ <fforward-to-another-proxy>localhost:9997</fforward-to-another-proxy>
+ <bind>127.0.0.1</bind>
+ <httpproxyhandler-Filtering>
+ <connectiontimeout>360000</connectiontimeout>
+ </httpproxyhandler-Filtering>
- <blocked-domains>
- <blocked-domain domain-name="doubleclick.net" />
- <blocked-domain domain-name="akamai.net" />
- </blocked-domains>
- <cookies-allowed-domains>
- <cookies-allowed-domain domain-name="yahoo.co.uk" />
- <cookies-allowed-domain domain-name="yahoo.com" />
- </cookies-allowed-domains>
-
- </configuration>
-
- </block>
-
- <block class="org.apache.cornerstone.demos.simpleserver.SimpleServer"
- name="demoblock" >
-
- <!-- The names here must match the names specified for a Block in some
conf.xml file.
- The role should be the interface mentioned in the Demo.xinfo -->
-
- <provide name="sockets2"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
- <provide name="connections"
-
role="org.apache.cornerstone.services.connection.ConnectionManager" />
- <provide name="objectstorage" role="org.apache.cornerstone.services.Store"/>
- <provide name="scheduler2"
- role="org.apache.cornerstone.services.scheduler.TimeScheduler"/>
-
- <!-- Note trailing file searator in destinationURL -->
- <configuration>
- <repository destinationURL="file://var/demo/"
- type="OBJECT"
- model="SYNCHRONOUS">
- </repository>
- <port>4556</port>
- </configuration>
- </block>
+ <blocked-domains>
+ <blocked-domain domain-name="doubleclick.net" />
+ <blocked-domain domain-name="akamai.net" />
+ </blocked-domains>
+ <cookies-allowed-domains>
+ <cookies-allowed-domain domain-name="yahoo.co.uk" />
+ <cookies-allowed-domain domain-name="yahoo.com" />
+ </cookies-allowed-domains>
+ </configuration>
+ </block>
+
+ <block class="org.apache.cornerstone.demos.simpleserver.SimpleServer"
+ name="demoblock" >
+
+ <!-- The names here must match the names specified for a Block in some conf.xml
file.
+ The role should be the interface mentioned in the BlockInfo (.xinfo) files -->
+
+ <provide name="sockets"
role="org.apache.cornerstone.services.sockets.SocketManager"/>
+ <provide name="connections"
+ role="org.apache.cornerstone.services.connection.ConnectionManager" />
+ <provide name="objectstorage"
role="org.apache.cornerstone.services.store.Store"/>
+ <provide name="scheduler"
+ role="org.apache.cornerstone.services.scheduler.TimeScheduler"/>
+
+ <!-- Note trailing file searator in destinationURL -->
+ <configuration>
+ <repository destinationURL="file://var/demo/" type="OBJECT"
model="SYNCHRONOUS"/>
+ <port>4556</port>
+ </configuration>
+ </block>
-</avalon>
+</phoenix>
1.3 +3 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/AbstractFileRepository.java
Index: AbstractFileRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractFileRepository.java 2001/02/26 13:57:44 1.2
+++ AbstractFileRepository.java 2001/03/13 04:51:56 1.3
@@ -30,6 +30,7 @@
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
import org.apache.cornerstone.services.Store;
+import org.apache.cornerstone.services.store.Repository;
import org.apache.avalon.util.io.ExtensionFileFilter;
/**
@@ -40,7 +41,7 @@
*/
public abstract class AbstractFileRepository
extends AbstractLoggable
- implements Block, Store.Repository, Contextualizable, Composer, Configurable,
Initializable
+ implements Block, Repository, Contextualizable, Composer, Configurable,
Initializable
{
protected static final boolean DEBUG = false;
@@ -130,7 +131,7 @@
return (AbstractFileRepository)getClass().newInstance();
}
- public Store.Repository getChildRepository( final String childName )
+ public Repository getChildRepository( final String childName )
{
AbstractFileRepository child = null;
1.2 +2 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/File_Persistent_Object_Repository.java
Index: File_Persistent_Object_Repository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/File_Persistent_Object_Repository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- File_Persistent_Object_Repository.java 2001/02/22 07:52:16 1.1
+++ File_Persistent_Object_Repository.java 2001/03/13 04:51:56 1.2
@@ -11,11 +11,9 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
import org.apache.cornerstone.services.Store;
+import org.apache.cornerstone.services.store.ObjectRepository;
/**
* This is a simple implementation of persistent object store using
@@ -27,7 +25,7 @@
*/
public class File_Persistent_Object_Repository
extends AbstractFileRepository
- implements Store.ObjectRepository
+ implements Store.ObjectRepository, ObjectRepository
{
protected String getExtensionDecorator()
{
1.3 +2 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/File_Persistent_Stream_Repository.java
Index: File_Persistent_Stream_Repository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/File_Persistent_Stream_Repository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- File_Persistent_Stream_Repository.java 2001/02/26 13:57:44 1.2
+++ File_Persistent_Stream_Repository.java 2001/03/13 04:51:56 1.3
@@ -14,6 +14,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.cornerstone.services.Store;
+import org.apache.cornerstone.services.store.StreamRepository;
import org.apache.avalon.util.io.IOUtil;
/**
@@ -25,7 +26,7 @@
*/
public class File_Persistent_Stream_Repository
extends AbstractFileRepository
- implements Store.StreamRepository
+ implements Store.StreamRepository, StreamRepository
{
protected final HashMap m_inputs = new HashMap();
protected final HashMap m_outputs = new HashMap();
1.3 +6 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryManager.java 2001/02/24 05:15:58 1.2
+++ RepositoryManager.java 2001/03/13 04:51:56 1.3
@@ -25,7 +25,8 @@
import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
import org.apache.phoenix.Block;
-import org.apache.cornerstone.services.Store;
+import org.apache.cornerstone.services.store.Store;
+import org.apache.cornerstone.services.store.Repository;
/**
*
@@ -33,7 +34,8 @@
*/
public class RepositoryManager
extends AbstractLoggable
- implements Block, Store, Contextualizable, Composer, Configurable
+ implements Block, Store, Contextualizable, Composer, Configurable,
+ org.apache.cornerstone.services.Store
{
private static final String REPOSITORY_NAME = "Repository";
private static long id = 0;
@@ -134,7 +136,7 @@
{
final String type = repConf.getAttribute( "type" );
final String repID = destination + type;
- Store.Repository reply = (Store.Repository)m_repositories.get( repID );
+ Repository reply = (Repository)m_repositories.get( repID );
final String model = (String)repConf.getAttribute( "model" );
if( null != reply )
@@ -160,7 +162,7 @@
try
{
- reply = (Store.Repository)Class.forName( repClass
).newInstance();
+ reply = (Repository)Class.forName( repClass ).newInstance();
setupLogger( reply, "repository" );
if( reply instanceof Contextualizable )
1.2 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/RepositoryManager.xinfo
Index: RepositoryManager.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/RepositoryManager.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepositoryManager.xinfo 2001/02/22 07:52:16 1.1
+++ RepositoryManager.xinfo 2001/03/13 04:51:57 1.2
@@ -3,16 +3,15 @@
<blockinfo>
<meta>
-
<contributors>
<author name="Federico Barbier" email="[EMAIL PROTECTED]"/>
</contributors>
-
</meta>
<!-- services that are offered by this block -->
<services>
<service name="org.apache.cornerstone.services.Store" version="1.0" />
+ <service name="org.apache.cornerstone.services.store.Store" version="1.0" />
</services>
</blockinfo>
1.2 +5 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.java
Index: SimpleServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleServer.java 2001/02/22 07:51:55 1.1
+++ SimpleServer.java 2001/03/13 04:51:58 1.2
@@ -24,7 +24,8 @@
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Initializable;
import org.apache.phoenix.Block;
-import org.apache.cornerstone.services.Store;
+import org.apache.cornerstone.services.store.Store;
+import org.apache.cornerstone.services.store.ObjectRepository;
import org.apache.cornerstone.services.sockets.SocketManager;
import org.apache.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.cornerstone.services.connection.ConnectionHandler;
@@ -58,7 +59,7 @@
protected SocketManager m_socketManager;
protected ConnectionManager m_connectionManager;
protected Store m_testStore;
- protected Store.ObjectRepository m_repository;
+ protected ObjectRepository m_repository;
protected PrintWriter m_out;
protected int m_count;
@@ -67,7 +68,7 @@
throws ComponentManagerException
{
m_testStore =
- (Store)componentManager.lookup( "org.apache.cornerstone.services.Store"
);
+ (Store)componentManager.lookup(
"org.apache.cornerstone.services.store.Store" );
m_socketManager = (SocketManager)componentManager.
lookup( "org.apache.cornerstone.services.sockets.SocketManager" );
@@ -93,7 +94,7 @@
final Configuration repConf = m_configuration.getChild( "repository" );
getLogger().info( "Want to use repository in:" +
repConf.getAttribute( "destinationURL" ) );
- m_repository = (Store.ObjectRepository)m_testStore.select( repConf );
+ m_repository = (ObjectRepository)m_testStore.select( repConf );
getLogger().info( "Got repository" );
TimeTrigger trigger = null;
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.xinfo
Index: SimpleServer.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleServer.xinfo 2001/02/22 07:51:55 1.1
+++ SimpleServer.xinfo 2001/03/13 04:51:59 1.2
@@ -19,8 +19,8 @@
<dependencies>
<dependency>
- <role>org.apache.cornerstone.services.Store</role>
- <service name="org.apache.cornerstone.services.Store" version="1.0"/>
+ <role>org.apache.cornerstone.services.store.Store</role>
+ <service name="org.apache.cornerstone.services.store.Store" version="1.0"/>
</dependency>
<dependency>
<role>org.apache.cornerstone.services.connection.ConnectionManager</role>
1.2 +4 -56
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/Store.java
Index: Store.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/Store.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Store.java 2001/02/22 07:51:34 1.1
+++ Store.java 2001/03/13 04:52:00 1.2
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -8,71 +7,20 @@
*/
package org.apache.cornerstone.services;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
-import org.apache.phoenix.Service;
-
/**
* @author Federico Barbieri <[EMAIL PROTECTED]>
+ * @deprecated Use org.apache.cornerstone.services.store.* instead
*/
public interface Store
- extends Service, ComponentSelector
+ extends org.apache.cornerstone.services.store.Store
{
- /**
- * This method accept a Configuration object as hint and return the
- * corresponding Repository.
- * The Configuration must be in the form of:
- * <repository destinationURL="[URL of this repository]"
- * type="[repository type ex. OBJECT or STREAM or MAIL etc.]"
- * model="[repository model ex. PERSISTENT or CACHE etc.]">
- * [addition configuration]
- * </repository>
- */
- Component select( Object hint )
- throws ComponentManagerException;
-
- /**
- * Generic Repository interface
- */
- public interface Repository
- extends Component
- {
- Repository getChildRepository( String childName );
- }
-
- /**
- * Repository for Serializable Objects.
- */
public interface ObjectRepository
- extends Repository
+ extends org.apache.cornerstone.services.store.ObjectRepository
{
- Object get( String key );
-
- void put( String key, Object value );
-
- void remove( String key );
-
- boolean containsKey( String key );
-
- Iterator list();
}
- /**
- * Repository for Streams
- */
public interface StreamRepository
- extends Repository
+ extends org.apache.cornerstone.services.store.StreamRepository
{
- OutputStream put( String key );
-
- InputStream get( String key );
-
- void remove( String key );
-
- Iterator list();
}
}
1.2 +0 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketManager.java
Index: SocketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketManager.java 2001/02/22 07:51:36 1.1
+++ SocketManager.java 2001/03/13 04:52:00 1.2
@@ -13,7 +13,6 @@
/**
* Service to manager the socket factories.
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface SocketManager
1.1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/ObjectRepository.java
Index: ObjectRepository.java
===================================================================
/*
* 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.cornerstone.services.store;
import java.util.Iterator;
/**
* Repository for Serializable Objects.
*
* @author Federico Barbieri <[EMAIL PROTECTED]>
*/
public interface ObjectRepository
extends Repository
{
Object get( String key );
void put( String key, Object value );
void remove( String key );
boolean containsKey( String key );
Iterator list();
}
1.1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Repository.java
Index: Repository.java
===================================================================
/*
* 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.cornerstone.services.store;
import org.apache.avalon.Component;
/**
* Generic Repository interface
*
* @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
*/
public interface Repository
extends Component
{
Repository getChildRepository( String childName );
}
1.1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Store.java
Index: Store.java
===================================================================
/*
* 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.cornerstone.services.store;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentSelector;
import org.apache.phoenix.Service;
/**
* @author Federico Barbieri <[EMAIL PROTECTED]>
*/
public interface Store
extends Service, ComponentSelector
{
/**
* This method accept a Configuration object as hint and return the
* corresponding Repository.
* The Configuration must be in the form of:
* <repository destinationURL="[URL of this repository]"
* type="[repository type ex. OBJECT or STREAM or MAIL etc.]"
* model="[repository model ex. PERSISTENT or CACHE etc.]">
* [addition configuration]
* </repository>
*/
Component select( Object hint )
throws ComponentManagerException;
}
1.1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/StreamRepository.java
Index: StreamRepository.java
===================================================================
/*
* 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.cornerstone.services.store;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Iterator;
/**
* Repository for Streams
*
* @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
*/
public interface StreamRepository
extends Repository
{
OutputStream put( String key );
InputStream get( String key );
void remove( String key );
Iterator list();
}
1.3 +0 -6 jakarta-avalon-cornerstone/src/manifest/cornerstone.mf
Index: cornerstone.mf
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/manifest/cornerstone.mf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cornerstone.mf 2001/02/25 12:25:02 1.2
+++ cornerstone.mf 2001/03/13 04:52:01 1.3
@@ -1,12 +1,6 @@
Manifest-Version: 1.0
Created-By: Apache Avalon Project
-Name: org/apache/cornerstone/blocks/serversocket/SocketManager.class
-Avalon-Block: true
-
-Name: org/apache/cornerstone/blocks/eventserver/EventServer.class
-Avalon-Block: true
-
Name: org/apache/cornerstone/blocks/masterstore/RepositoryManager.class
Avalon-Block: true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
