donaldp 01/04/16 02:51:57
Modified: src/java/org/apache/cornerstone/blocks/masterstore
AbstractFileRepository.java
File_Persistent_Object_Repository.java
File_Persistent_Stream_Repository.java
RepositoryManager.java RepositoryManager.xinfo
Log:
Removed long deprecated Store interface.
Revision Changes Path
1.5 +0 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractFileRepository.java 2001/04/12 11:15:01 1.4
+++ AbstractFileRepository.java 2001/04/16 09:51:54 1.5
@@ -29,7 +29,6 @@
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.util.io.ExtensionFileFilter;
-import org.apache.cornerstone.services.Store;
import org.apache.cornerstone.services.store.Repository;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
1.4 +1 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- File_Persistent_Object_Repository.java 2001/03/17 17:03:04 1.3
+++ File_Persistent_Object_Repository.java 2001/04/16 09:51:55 1.4
@@ -14,7 +14,6 @@
import java.io.StreamCorruptedException;
import java.io.ObjectStreamClass;
import java.io.OutputStream;
-import org.apache.cornerstone.services.Store;
import org.apache.cornerstone.services.store.ObjectRepository;
/**
@@ -27,7 +26,7 @@
*/
public class File_Persistent_Object_Repository
extends AbstractFileRepository
- implements Store.ObjectRepository, ObjectRepository
+ implements ObjectRepository
{
protected String getExtensionDecorator()
{
1.4 +1 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- File_Persistent_Stream_Repository.java 2001/03/13 04:51:56 1.3
+++ File_Persistent_Stream_Repository.java 2001/04/16 09:51:55 1.4
@@ -13,7 +13,6 @@
import java.io.OutputStream;
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;
@@ -26,7 +25,7 @@
*/
public class File_Persistent_Stream_Repository
extends AbstractFileRepository
- implements Store.StreamRepository, StreamRepository
+ implements StreamRepository
{
protected final HashMap m_inputs = new HashMap();
protected final HashMap m_outputs = new HashMap();
1.5 +4 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepositoryManager.java 2001/04/12 11:15:02 1.4
+++ RepositoryManager.java 2001/04/16 09:51:55 1.5
@@ -32,8 +32,7 @@
*/
public class RepositoryManager
extends AbstractLoggable
- implements Block, Store, Contextualizable, Composer, Configurable,
- org.apache.cornerstone.services.Store
+ implements Block, Store, Contextualizable, Composer, Configurable
{
private static final String REPOSITORY_NAME = "Repository";
private static long id = 0;
@@ -97,11 +96,11 @@
}
}
- public void release( Component component )
+ public void release( final Component component )
{
}
- public Component select( Object hint )
+ public Component select( final Object hint )
throws ComponentException
{
Configuration repConf = null;
@@ -114,6 +113,7 @@
throw new ComponentException( "Hint is of the wrong type. " +
"Must be a Configuration", cce );
}
+
URL destination = null;
try
{
1.3 +0 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryManager.xinfo 2001/03/13 04:51:57 1.2
+++ RepositoryManager.xinfo 2001/04/16 09:51:55 1.3
@@ -10,7 +10,6 @@
<!-- 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
