cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/store/impl DefaultStore.java

[cziegeler]

cziegeler    2003/07/26 08:17:25

  Modified:    src/java/org/apache/cocoon/components/store/impl
                        DefaultStore.java
  Log:
  Updating to latest jisp and excalibur store
  
  Revision  Changes    Path
  1.4       +2 -11     
cocoon-2.1/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java
  
  Index: DefaultStore.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultStore.java 26 Jul 2003 13:26:47 -0000      1.3
  +++ DefaultStore.java 26 Jul 2003 15:17:25 -0000      1.4
  @@ -67,7 +67,6 @@
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.util.IOUtils;
   import org.apache.excalibur.store.impl.AbstractJispFilesystemStore;
  -import org.apache.excalibur.store.impl.JispStringKey;
   
   /**
    * This store is based on the Jisp library
  @@ -171,21 +170,13 @@
                   getLogger().debug("Datafile exists: " + databaseExists);
               }
               super.m_Database = new IndexedObjectDatabase(databaseFile.toString(), 
!databaseExists);
  -            // TODO: change to getNullKey when updating to latest store
               super.m_Index = new BTreeIndex(indexFile.toString(),
  -                                            order, new JispStringKey(), false);
  +                                            order, this.getNullKey(), false);
               super.m_Database.attachIndex(super.m_Index);
           } catch (KeyNotFound ignore) {
           } catch (Exception e) {
               getLogger().error("Exception during initialization of jisp store.", e);
           }
  -    }
  -
  -    /* (non-Javadoc)
  -     * @see org.apache.avalon.framework.activity.Initializable#initialize()
  -     */
  -    public void initialize() throws Exception {
  -        // TODO  Remove this when we update to latest store
       }
   
   }