activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r440342 [1/2] - in /incubator/activemq/trunk/activemq-core/src: main/java/org/apache/activemq/kaha/impl/ main/java/org/apache/activemq/kaha/impl/container/ main/java/org/apache/activemq/kaha/impl/data/ main/java/org/apache/activemq/kaha/imp...
Date Tue, 05 Sep 2006 13:51:15 GMT
Author: chirino
Date: Tue Sep  5 06:51:13 2006
New Revision: 440342

URL: http://svn.apache.org/viewvc?view=rev&rev=440342
Log:
splitting kaha.impl into 3 packages per: http://www.nabble.com/Kaha-package-re-rog-tf2218956.html

Added:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java   (with props)
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BaseContainerImpl.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/CachedContainerListIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerCollectionSupport.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySet.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySetIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerId.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySet.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySetIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerListIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerMapEntry.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollection.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollectionIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ListContainerImpl.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/MapContainerImpl.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataFile.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataItem.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManager.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataManager.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/Item.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoListener.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayInputStream.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayOutputStream.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataReader.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataWriter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BadMagicException.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DiskIndexLinkedList.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexItem.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexLinkedList.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexManager.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoStoreIndexItem.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexReader.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexWriter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/VMIndexLinkedList.java   (contents, props changed)
      - copied, changed from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/VMIndexLinkedList.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/CachedListContainerImplTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/VMIndexLinkedListTest.java
Removed:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BadMagicException.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BaseContainerImpl.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/CachedContainerListIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerCollectionSupport.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySet.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySetIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerId.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySet.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySetIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerListIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerMapEntry.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollection.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollectionIterator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataFile.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataItem.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataManager.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DiskIndexLinkedList.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexItem.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexLinkedList.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexManager.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/Item.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ListContainerImpl.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/MapContainerImpl.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoListener.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoStoreIndexItem.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayInputStream.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayOutputStream.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataReader.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataWriter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexReader.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexWriter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/VMIndexLinkedList.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/VMIndexLinkedListTest.java
Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java

Added: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java?view=auto&rev=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java (added)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java Tue Sep  5 06:51:13 2006
@@ -0,0 +1,131 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.activemq.kaha.impl;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.activemq.kaha.Marshaller;
+import org.apache.activemq.kaha.Store;
+import org.apache.activemq.kaha.impl.data.DataItem;
+import org.apache.activemq.kaha.impl.data.DataManager;
+import org.apache.activemq.kaha.impl.data.Item;
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+
+/**
+* A container of roots for other Containers
+* 
+* @version $Revision: 1.2 $
+*/
+
+class IndexRootContainer {
+    private static final Log log=LogFactory.getLog(IndexRootContainer.class);
+    protected static final Marshaller rootMarshaller = Store.ObjectMarshaller;
+    protected IndexItem root;
+    protected IndexManager indexManager;
+    protected DataManager dataManager;
+    protected Map map = new ConcurrentHashMap();
+    protected LinkedList list = new LinkedList();
+    
+    
+    IndexRootContainer(IndexItem root,IndexManager im,DataManager dfm) throws IOException{
+        this.root=root;
+        this.indexManager=im;
+        this.dataManager=dfm;
+        long nextItem=root.getNextItem();
+        while(nextItem!=Item.POSITION_NOT_SET){
+            IndexItem item=indexManager.getIndex(nextItem);
+            DataItem data=item.getKeyDataItem();
+            Object key=dataManager.readItem(rootMarshaller,data);
+            map.put(key,item);
+            list.add(item);
+            nextItem=item.getNextItem();
+            dataManager.addInterestInFile(item.getKeyFile());
+        }
+    }
+    
+    Set getKeys(){
+        return map.keySet();
+    }
+    
+    
+    
+    IndexItem addRoot(Object key) throws IOException{
+        if (map.containsKey(key)){
+            removeRoot(key);
+        }
+        
+        DataItem data = dataManager.storeDataItem(rootMarshaller, key);
+        IndexItem index = indexManager.createNewIndex();
+        index.setKeyData(data);
+        IndexItem newRoot = indexManager.createNewIndex();
+        indexManager.updateIndex(newRoot);
+        index.setValueOffset(newRoot.getOffset());
+       
+        IndexItem last=list.isEmpty()?null:(IndexItem) list.getLast();
+        last=last==null?root:last;
+        long prev=last.getOffset();
+        index.setPreviousItem(prev);
+        indexManager.updateIndex(index);
+        last.setNextItem(index.getOffset());
+        indexManager.updateIndex(last);
+        map.put(key, index);
+        list.add(index);
+        return newRoot;
+    }
+    
+    void removeRoot(Object key) throws IOException{
+        IndexItem item = (IndexItem) map.remove(key);
+        if (item != null){
+            dataManager.removeInterestInFile(item.getKeyFile());
+            IndexItem rootIndex = indexManager.getIndex(item.getValueOffset());
+            indexManager.freeIndex(rootIndex);
+            int index=list.indexOf(item);
+            IndexItem prev=index>0?(IndexItem) list.get(index-1):root;
+            prev=prev==null?root:prev;
+            IndexItem next=index<(list.size()-1)?(IndexItem) list.get(index+1):null;
+            if(next!=null){
+                prev.setNextItem(next.getOffset());
+                next.setPreviousItem(prev.getOffset());
+                indexManager.updateIndex(next);
+            }else{
+                prev.setNextItem(Item.POSITION_NOT_SET);
+            }
+            indexManager.updateIndex(prev);
+            list.remove(item);
+        }
+    }
+    
+    IndexItem getRoot(Object key) throws IOException{
+        IndexItem index =  (IndexItem) map.get(key);
+        if (index != null){
+            return indexManager.getIndex(index.getValueOffset());
+        }
+        return null;
+    }
+
+    
+
+}
\ No newline at end of file

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java?view=diff&rev=440342&r1=440341&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java Tue Sep  5 06:51:13 2006
@@ -26,6 +26,16 @@
 import org.apache.activemq.kaha.MapContainer;
 import org.apache.activemq.kaha.RuntimeStoreException;
 import org.apache.activemq.kaha.Store;
+import org.apache.activemq.kaha.impl.container.BaseContainerImpl;
+import org.apache.activemq.kaha.impl.container.ContainerId;
+import org.apache.activemq.kaha.impl.container.ListContainerImpl;
+import org.apache.activemq.kaha.impl.container.MapContainerImpl;
+import org.apache.activemq.kaha.impl.data.DataItem;
+import org.apache.activemq.kaha.impl.data.DataManager;
+import org.apache.activemq.kaha.impl.data.RedoListener;
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexManager;
+import org.apache.activemq.kaha.impl.index.RedoStoreIndexItem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
@@ -41,7 +51,7 @@
     private File directory;
 
     protected IndexRootContainer mapsContainer;
-    protected IndexRootContainer listsContainer;
+    public IndexRootContainer listsContainer;
     private Map lists=new ConcurrentHashMap();
     private Map maps=new ConcurrentHashMap();
     
@@ -244,7 +254,7 @@
         }
     }
 
-    protected synchronized void initialize() throws IOException{
+    public synchronized void initialize() throws IOException{
     	if( closed )
     		throw new IOException("Store has been closed.");
         if(!initialized){
@@ -276,7 +286,7 @@
         }
     }
     
-    protected DataManager getDataManager(String name) throws IOException {
+    public DataManager getDataManager(String name) throws IOException {
         DataManager dm = (DataManager) dataManagers.get(name);
         if (dm == null){
             dm = new DataManager(directory,name);
@@ -287,7 +297,7 @@
         return dm;
     }
     
-    protected IndexManager getIndexManager(DataManager dm, String name) throws IOException {
+    public IndexManager getIndexManager(DataManager dm, String name) throws IOException {
         IndexManager im = (IndexManager) indexManagers.get(name);
         if( im == null ) {
             im = new IndexManager(directory,name,mode, logIndexChanges?dm:null);

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BaseContainerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BaseContainerImpl.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BaseContainerImpl.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java Tue Sep  5 06:51:13 2006
@@ -15,12 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.activemq.kaha.RuntimeStoreException;
+import org.apache.activemq.kaha.impl.data.DataManager;
+import org.apache.activemq.kaha.impl.data.Item;
+import org.apache.activemq.kaha.impl.index.DiskIndexLinkedList;
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexLinkedList;
+import org.apache.activemq.kaha.impl.index.IndexManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 /**
@@ -50,7 +57,7 @@
         
     }
 
-    ContainerId getContainerId(){
+    public ContainerId getContainerId(){
         return containerId;
     }
     
@@ -67,7 +74,7 @@
         }
     }
     
-    protected void clear(){
+    public void clear(){
         if (indexList != null){
             indexList.clear();
         }
@@ -127,7 +134,7 @@
         return containerId.getKey();
     }
 
-    protected final void expressDataInterest() throws IOException{
+    public final void expressDataInterest() throws IOException{
         long nextItem=root.getNextItem();
         while(nextItem!=Item.POSITION_NOT_SET){
             IndexItem item=indexManager.getIndex(nextItem);

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/CachedContainerListIterator.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/CachedContainerListIterator.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/CachedContainerListIterator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java Tue Sep  5 06:51:13 2006
@@ -15,9 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.ListIterator;
+
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexLinkedList;
 
 /** 
 * @version $Revision$

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerCollectionSupport.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerCollectionSupport.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerCollectionSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 
 /**

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySet.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySet.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySet.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.ArrayList;
 import java.util.Collection;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySetIterator.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySetIterator.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerEntrySetIterator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.Iterator;
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerId.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerId.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerId.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.io.Externalizable;
 import java.io.IOException;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySet.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySet.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySet.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.ArrayList;
 import java.util.Collection;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySetIterator.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySetIterator.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerKeySetIterator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.Iterator;
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerListIterator.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerListIterator.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerListIterator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java Tue Sep  5 06:51:13 2006
@@ -15,9 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.ListIterator;
+
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexLinkedList;
 
 /** 
 * @version $Revision: 1.2 $

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerMapEntry.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerMapEntry.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerMapEntry.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.Map;
 import org.apache.activemq.kaha.MapContainer;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollection.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollection.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java Tue Sep  5 06:51:13 2006
@@ -15,13 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexLinkedList;
 
 /**
 * Values collection for the MapContainer

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollectionIterator.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollectionIterator.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ContainerValueCollectionIterator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java Tue Sep  5 06:51:13 2006
@@ -15,9 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.util.Iterator;
+
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexLinkedList;
 /**
  * Values collection iterator for the MapContainer
  * 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ListContainerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ListContainerImpl.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/ListContainerImpl.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java Tue Sep  5 06:51:13 2006
@@ -11,7 +11,7 @@
  * 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.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -20,10 +20,16 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+
 import org.apache.activemq.kaha.ListContainer;
 import org.apache.activemq.kaha.Marshaller;
 import org.apache.activemq.kaha.RuntimeStoreException;
 import org.apache.activemq.kaha.Store;
+import org.apache.activemq.kaha.impl.data.DataItem;
+import org.apache.activemq.kaha.impl.data.DataManager;
+import org.apache.activemq.kaha.impl.data.Item;
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 /**
@@ -39,7 +45,7 @@
     protected int maximumCacheSize=100;
     protected IndexItem lastCached;
 
-    protected ListContainerImpl(ContainerId id,IndexItem root,IndexManager rootIndexManager,IndexManager indexManager,
+    public ListContainerImpl(ContainerId id,IndexItem root,IndexManager rootIndexManager,IndexManager indexManager,
                     DataManager dataManager) throws IOException{
         super(id,root,rootIndexManager,indexManager,dataManager);
     }

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/MapContainerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/MapContainerImpl.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/MapContainerImpl.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.container;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -29,6 +29,12 @@
 import org.apache.activemq.kaha.ObjectMarshaller;
 import org.apache.activemq.kaha.RuntimeStoreException;
 import org.apache.activemq.kaha.Store;
+import org.apache.activemq.kaha.impl.data.DataItem;
+import org.apache.activemq.kaha.impl.data.DataManager;
+import org.apache.activemq.kaha.impl.data.Item;
+import org.apache.activemq.kaha.impl.index.IndexItem;
+import org.apache.activemq.kaha.impl.index.IndexLinkedList;
+import org.apache.activemq.kaha.impl.index.IndexManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 /**
@@ -36,14 +42,14 @@
  * 
  * @version $Revision: 1.2 $
  */
-final class MapContainerImpl extends BaseContainerImpl implements MapContainer{
+public final class MapContainerImpl extends BaseContainerImpl implements MapContainer{
     private static final Log log=LogFactory.getLog(MapContainerImpl.class);
     protected Map map=new HashMap();
     protected Map valueToKeyMap=new HashMap();
     protected Marshaller keyMarshaller= Store.ObjectMarshaller;
     protected Marshaller valueMarshaller=Store.ObjectMarshaller;
 
-    protected MapContainerImpl(ContainerId id,IndexItem root,IndexManager rootIndexManager,IndexManager indexManager,DataManager dataManager){
+    public MapContainerImpl(ContainerId id,IndexItem root,IndexManager rootIndexManager,IndexManager indexManager,DataManager dataManager){
         super(id,root,rootIndexManager,indexManager,dataManager);
     }
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataFile.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataFile.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataFile.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 import java.io.File;
 import java.io.FileNotFoundException;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataItem.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataItem.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataItem.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java Tue Sep  5 06:51:13 2006
@@ -15,20 +15,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
+
 
 /**
  * A a wrapper for a data in the store
  * 
  * @version $Revision: 1.2 $
  */
-final class DataItem implements Item{
+public final class DataItem implements Item{
     
     private int file=(int) POSITION_NOT_SET;
     private long offset=POSITION_NOT_SET;
     private int size;
 
-    DataItem(){}
+    public DataItem(){}
     
     DataItem(DataItem item) {
         this.file = item.file;
@@ -43,42 +44,42 @@
     /**
      * @return Returns the size.
      */
-    int getSize(){
+    public int getSize(){
         return size;
     }
 
     /**
      * @param size The size to set.
      */
-    void setSize(int size){
+    public void setSize(int size){
         this.size=size;
     }
 
     /**
      * @return Returns the offset.
      */
-    long getOffset(){
+    public long getOffset(){
         return offset;
     }
 
     /**
      * @param offset The offset to set.
      */
-    void setOffset(long offset){
+    public void setOffset(long offset){
         this.offset=offset;
     }
 
     /**
      * @return Returns the file.
      */
-    int getFile(){
+    public int getFile(){
         return file;
     }
 
     /**
      * @param file The file to set.
      */
-    void setFile(int file){
+    public void setFile(int file){
         this.file=file;
     }
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManager.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataManager.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManager.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataManager.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManager.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DataManager.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManager.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -28,6 +28,7 @@
 import java.util.Map;
 
 import org.apache.activemq.kaha.Marshaller;
+import org.apache.activemq.kaha.impl.index.RedoStoreIndexItem;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -36,10 +37,10 @@
  * 
  * @version $Revision: 1.1.1.1 $
  */
-final class DataManager{
+public final class DataManager{
     
     private static final Log log=LogFactory.getLog(DataManager.class);
-    protected static long MAX_FILE_LENGTH=1024*1024*32;
+    public static long MAX_FILE_LENGTH=1024*1024*32;
     private final File dir;
     private final String name;
     private StoreDataReader reader;
@@ -55,7 +56,7 @@
     Marshaller redoMarshaller = RedoStoreIndexItem.MARSHALLER;
     private String dataFilePrefix;
 
-    DataManager(File dir, final String name){
+    public DataManager(File dir, final String name){
         this.dir=dir;
         this.name=name;
         this.reader=new StoreDataReader(this);
@@ -117,19 +118,19 @@
         throw new IOException("Could not locate data file "+name+item.getFile());
     }
     
-    synchronized Object readItem(Marshaller marshaller, DataItem item) throws IOException{
+    public synchronized Object readItem(Marshaller marshaller, DataItem item) throws IOException{
         return reader.readItem(marshaller,item);
     }
 
-    synchronized DataItem storeDataItem(Marshaller marshaller, Object payload) throws IOException{
+    public synchronized DataItem storeDataItem(Marshaller marshaller, Object payload) throws IOException{
         return writer.storeItem(marshaller,payload, DATA_ITEM_TYPE);
     }
     
-    synchronized DataItem storeRedoItem(Object payload) throws IOException{
+    public synchronized DataItem storeRedoItem(Object payload) throws IOException{
         return writer.storeItem(redoMarshaller, payload, REDO_ITEM_TYPE);
     }
 
-    synchronized void recoverRedoItems(RedoListener listener) throws IOException{
+    public synchronized void recoverRedoItems(RedoListener listener) throws IOException{
         
         // Nothing to recover if there is no current file.
         if( currentWriteFile == null )
@@ -171,7 +172,7 @@
         }
     }
     
-    synchronized void close() throws IOException{
+    public synchronized void close() throws IOException{
         for(Iterator i=fileMap.values().iterator();i.hasNext();){
             DataFile dataFile=(DataFile) i.next();
             dataFile.force();
@@ -180,14 +181,14 @@
         fileMap.clear();
     }
 
-    synchronized void force() throws IOException{
+    public synchronized void force() throws IOException{
         for(Iterator i=fileMap.values().iterator();i.hasNext();){
             DataFile dataFile=(DataFile) i.next();
             dataFile.force();
         }
     }
 
-    synchronized boolean delete() throws IOException{
+    public synchronized boolean delete() throws IOException{
         boolean result=true;
         for(Iterator i=fileMap.values().iterator();i.hasNext();){
             DataFile dataFile=(DataFile) i.next();
@@ -197,7 +198,7 @@
         return result;
     }
 
-    synchronized void addInterestInFile(int file) throws IOException{
+    public synchronized void addInterestInFile(int file) throws IOException{
         if(file>=0){
             Integer key=new Integer(file);
             DataFile dataFile=(DataFile) fileMap.get(key);
@@ -214,7 +215,7 @@
         }
     }
 
-    synchronized void removeInterestInFile(int file) throws IOException{
+    public synchronized void removeInterestInFile(int file) throws IOException{
         if(file>=0){
             Integer key=new Integer(file);
             DataFile dataFile=(DataFile) fileMap.get(key);
@@ -232,7 +233,7 @@
         }
     }
 
-    synchronized void consolidateDataFiles() throws IOException{
+    public synchronized void consolidateDataFiles() throws IOException{
         List purgeList=new ArrayList();
         for(Iterator i=fileMap.values().iterator();i.hasNext();){
             DataFile dataFile=(DataFile) i.next();

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/Item.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/Item.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/Item.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 /**
  * A a wrapper for a data in the store

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoListener.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoListener.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
+
 
 public interface RedoListener {
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayInputStream.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayInputStream.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayInputStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 import java.io.DataInput;
 import java.io.IOException;
@@ -26,7 +26,7 @@
  * 
  * @version $Revision: 1.1.1.1 $
  */
-final class StoreByteArrayInputStream extends InputStream implements DataInput{
+public final class StoreByteArrayInputStream extends InputStream implements DataInput{
     private byte[] buf;
     private int pos;
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayOutputStream.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayOutputStream.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreByteArrayOutputStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 import java.io.DataOutput;
 import java.io.IOException;
@@ -26,7 +26,7 @@
  * 
  * @version $Revision: 1.1.1.1 $
  */
-final class StoreByteArrayOutputStream extends OutputStream implements DataOutput{
+public final class StoreByteArrayOutputStream extends OutputStream implements DataOutput{
     private byte buf[];
     private int pos;
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataReader.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataReader.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataReader.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataWriter.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataWriter.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreDataWriter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.data;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BadMagicException.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BadMagicException.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/BadMagicException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.IOException;
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DiskIndexLinkedList.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DiskIndexLinkedList.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/DiskIndexLinkedList.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.IOException;
 /**
@@ -23,7 +23,7 @@
  * 
  * @version $Revision$
  */
-class DiskIndexLinkedList implements IndexLinkedList{
+public class DiskIndexLinkedList implements IndexLinkedList{
     protected IndexManager indexManager;
     protected transient IndexItem root;
     protected transient IndexItem last;
@@ -32,7 +32,7 @@
     /**
      * Constructs an empty list.
      */
-    DiskIndexLinkedList(IndexManager im,IndexItem header){
+    public DiskIndexLinkedList(IndexManager im,IndexItem header){
         this.indexManager=im;
         this.root=header;
     }

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexItem.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexItem.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexItem.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java Tue Sep  5 06:51:13 2006
@@ -15,19 +15,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import org.apache.activemq.kaha.impl.data.DataItem;
+import org.apache.activemq.kaha.impl.data.Item;
 /**
  * A an Item with a relative position and location to other Items in the Store
  * 
  * @version $Revision: 1.2 $
  */
- class IndexItem implements Item{
+ public class IndexItem implements Item{
     
-    static final int INDEX_SIZE=51;
+    public static final int INDEX_SIZE=51;
     //used by linked list
     IndexItem next;
     IndexItem prev;
@@ -49,7 +52,7 @@
     /**
      * Default Constructor
      */
-    IndexItem(){}
+    public IndexItem(){}
 
     void reset(){
         previousItem=POSITION_NOT_SET;
@@ -63,7 +66,7 @@
         active=true;
     }
 
-    DataItem getKeyDataItem(){
+    public DataItem getKeyDataItem(){
         DataItem result=new DataItem();
         result.setOffset(keyOffset);
         result.setFile(keyFile);
@@ -71,7 +74,7 @@
         return result;
     }
 
-    DataItem getValueDataItem(){
+    public DataItem getValueDataItem(){
         DataItem result=new DataItem();
         result.setOffset(valueOffset);
         result.setFile(valueFile);
@@ -79,13 +82,13 @@
         return result;
     }
 
-    void setValueData(DataItem item){
+    public void setValueData(DataItem item){
         valueOffset=item.getOffset();
         valueFile=item.getFile();
         valueSize=item.getSize();
     }
 
-    void setKeyData(DataItem item){
+    public void setKeyData(DataItem item){
         keyOffset=item.getOffset();
         keyFile=item.getFile();
         keySize=item.getSize();
@@ -130,7 +133,7 @@
     /**
      * @param newPrevEntry
      */
-    void setPreviousItem(long newPrevEntry){
+    public void setPreviousItem(long newPrevEntry){
         previousItem=newPrevEntry;
     }
 
@@ -144,14 +147,14 @@
     /**
      * @param newNextEntry
      */
-    void setNextItem(long newNextEntry){
+    public void setNextItem(long newNextEntry){
         nextItem=newNextEntry;
     }
 
     /**
      * @return next item
      */
-    long getNextItem(){
+    public long getNextItem(){
         return nextItem;
     }
 
@@ -172,7 +175,7 @@
     /**
      * @return Returns the keyFile.
      */
-    int getKeyFile(){
+    public int getKeyFile(){
         return keyFile;
     }
 
@@ -186,7 +189,7 @@
     /**
      * @return Returns the valueFile.
      */
-    int getValueFile(){
+    public int getValueFile(){
         return valueFile;
     }
 
@@ -200,14 +203,14 @@
     /**
      * @return Returns the valueOffset.
      */
-    long getValueOffset(){
+    public long getValueOffset(){
         return valueOffset;
     }
 
     /**
      * @param valueOffset The valueOffset to set.
      */
-    void setValueOffset(long valueOffset){
+    public void setValueOffset(long valueOffset){
         this.valueOffset=valueOffset;
     }
 
@@ -228,14 +231,14 @@
     /**
      * @return Returns the offset.
      */
-    long getOffset(){
+    public long getOffset(){
         return offset;
     }
 
     /**
      * @param offset The offset to set.
      */
-    void setOffset(long offset){
+    public void setOffset(long offset){
         this.offset=offset;
     }
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexLinkedList.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexLinkedList.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexLinkedList.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java Tue Sep  5 06:51:13 2006
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
-interface IndexLinkedList{
+public interface IndexLinkedList{
     
     /**
      * @return the root used by the List

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexManager.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexManager.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexManager.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java Tue Sep  5 06:51:13 2006
@@ -15,12 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.LinkedList;
+
+import org.apache.activemq.kaha.impl.data.DataManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 /**
@@ -28,7 +30,7 @@
  * 
  * @version $Revision: 1.1.1.1 $
  */
-final class IndexManager{
+public final class IndexManager{
     private static final Log log=LogFactory.getLog(IndexManager.class);
     private static final String NAME_PREFIX="index-";
     private final String name;
@@ -39,7 +41,7 @@
     private LinkedList freeList=new LinkedList();
     private long length=0;
 
-    IndexManager(File directory,String name,String mode,DataManager redoLog) throws IOException{
+    public IndexManager(File directory,String name,String mode,DataManager redoLog) throws IOException{
         this.name=name;
         file=new File(directory,NAME_PREFIX+name);
         indexFile=new RandomAccessFile(file,mode);
@@ -57,22 +59,22 @@
         length=offset;
     }
 
-    synchronized boolean isEmpty(){
+    public synchronized boolean isEmpty(){
         return freeList.isEmpty()&&length==0;
     }
 
-    synchronized IndexItem getIndex(long offset) throws IOException{
+    public synchronized IndexItem getIndex(long offset) throws IOException{
         return reader.readItem(offset);
     }
 
-    synchronized void freeIndex(IndexItem item) throws IOException{
+    public synchronized void freeIndex(IndexItem item) throws IOException{
         item.reset();
         item.setActive(false);
         writer.storeItem(item);
         freeList.add(item);
     }
 
-    synchronized void updateIndex(IndexItem index) throws IOException{
+    public synchronized void updateIndex(IndexItem index) throws IOException{
         writer.storeItem(index);
     }
 
@@ -80,7 +82,7 @@
         writer.redoStoreItem(redo);
     }
 
-    synchronized IndexItem createNewIndex(){
+    public synchronized IndexItem createNewIndex(){
         IndexItem result=getNextFreeIndex();
         if(result==null){
             // allocate one
@@ -91,20 +93,20 @@
         return result;
     }
 
-    synchronized void close() throws IOException{
+    public synchronized void close() throws IOException{
         if(indexFile!=null){
             indexFile.close();
             indexFile=null;
         }
     }
 
-    synchronized void force() throws IOException{
+    public synchronized void force() throws IOException{
         if(indexFile!=null){
             indexFile.getFD().sync();
         }
     }
 
-    synchronized boolean delete() throws IOException{
+    public synchronized boolean delete() throws IOException{
         freeList.clear();
         if(indexFile!=null){
             indexFile.close();
@@ -126,7 +128,7 @@
         return length;
     }
 
-    void setLength(long value){
+    public void setLength(long value){
         this.length=value;
     }
 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoStoreIndexItem.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoStoreIndexItem.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/RedoStoreIndexItem.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java Tue Sep  5 06:51:13 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexReader.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexReader.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexReader.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java Tue Sep  5 06:51:13 2006
@@ -15,10 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
+
+import org.apache.activemq.kaha.impl.data.StoreByteArrayInputStream;
 /**
  * Optimized Store reader
  * 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java (from r440186, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexWriter.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java?view=diff&rev=440342&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexWriter.java&r1=440186&p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java&r2=440342
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreIndexWriter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java Tue Sep  5 06:51:13 2006
@@ -15,10 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl;
+package org.apache.activemq.kaha.impl.index;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
+
+import org.apache.activemq.kaha.impl.data.DataManager;
+import org.apache.activemq.kaha.impl.data.StoreByteArrayOutputStream;
 /**
  * Optimized Store writer
  * 

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message