neo4j 2.0.0.alpha.4-java → 2.0.0.alpha.5-java

data/CHANGELOG

@@ -1,3 +1,28 @@
+== 2.0.0.alpha.5 / 2012-03-27
+* Fix for HA/cluster bug [#173]
+* Upgrade to neo4j-community jars 1.7.0.alpha.1
+* Fix for rails 3.2 [#131]
+* Fix for BatchInserter bug, [#139]
+* Added rake task for upgrading [#116]
+* Added scripts for upgrading database [#116]
+
+== 2.0.0.alpha.4 / 2012-01-17
+* Fix node and rel enumerable for JRuby 1.9, Dmytrii Nagirniak
+* Remove the will_paginate and move it to a separate gem Dmytrii Nagirniak, [#129][#132]
+* Use type converter to determine how to handle multi-param attributes, Dmyitrii Nagirniak [#97]
+* Set default storage_path in Rails to db [#96]
+* Fix numeric Converter with nils and Float converter, Dmytrii Nagirniak
+* Fix Neo4j::Rails::Model.find incorrect behavior with negative numbers, Dmytrii Nagirniak [#101]
+* Allow to use symbols in batch inserter [#104]
+* Split neo4j-jars gem into three jars, community,advanced&enterprise
+
+ == 2.0.0.alpha.1 / 2012-01-11
+* Split JARS into a separate gem (neo4j-jars) [#115]
+* Changed prefix of relationships so that it allows having incoming relationships from different classes with different relationship names. Migration is needed to update an already existing database - see issue #116. [#117]
+* Fix for undefined method 'add_unpersited_outgoing_rel' [#111]
+* Fix for Rails models named Property [#108] (Vivek Prahlad)
+
+
  == 1.3.1 / 2011-12-14
 * Make all relationships visible in Rails callback (rspecs #87, Dmytrii Nagirniak) [#211]
 * Enable travis to build JRuby 1.9 (pull #87, Dmytrii Nagirniak) [#214]

data/Gemfile

@@ -2,31 +2,28 @@ source :gemcutter
 
 gemspec
 
-group 'test' do
-  gem "rake", ">= 0.8.7"
-  gem "rdoc", ">= 2.5.10"
-  gem "horo", ">= 1.0.2" # TODO: Why horo, YARD seems to be much better option?
-  gem "rspec", "~> 2.8"
-  gem "its" # its(:with, :arguments) { should be_possible }
+gem 'neo4j-advanced', "1.7.0.alpha.1",  :require => false
+gem 'neo4j-enterprise', "1.7.0.alpha.1", :require => false
 
+group 'development' do
   gem 'guard'
   gem 'ruby_gntp', :require => false # GrowlNotify for Mac
   gem 'rb-inotify', :require => false
   gem 'rb-fsevent', :require => false
   gem 'rb-fchange', :require => false
   gem "guard-rspec"
+  gem "horo", ">= 1.0.2" # TODO: Why horo, YARD seems to be much better option?
+  #gem 'ruby-debug-base19' if RUBY_VERSION.include? "1.9"
+  #gem 'ruby-debug-base' if RUBY_VERSION.include? "1.8"
+  #gem "ruby-debug-ide"
+end
 
+group 'test' do
+  gem "rake", ">= 0.8.7"
+  gem "rdoc", ">= 2.5.10"
+  gem "rspec", "~> 2.8"
+  gem "its" # its(:with, :arguments) { should be_possible }
   gem 'shoulda-matchers', '~> 1.0'
-
   gem "test-unit"
-  gem 'rcov'
-
-  gem 'pry'
-
-  gem 'neo4j-advanced', "1.6.0.alpha.5",  :require => false
-  gem 'neo4j-enterprise', "1.6.0.alpha.5", :require => false
 end
 
-#gem 'ruby-debug-base19' if RUBY_VERSION.include? "1.9"
-#gem 'ruby-debug-base' if RUBY_VERSION.include? "1.8"
-#gem "ruby-debug-ide"

data/README.rdoc

@@ -1,4 +1,4 @@
-== Welcome to Neo4j.rb
+== Welcome to Neo4j.rb {<img src="https://secure.travis-ci.org/andreasronge/neo4j.png" />}[http://travis-ci.org/andreasronge/neo4j] {<img src="https://gemnasium.com/andreasronge/neo4j.png" />}[https://gemnasium.com/andreasronge/neo4j]
 
 Neo4j.rb is a graph database for JRuby.
 
@@ -16,6 +16,17 @@ It uses two powerful and mature Java libraries:
 * {Blog: Neo4j and Rails 3}[http://blog.jayway.com/2011/03/02/neo4j-rb-1-0-0-and-rails-3/]
 * {Kvitter Example Application}[https://github.com/andreasronge/kvitter/]
 
+=== Status of Upcomming 2.0 Release
+
+See the {neo4j-core gem}[https://github.com/andreasronge/neo4j-core] and GitHub issues.
+
+Improvements:
+* More modular (create your own wrapper or use Neo4j::NodeMixin/Neo4j::Rails::Model)
+* Better performance 
+* More consistent API
+* Better quality of RSpecs, code and docs (YARD)
+
+
 === Why Neo4j.rb or a Graph Database ?
 
 Here are some of the major benefits of Neo4j.rb
@@ -143,12 +154,11 @@ Notice that you can always access the lower layers if you want to do some more a
 
 === Contributing
 
-{<img src="https://secure.travis-ci.org/andreasronge/neo4j.png" />}[http://travis-ci.org/andreasronge/neo4j]
-
 Have you found a bug, need help or have a patch ?
 Just clone neo4j.rb and send me a pull request or email me.
 Do you need help - send me an email (andreas.ronge at gmail dot com).
 
+
 === License
 * Neo4j.rb - MIT, see the LICENSE file http://github.com/andreasronge/neo4j/tree/master/LICENSE.
 * Lucene -  Apache, see http://lucene.apache.org/java/docs/features.html

data/lib/neo4j.rb

@@ -6,7 +6,6 @@ require 'tmpdir'
 
 # Rails
 require 'rails/railtie'
-require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_model'
 
@@ -28,35 +27,22 @@ require 'neo4j/paginated'
 require 'neo4j/node'
 require 'neo4j/relationship'
 require 'neo4j/relationship_set'
-
 require 'neo4j/type_converters/type_converters'
-
 require 'neo4j/index/index'
-
 require 'neo4j/traversal/traversal'
-
 require 'neo4j/property/property'
-
 require 'neo4j/has_n/has_n'
-
 require 'neo4j/node_mixin/node_mixin'
-
 require 'neo4j/relationship_mixin/relationship_mixin'
-
 require 'neo4j/rule/rule'
-
 require 'neo4j/rels/rels'
-
 require 'neo4j/rails/rails'
-
 require 'neo4j/model'
-
 require 'neo4j/migrations/migrations'
-
 require 'neo4j/algo/algo'
-
 require 'neo4j/batch/batch'
-
 require 'orm_adapter/adapters/neo4j'
-
 require 'neo4j/identity_map'
+
+
+Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake) && respond_to?(:namespace)

data/lib/neo4j/batch/inserter.rb

@@ -14,6 +14,7 @@ module Neo4j
     class Inserter
       attr_reader :batch_inserter, :batch_indexer
       include ToJava
+      include Neo4j::Load
 
       # Creates a new batch inserter.
       # Will raise an exception if Neo4j is already running at the same storage_path
@@ -80,16 +81,18 @@ module Neo4j
         from_props = node_props(from_node)
 
         if from_props['_classname']
-          indexer = Indexer.instance_for(from_props['_classname'])
+          from_class = to_class(from_props['_classname'])
+          indexer = Indexer.instance_for(from_class)
           indexer.index_node_via_rel(rel_type, to_node, from_props)
         end
 
         to_props   = node_props(to_node)
         if to_props['_classname']
-          indexer = Indexer.instance_for(to_props['_classname'])
+          to_class = to_class(to_props['_classname'])
+          indexer = Indexer.instance_for(to_class)
           indexer.index_node_via_rel(rel_type, from_node, to_props)
         end
-
+        rel
       end
 
       # Return a hash of all properties of given node

data/lib/neo4j/core_ext/class/inheritable_attributes.rb

@@ -1,37 +1,12 @@
 # This is copied from Rails Active Support since it has been depricated and I still need it
-class Class # :nodoc:
-  def class_inheritable_reader(*syms)
-    options = syms.extract_options!
-    syms.each do |sym|
-      next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def self.#{sym}                                # def self.after_add
-          read_inheritable_attribute(:#{sym})          #   read_inheritable_attribute(:after_add)
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}                                     # def after_add
-          self.class.#{sym}                            #   self.class.after_add
-        end                                            # end
-        " unless options[:instance_reader] == false }  # # the reader above is generated unless options[:instance_reader] == false
-      EOS
-    end
-  end
 
-  def class_inheritable_writer(*syms)
-    options = syms.extract_options!
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def self.#{sym}=(obj)                          # def self.color=(obj)
-          write_inheritable_attribute(:#{sym}, obj)    #   write_inheritable_attribute(:color, obj)
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}=(obj)                               # def color=(obj)
-          self.class.#{sym} = obj                      #   self.class.color = obj
-        end                                            # end
-        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
-      EOS
-    end
-  end
-end
+# Taken from: https://raw.github.com/lifo/docrails/dd6c3676af3fa6019c53a59f62c4fd14966be728/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+
+# Changes made:
+# - Remove deprecation warnings
+# - Ignore if already available from ActiveSupport
+#
+# Can't use class_attribute because we want to use the same value for all subclasses
+
+
+require 'neo4j/core_ext/class/rewrite_inheritable_attributes.rb'

data/lib/neo4j/core_ext/class/rewrite_inheritable_attributes.rb

@@ -0,0 +1,170 @@
+require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/array/extract_options'
+
+# Retained for backward compatibility. Methods are now included in Class.
+module ClassInheritableAttributes # :nodoc:
+end
+
+# It is recommended to use <tt>class_attribute</tt> over methods defined in this file. Please
+# refer to documentation for <tt>class_attribute</tt> for more information. Officially it is not
+#
+# Allows attributes to be shared within an inheritance hierarchy. Each descendant gets a copy of
+# their parents' attributes, instead of just a pointer to the same. This means that the child can add elements
+# to, for example, an array without those additions being shared with either their parent, siblings, or
+# children. This is unlike the regular class-level attributes that are shared across the entire hierarchy.
+#
+# The copies of inheritable parent attributes are added to subclasses when they are created, via the
+# +inherited+ hook.
+#
+#  class Person
+#    class_inheritable_accessor :hair_colors
+#  end
+#
+#  Person.hair_colors = [:brown, :black, :blonde, :red]
+#  Person.hair_colors     # => [:brown, :black, :blonde, :red]
+#  Person.new.hair_colors # => [:brown, :black, :blonde, :red]
+#
+# To opt out of the instance writer method, pass :instance_writer => false.
+# To opt out of the instance reader method, pass :instance_reader => false.
+#
+#   class Person
+#     class_inheritable_accessor :hair_colors :instance_writer => false, :instance_reader => false
+#   end
+#
+#   Person.new.hair_colors = [:brown]  # => NoMethodError
+#   Person.new.hair_colors             # => NoMethodError
+class Class # :nodoc:
+  def class_inheritable_reader(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      next if sym.is_a?(Hash)
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}                                # def self.after_add
+          read_inheritable_attribute(:#{sym})          #   read_inheritable_attribute(:after_add)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}                                     # def after_add
+          self.class.#{sym}                            #   self.class.after_add
+        end                                            # end
+        " unless options[:instance_reader] == false }  # # the reader above is generated unless options[:instance_reader] == false
+      EOS
+    end
+  end
+
+  def class_inheritable_writer(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                          # def self.color=(obj)
+          write_inheritable_attribute(:#{sym}, obj)    #   write_inheritable_attribute(:color, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def color=(obj)
+          self.class.#{sym} = obj                      #   self.class.color = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
+      EOS
+    end
+  end
+
+  def class_inheritable_array_writer(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                          # def self.levels=(obj)
+          write_inheritable_array(:#{sym}, obj)        #   write_inheritable_array(:levels, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def levels=(obj)
+          self.class.#{sym} = obj                      #   self.class.levels = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
+      EOS
+    end
+  end
+
+  def class_inheritable_hash_writer(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                          # def self.nicknames=(obj)
+          write_inheritable_hash(:#{sym}, obj)         #   write_inheritable_hash(:nicknames, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def nicknames=(obj)
+          self.class.#{sym} = obj                      #   self.class.nicknames = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
+      EOS
+    end
+  end
+
+  def class_inheritable_accessor(*syms)
+    class_inheritable_reader(*syms)
+    class_inheritable_writer(*syms)
+  end
+
+  def class_inheritable_array(*syms)
+    class_inheritable_reader(*syms)
+    class_inheritable_array_writer(*syms)
+  end
+
+  def class_inheritable_hash(*syms)
+    class_inheritable_reader(*syms)
+    class_inheritable_hash_writer(*syms)
+  end
+
+  def inheritable_attributes
+    @inheritable_attributes ||= EMPTY_INHERITABLE_ATTRIBUTES
+  end
+
+  def write_inheritable_attribute(key, value)
+    if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
+      @inheritable_attributes = {}
+    end
+    inheritable_attributes[key] = value
+  end
+
+  def write_inheritable_array(key, elements)
+    write_inheritable_attribute(key, []) if read_inheritable_attribute(key).nil?
+    write_inheritable_attribute(key, read_inheritable_attribute(key) + elements)
+  end
+
+  def write_inheritable_hash(key, hash)
+    write_inheritable_attribute(key, {}) if read_inheritable_attribute(key).nil?
+    write_inheritable_attribute(key, read_inheritable_attribute(key).merge(hash))
+  end
+
+  def read_inheritable_attribute(key)
+    inheritable_attributes[key]
+  end
+
+  def reset_inheritable_attributes
+    @inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES
+  end
+
+  private
+    # Prevent this constant from being created multiple times
+    EMPTY_INHERITABLE_ATTRIBUTES = {}.freeze
+
+    def inherited_with_inheritable_attributes(child)
+      inherited_without_inheritable_attributes(child) if respond_to?(:inherited_without_inheritable_attributes)
+
+      if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
+        new_inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES
+      else
+        new_inheritable_attributes = Hash[inheritable_attributes.map do |(key, value)|
+          [key, value.duplicable? ? value.dup : value]
+        end]
+      end
+
+      child.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)
+    end
+
+    alias inherited_without_inheritable_attributes inherited
+    alias inherited inherited_with_inheritable_attributes
+end

data/lib/neo4j/database.rb

@@ -70,8 +70,6 @@ module Neo4j
       Neo4j.logger.info "starting Neo4j in HA mode, machine id: #{Neo4j.config['ha.server_id']} at #{Neo4j.config['ha.server']} db #{@storage_path}"
       # Modify the public base classes for the HA Node and Relationships
       # (instead of private org.neo4j.kernel.HighlyAvailableGraphDatabase::LookupNode)
-      Neo4j::Node.extend_java_class(org.neo4j.tooling.wrap.WrappedNode)
-      Neo4j::Relationship.extend_java_class(org.neo4j.tooling.wrap.WrappedRelationship)
       @graph = org.neo4j.kernel.HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
       @graph.register_transaction_event_handler(@event_handler)
       @lucene = @graph.index

data/lib/neo4j/migrations/class_methods.rb

@@ -21,6 +21,14 @@ module Neo4j
         @migrations ||= {}
       end
 
+      # Remote all migration and set migrate_to = nil
+      # Does not change the version of nodes.
+      def reset_migrations!
+        @migrations = nil
+        @migrate_to = nil
+      end
+
+
       # Specifies a migration to be performed.
       # Updates the migrate_to variable so that it will migrate to the latest migration.
       #

data/lib/neo4j/migrations/lazy_node_mixin.rb

@@ -9,20 +9,11 @@ module Neo4j
     # Migration will take place if needed when the node is loaded.
     #
     module LazyNodeMixin
-      extend ActiveSupport::Concern
-
-      included do
-        extend Neo4j::Migrations::ClassMethods
+      def self.included(base)
+        base.extend Neo4j::Migrations::ClassMethods
+        base.property :_db_version if base.respond_to?(:property)
       end
 
-      module ClassMethods
-        # Remote all migration and set migrate_to = nil
-        # Does not change the version of nodes.
-        def reset_migrations!
-          @migrations = nil
-          @migrate_to = nil
-        end
-      end
 
       def migrate!
         self.class._migrate!(self._java_node, self)

data/lib/neo4j/rails/attributes.rb

@@ -179,7 +179,7 @@ module Neo4j
       def attributes
         ret = {}
         attribute_names.each do |attribute_name|
-          ret[attribute_name] = respond_to?(attribute_name) ? send(attribute_name) : send(:[], attribute_name)
+          ret[attribute_name] = self._decl_props[attribute_name.to_sym] ? send(attribute_name) :  send(:[], attribute_name)
         end
         ret
       end
@@ -187,6 +187,9 @@ module Neo4j
       # Known properties are either in the @properties, the declared
       # attributes or the property keys for the persisted node.
       def property_names
+        # initialize @properties if needed since
+        # we can ask property names before the object is initialized (active_support initialize callbacks, respond_to?)
+        @properties ||= {}
         keys = @properties.keys + self.class._decl_props.keys.map { |k| k.to_s }
         keys += _java_entity.property_keys.to_a if persisted?
         keys.flatten.uniq
@@ -196,20 +199,25 @@ module Neo4j
       # attributes or the property keys for the persisted node.  Any attributes
       # that start with <tt>_</tt> are rejected
       def attribute_names
-        property_names.reject { |property_name| property_name[0] == ?_ }
+        property_names.reject { |property_name| _invalid_attribute_name?(property_name) }
+      end
+
+      def _invalid_attribute_name?(attr_name)
+        attr_name.to_s[0] == ?_ && !self.class._decl_props.include?(attr_name.to_sym)
       end
 
       # Known properties are either in the @properties, the declared
       # properties or the property keys for the persisted node
       def property?(name)
+        return false unless @properties
         @properties.has_key?(name) ||
             self.class._decl_props.has_key?(name) ||
-            begin
-              persisted? && super
-            rescue org.neo4j.graphdb.NotFoundException
-              set_deleted_properties
-              nil
-            end
+            persisted? && super
+      end
+
+      def property_changed?
+        return !@properties.empty? unless persisted?
+        !!@properties.keys.find{|k| self._java_node.getProperty(k.to_s) != @properties[k] }
       end
 
       # Return true if method_name is the name of an appropriate attribute
@@ -226,6 +234,8 @@ module Neo4j
         write_local_property_without_type_conversion("_classname",value)
       end
 
+
+      # TODO THIS IS ONLY NEEDED IN ACTIVEMODEL < 3.2, ?
       # To get ActiveModel::Dirty to work, we need to be able to call undeclared
       # properties as though they have get methods
       def method_missing(method_id, *args, &block)
@@ -237,15 +247,6 @@ module Neo4j
         end
       end
 
-      def respond_to?(method_id, include_private = false)
-        method_name = method_id.to_s
-        if property?(method_name)
-          true
-        else
-          super
-        end
-      end
-
       # Wrap the getter in a conversion from Java to Ruby
       def read_local_property_with_type_conversion(property)
         Neo4j::TypeConverters.to_ruby(self.class, property, read_local_property_without_type_conversion(property))

data/lib/neo4j/rails/model.rb

@@ -96,6 +96,15 @@ module Neo4j
         Neo4j::Algo.all_path(self.class.ref_node_for_class, self).outgoing(self.class).outgoing(:_all).count > 0
       end
 
+      def attribute_missing(method_id, *args, &block)
+        method_name = method_id.method_name
+        if property?(method_name)
+          self[method_name]
+        else
+          super
+        end
+      end
+
       ##
       # :method: outgoing
       #

data/lib/neo4j/rails/persistence.rb

@@ -237,9 +237,9 @@ module Neo4j
         allow_destroy, reject_if = [options[:allow_destroy], options[:reject_if]] if options
         begin
           # Check if we want to destroy not found nodes (e.g. {..., :_destroy => '1' } ?
-          destroy = allow_destroy && attr[:_destroy] && attr[:_destroy] != '0'
+          destroy = attr.delete(:_destroy)
           found = _find_node(rel_type, attr[:id]) || Model.find(attr[:id])
-          if destroy
+          if allow_destroy && destroy && destroy != '0'
             found.destroy if found
           else
             if not found

data/lib/neo4j/rails/relationship.rb

@@ -41,6 +41,15 @@ module Neo4j
 
       alias_method :get_other_node, :other_node # so it looks like the java version
 
+      def attribute_missing(method_id, *args, &block)
+        method_name = method_id.method_name
+        if property?(method_name)
+          self[method_name]
+        else
+          super
+        end
+      end
+
       def rel_type
         persisted? ?  _java_entity.rel_type : @type
       end

data/lib/neo4j/rails/versioning/versioning.rb

@@ -102,7 +102,7 @@ module Neo4j
       def revert_to(version_number)
         snapshot = version(version_number)
         self.props.each_pair{|k,v| self[k] = nil if !snapshot.props.has_key?(k)}
-        snapshot.props.each_pair{|k,v| self[k] = v if self.props[k].nil?}
+        snapshot.props.each_pair{|k,v| self[k] = v if self.props[k].nil? && k != '_neo_id'}
         Neo4j::Transaction.run do
           restore_relationships(snapshot)
           save

data/lib/neo4j/relationship.rb

@@ -67,7 +67,7 @@ module Neo4j
       ##
       # :method: end_node
       #
-      # Returns the start node of this relationship
+      # Returns the end node of this relationship
 
       ##
       # :method: other_node

data/lib/neo4j/rels/traverser.rb

@@ -48,9 +48,9 @@ module Neo4j
         if @types
           @node.get_relationships(@types).iterator
         elsif @type
-          @node.get_relationships(@type, dir_to_java(@dir))
+          @node.get_relationships(@type, dir_to_java(@dir)).iterator
         else
-          @node.get_relationships(dir_to_java(@dir))
+          @node.get_relationships(dir_to_java(@dir)).iterator
         end
       end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "2.0.0.alpha.4"
+  VERSION = "2.0.0.alpha.5"
 end

data/lib/tasks/upgrade_v2/lib/upgrade_v2.rb

@@ -0,0 +1,110 @@
+# A script for renaming relationship
+# In Ne4j.rb version 2.0.0 the relationship declared with has_n(something).to(otherclass)
+# has changed. In order to change the relationship of an already existing database you can run this script.
+# Use the migrate_all! to automatically update all Neo4j::Rails::Model classes
+# For Neo4j::NodeMixin nodes you need to migrate each node using the migrate method (since there are no automatic way of finding all instances of an Neo4j::NodeMixin)
+
+$NEO4J_CLASSES = []
+$DOMAIN_CLASSES = []
+
+module Neo4j
+  module Rails
+    class Model
+      class << self
+        alias_method :_old_inherited, :inherited
+
+        def inherited(c)
+          _old_inherited(c)
+          unless c == Neo4j::Rails::Model
+            $NEO4J_CLASSES << c
+            $DOMAIN_CLASSES << c if c.respond_to?(:ref_node_for_class)
+          end
+        end
+      end
+    end
+  end
+end
+
+module Neo4j
+  module UpgradeV2 #:nodoc:
+
+    class << self
+
+      # The domain classes declared as global ref_nodes
+      def default_domains_nodes
+        domain_nodes = [Neo4j.default_ref_node]
+        $DOMAIN_CLASSES.each{|clazz| domain_nodes += clazz._all.to_a}
+        domain_nodes
+      end
+
+      def migrate_all!(domains = default_domains_nodes)
+        domains.each do |domain|
+          puts "domain #{domain.props.inspect} (multitenancy) "  if domain != Neo4j.default_ref_node
+          ::Neo4j.threadlocal_ref_node = domain
+          $NEO4J_CLASSES.each { |clazz| migrate(clazz) }
+        end
+      end
+
+      def migrate(clazz, nodes = clazz._all)
+        puts "migrate #{clazz} ..."
+        source_class = clazz
+
+        clazz._decl_rels.keys.each do |rel_accessor|
+          target_class = clazz._decl_rels[rel_accessor].target_class
+          next unless target_class
+
+          old_rel = "#{target_class}##{rel_accessor}"
+          new_rel = "#{source_class}##{rel_accessor}"
+
+          TransactionalExec.new(100) do |node|
+            node._java_node._rels(:outgoing, old_rel).each do |rel|
+              start_node = rel._start_node
+              end_node = rel._end_node
+              props = rel.props
+              rel.del
+              Neo4j::Relationship.new(new_rel, start_node, end_node, props)
+            end
+          end.execute(nodes)
+        end
+      end
+
+    end
+
+    class TransactionalExec
+      attr_accessor :commit_every, :block
+
+      def initialize(commit_every, &block)
+        @commit_every = commit_every
+        @block = block
+      end
+
+      def execute(enumerable)
+        time_of_all = Time.now
+        tx = Neo4j::Transaction.new
+        time_in_ruby = Time.now
+        index = 0
+        enumerable.each do |item|
+
+          @block.call(item)
+          index += 1
+          if (index % @commit_every == 0)
+            time_spent_in_ruby_code = Time.now - time_in_ruby
+            time_spent_in_write_to_file = Time.now
+            tx.success
+            tx.finish
+            tx = Neo4j::Transaction.new
+            puts "  Written #{index} items. time_spend_in_ruby_code: #{time_spent_in_ruby_code}, time_spent_in_write_to_file #{Time.now - time_spent_in_write_to_file}"
+            time_in_ruby = Time.now
+          end
+        end
+
+        tx.success
+        tx.finish
+        puts "Total, written #{index} items in #{Time.now - time_of_all} sec." if index != 0
+      end
+    end
+
+  end
+
+end
+

data/lib/tasks/upgrade_v2/upgrade_v2.rake

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), "lib", "upgrade_v2")
+
+namespace(:neo4j) do
+
+  desc "upgrade to 2.0.0, rename relationships"
+  task :upgrade_v2 => :environment do
+    Neo4j::UpgradeV2.migrate_all!
+  end
+end

data/neo4j.gemspec

@@ -30,7 +30,7 @@ It comes included with the Apache Lucene document database.
   s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
   s.add_dependency('orm_adapter', ">= 0.0.3")
-  s.add_dependency("activemodel", ">= 3.0.0")
-  s.add_dependency("railties", ">= 3.0.0")
-  s.add_dependency("neo4j-community", "1.6.0.alpha.6")
+  s.add_dependency("activemodel", ">= 3.0.0", "< 3.3")
+  s.add_dependency("railties", ">= 3.0.0", "< 3.3")
+  s.add_dependency("neo4j-community", "1.7.0.alpha.1")
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.alpha.4
+  version: 2.0.0.alpha.5
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orm_adapter
@@ -32,6 +32,9 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: 3.0.0
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "3.3"
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -43,6 +46,9 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: 3.0.0
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "3.3"
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -53,7 +59,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.6.0.alpha.6
+            version: 1.7.0.alpha.1
     type: :runtime
     version_requirements: *id004
 description: |
@@ -84,6 +90,8 @@ files:
   - lib/generators/neo4j.rb
   - lib/generators/neo4j/model/model_generator.rb
   - lib/generators/neo4j/model/templates/model.erb
+  - lib/tasks/upgrade_v2/upgrade_v2.rake
+  - lib/tasks/upgrade_v2/lib/upgrade_v2.rb
   - lib/orm_adapter/adapters/neo4j.rb
   - lib/neo4j/identity_map.rb
   - lib/neo4j/event_handler.rb
@@ -115,6 +123,7 @@ files:
   - lib/neo4j/relationship_mixin/class_methods.rb
   - lib/neo4j/type_converters/type_converters.rb
   - lib/neo4j/core_ext/class/inheritable_attributes.rb
+  - lib/neo4j/core_ext/class/rewrite_inheritable_attributes.rb
   - lib/neo4j/migrations/migrations.rb
   - lib/neo4j/migrations/lazy_node_mixin.rb
   - lib/neo4j/migrations/extensions.rb
@@ -175,32 +184,6 @@ files:
   - lib/neo4j/rule/functions/count.rb
   - lib/neo4j/rule/functions/sum.rb
   - lib/neo4j/rule/functions/functions.rb
-  - lib/db/neostore.relationshiptypestore.db.names
-  - lib/db/neostore.id
-  - lib/db/neostore.relationshiptypestore.db.names.id
-  - lib/db/neostore.nodestore.db.id
-  - lib/db/neostore.propertystore.db.index
-  - lib/db/neostore.propertystore.db.strings.id
-  - lib/db/nioneo_logical.log.active
-  - lib/db/neostore.propertystore.db.strings
-  - lib/db/neostore.relationshiptypestore.db.id
-  - lib/db/neostore
-  - lib/db/neostore.nodestore.db
-  - lib/db/neostore.propertystore.db.index.keys.id
-  - lib/db/neostore.propertystore.db.arrays.id
-  - lib/db/messages.log
-  - lib/db/neostore.relationshipstore.db.id
-  - lib/db/neostore.propertystore.db.arrays
-  - lib/db/neostore.relationshipstore.db
-  - lib/db/neostore.propertystore.db.index.id
-  - lib/db/neostore.propertystore.db.id
-  - lib/db/neostore.propertystore.db
-  - lib/db/tm_tx_log.1
-  - lib/db/neostore.relationshiptypestore.db
-  - lib/db/active_tx_log
-  - lib/db/neostore.propertystore.db.index.keys
-  - lib/db/index/lucene-store.db
-  - lib/db/index/lucene.log.active
   - config/locales/en.yml
   - config/neo4j/config.yml
   - README.rdoc
@@ -237,9 +220,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: neo4j
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A graph database for JRuby
 test_files: []
 
+has_rdoc: true

data/lib/db/active_tx_log

@@ -1 +0,0 @@
-tm_tx_log.1

data/lib/db/messages.log

@@ -1,222 +0,0 @@
-2012-01-13 09:00:49.856+0100: Creating new db @ /home/andreas/projects/neo4j/lib/db/neostore
-2012-01-13 09:00:50.200+0100: Opened [/home/andreas/projects/neo4j/lib/db/nioneo_logical.log.1] clean empty log, version=0, lastTxId=1
-2012-01-13 09:00:50.260+0100: Opened [/home/andreas/projects/neo4j/lib/db/index/lucene.log.1] clean empty log, version=0, lastTxId=1
-2012-01-13 09:00:50.471+0100: TM new log: tm_tx_log.1
-2012-01-13 09:00:50.493+0100: --- CONFIGURATION START ---
-2012-01-13 09:00:50.493+0100: Graph Database: org.neo4j.kernel.EmbeddedGraphDatabase StoreId[time:1326441649871, id:-3425418143998465987, store version: 13561656364791302]
-2012-01-13 09:00:50.493+0100: Physical mem: 3959MB, Heap size: 444MB
-2012-01-13 09:00:50.494+0100: Kernel version: Neo4j - Graph Database Kernel 1.6.M02
-2012-01-13 09:00:50.494+0100: Neo4j component versions:
-2012-01-13 09:00:50.495+0100:   Neo4j - Graph Database Kernel 1.6.M02
-2012-01-13 09:00:50.495+0100: Store versions:
-2012-01-13 09:00:50.495+0100:   NeoStore v0.A.0
-2012-01-13 09:00:50.495+0100:   NodeStore v0.A.0
-2012-01-13 09:00:50.495+0100:   RelationshipStore v0.A.0
-2012-01-13 09:00:50.495+0100:   RelationshipTypeStore v0.A.0
-2012-01-13 09:00:50.495+0100:   PropertyStore v0.A.0
-2012-01-13 09:00:50.495+0100:   PropertyIndexStore v0.A.0
-2012-01-13 09:00:50.495+0100:   StringPropertyStore v0.A.0
-2012-01-13 09:00:50.495+0100:   ArrayPropertyStore v0.A.0
-2012-01-13 09:00:50.502+0100: Process id: 17887@andreas-dell
-2012-01-13 09:00:50.502+0100: Operating System: Linux; version: 3.0.0-14-generic; arch: amd64; cpus: 2
-2012-01-13 09:00:50.503+0100: Max number of file descriptors: 4096
-2012-01-13 09:00:50.503+0100: Number of open file descriptors: 50
-2012-01-13 09:00:50.506+0100: Total Physical memory: 3.87 GB
-2012-01-13 09:00:50.506+0100: Free Physical memory: 1.31 GB
-2012-01-13 09:00:50.506+0100: Committed virtual memory: 866.66 MB
-2012-01-13 09:00:50.506+0100: Total swap space: 4.88 GB
-2012-01-13 09:00:50.507+0100: Free swap space: 3.69 GB
-2012-01-13 09:00:50.507+0100: Byte order: LITTLE_ENDIAN
-2012-01-13 09:00:50.507+0100: VM Name: Java HotSpot(TM) 64-Bit Server VM
-2012-01-13 09:00:50.507+0100: VM Vendor: Sun Microsystems Inc.
-2012-01-13 09:00:50.507+0100: VM Version: 20.1-b02
-2012-01-13 09:00:50.509+0100: JIT compiler: HotSpot 64-Bit Tiered Compilers
-2012-01-13 09:00:50.510+0100: Class Path:
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-cypher-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-graph-algo-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-kernel-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.2] file:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/localedata.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/modules/jdk.boot.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-lucene-index-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/rt.jar
-2012-01-13 09:00:50.511+0100:    [loader.2] file:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/dnsns.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-community-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /home/andreas/.rvm/rubies/jruby-1.6.5/lib/jruby.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-shell-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/scala-library-2.9.0-1.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/lucene-core-3.1.0.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/charsets.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-jmx-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/org.apache.servicemix.bundles.jline-0.9.94_1.jar
-2012-01-13 09:00:50.511+0100:    [loader.2] file:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/sunjce_provider.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-udc-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/json-1.6.4-java/lib/json/ext/generator.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/server-api-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/json-1.6.4-java/lib/json/ext/parser.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/jsse.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/jce.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/resources.jar
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/classes
-2012-01-13 09:00:50.511+0100:    [bootstrap] /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/sunrsasign.jar
-2012-01-13 09:00:50.511+0100:    [loader.1] file:/home/andreas/projects/neo4j/lib/
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/geronimo-jta_1.1_spec-1.1.1.jar
-2012-01-13 09:00:50.511+0100:    [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.5/gems/neo4j-community-1.6.0.alpha.4-java/lib/neo4j-community/jars/neo4j-graph-matching-1.6.M02.jar
-2012-01-13 09:00:50.511+0100:    [loader.2] file:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/sunpkcs11.jar
-2012-01-13 09:00:50.511+0100: Library Path:
-2012-01-13 09:00:50.512+0100:   /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/amd64/server
-2012-01-13 09:00:50.512+0100:   /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/amd64
-2012-01-13 09:00:50.512+0100:   /usr/lib/jvm/java-6-sun-1.6.0.26/lib/amd64
-2012-01-13 09:00:50.512+0100:   /usr/java/packages/lib/amd64
-2012-01-13 09:00:50.512+0100:   /usr/lib64
-2012-01-13 09:00:50.512+0100:   /lib64
-2012-01-13 09:00:50.512+0100:   /lib
-2012-01-13 09:00:50.512+0100:   /usr/lib
-2012-01-13 09:00:50.515+0100: Garbage Collector: PS Scavenge: [PS Eden Space, PS Survivor Space]
-2012-01-13 09:00:50.515+0100: Garbage Collector: PS MarkSweep: [PS Eden Space, PS Survivor Space, PS Old Gen, PS Perm Gen]
-2012-01-13 09:00:50.516+0100: Memory Pool: Code Cache (Non-heap memory): committed=4.13 MB, used=3.89 MB, max=48.00 MB, threshold=0.00 B
-2012-01-13 09:00:50.516+0100: Memory Pool: PS Eden Space (Heap memory): committed=152.88 MB, used=92.51 MB, max=158.06 MB, threshold=?
-2012-01-13 09:00:50.516+0100: Memory Pool: PS Survivor Space (Heap memory): committed=3.81 MB, used=2.09 MB, max=3.81 MB, threshold=?
-2012-01-13 09:00:50.516+0100: Memory Pool: PS Old Gen (Heap memory): committed=41.25 MB, used=12.60 MB, max=333.38 MB, threshold=0.00 B
-2012-01-13 09:00:50.516+0100: Memory Pool: PS Perm Gen (Non-heap memory): committed=29.38 MB, used=29.28 MB, max=82.00 MB, threshold=0.00 B
-2012-01-13 09:00:50.517+0100: VM Arguments: [-Djruby.memory.max=500m, -Djruby.stack.max=2048k, -Xmx500m, -Xss2048k, -Djffi.boot.library.path=/home/andreas/.rvm/rubies/jruby-1.6.5/lib/native/i386-Linux:/home/andreas/.rvm/rubies/jruby-1.6.5/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.5/lib/native/x86_64-Linux, -Xbootclasspath/a:/home/andreas/.rvm/rubies/jruby-1.6.5/lib/jruby.jar, -Djruby.home=/home/andreas/.rvm/rubies/jruby-1.6.5, -Djruby.lib=/home/andreas/.rvm/rubies/jruby-1.6.5/lib, -Djruby.script=jruby, -Djruby.shell=/bin/sh]
-2012-01-13 09:00:50.517+0100: System properties:
-2012-01-13 09:00:50.517+0100:   jruby.home = /home/andreas/.rvm/rubies/jruby-1.6.5
-2012-01-13 09:00:50.517+0100:   sun.boot.library.path = /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/amd64
-2012-01-13 09:00:50.517+0100:   path.separator = :
-2012-01-13 09:00:50.517+0100:   file.encoding.pkg = sun.io
-2012-01-13 09:00:50.517+0100:   sun.java.launcher = SUN_STANDARD
-2012-01-13 09:00:50.517+0100:   user.country = US
-2012-01-13 09:00:50.517+0100:   sun.os.patch.level = unknown
-2012-01-13 09:00:50.517+0100:   user.dir = /home/andreas/projects/neo4j/lib
-2012-01-13 09:00:50.517+0100:   sun.jnu.encoding = UTF-8
-2012-01-13 09:00:50.517+0100:   jruby.memory.max = 500m
-2012-01-13 09:00:50.517+0100:   sun.management.compiler = HotSpot 64-Bit Tiered Compilers
-2012-01-13 09:00:50.517+0100:   jffi.boot.library.path = /home/andreas/.rvm/rubies/jruby-1.6.5/lib/native/i386-Linux:/home/andreas/.rvm/rubies/jruby-1.6.5/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.5/lib/native/x86_64-Linux
-2012-01-13 09:00:50.517+0100:   user.home = /home/andreas
-2012-01-13 09:00:50.517+0100:   user.timezone = Europe/Stockholm
-2012-01-13 09:00:50.517+0100:   file.encoding = UTF-8
-2012-01-13 09:00:50.517+0100:   jruby.script = jruby
-2012-01-13 09:00:50.517+0100:   jruby.stack.max = 2048k
-2012-01-13 09:00:50.517+0100:   user.name = andreas
-2012-01-13 09:00:50.517+0100:   jruby.shell = /bin/sh
-2012-01-13 09:00:50.517+0100:   sun.java.command = org.jruby.Main /home/andreas/.rvm/rubies/jruby-1.6.5/bin/irb
-2012-01-13 09:00:50.517+0100:   sun.arch.data.model = 64
-2012-01-13 09:00:50.517+0100:   user.language = en
-2012-01-13 09:00:50.518+0100:   file.separator = /
-2012-01-13 09:00:50.518+0100:   sun.io.unicode.encoding = UnicodeLittle
-2012-01-13 09:00:50.518+0100:   sun.cpu.endian = little
-2012-01-13 09:00:50.518+0100:   jruby.lib = /home/andreas/.rvm/rubies/jruby-1.6.5/lib
-2012-01-13 09:00:50.518+0100:   sun.desktop = gnome
-2012-01-13 09:00:50.518+0100:   sun.cpu.isalist = 
-2012-01-13 09:00:50.518+0100: Neo4j Kernel properties:
-2012-01-13 09:00:50.518+0100:   store_dir=/home/andreas/projects/neo4j/lib/db
-2012-01-13 09:00:50.518+0100:   logical_log=/home/andreas/projects/neo4j/lib/db/nioneo_logical.log
-2012-01-13 09:00:50.518+0100:   online_backup_enabled=NO
-2012-01-13 09:00:50.518+0100:   ha.machine_id=2
-2012-01-13 09:00:50.518+0100:   enable_rules=YES
-2012-01-13 09:00:50.518+0100:   min_node_cache_size=0
-2012-01-13 09:00:50.518+0100:   neostore.relationshipstore.db.mapped_memory=50M
-2012-01-13 09:00:50.518+0100:   node_auto_indexing=false
-2012-01-13 09:00:50.518+0100:   neostore.nodestore.db.mapped_memory=25M
-2012-01-13 09:00:50.518+0100:   min_relationship_cache_size=0
-2012-01-13 09:00:50.518+0100:   ha.db=NO
-2012-01-13 09:00:50.518+0100:   max_relationship_cache_size=3500
-2012-01-13 09:00:50.518+0100:   use_adaptive_cache=YES
-2012-01-13 09:00:50.518+0100:   adaptive_cache_heap_ratio=0.77
-2012-01-13 09:00:50.518+0100:   identity_map=NO
-2012-01-13 09:00:50.518+0100:   adaptive_cache_manager_decrease_ratio=1.15
-2012-01-13 09:00:50.518+0100:   timestamps=YES
-2012-01-13 09:00:50.518+0100:   use_memory_mapped_buffers=true
-2012-01-13 09:00:50.518+0100:   rebuild_idgenerators_fast=true
-2012-01-13 09:00:50.518+0100:   ha.zoo_keeper_servers=localhost:2181,localhost:2182,localhost:2183
-2012-01-13 09:00:50.518+0100:   neostore.propertystore.db.index.keys.mapped_memory=1M
-2012-01-13 09:00:50.518+0100:   max_node_cache_size=1500
-2012-01-13 09:00:50.518+0100:   neostore.propertystore.db.strings.mapped_memory=130M
-2012-01-13 09:00:50.519+0100:   neostore.propertystore.db.arrays.mapped_memory=130M
-2012-01-13 09:00:50.519+0100:   neo_store=/home/andreas/projects/neo4j/lib/db/neostore
-2012-01-13 09:00:50.519+0100:   adaptive_cache_worker_sleep_time=3000
-2012-01-13 09:00:50.519+0100:   neostore.propertystore.db.index.mapped_memory=1M
-2012-01-13 09:00:50.519+0100:   create=true
-2012-01-13 09:00:50.519+0100:   adaptive_cache_manager_increase_ratio=1.1
-2012-01-13 09:00:50.519+0100:   enable_remote_shell=port=9332
-2012-01-13 09:00:50.519+0100:   neostore.propertystore.db.mapped_memory=90M
-2012-01-13 09:00:50.519+0100:   relationship_auto_indexing=false
-2012-01-13 09:00:50.519+0100:   storage_path=db
-2012-01-13 09:00:50.519+0100:   ha.server=localhost:6002
-2012-01-13 09:00:50.519+0100:   migration_thread=NO
-2012-01-13 09:00:50.519+0100: Storage files:
-2012-01-13 09:00:50.519+0100:   neostore.relationshiptypestore.db.names: 38.00 B
-2012-01-13 09:00:50.519+0100:   neostore.id: 9.00 B
-2012-01-13 09:00:50.519+0100:   neostore.relationshiptypestore.db.names.id: 9.00 B
-2012-01-13 09:00:50.519+0100:   neostore.nodestore.db.id: 9.00 B
-2012-01-13 09:00:50.519+0100:   nioneo_logical.log.1: 16.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.index: 0.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.strings.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   nioneo_logical.log.active: 4.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.strings: 128.00 B
-2012-01-13 09:00:50.520+0100:   neostore.relationshiptypestore.db.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   neostore: 54.00 B
-2012-01-13 09:00:50.520+0100:   neostore.nodestore.db: 9.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.index.keys.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.arrays.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   messages.log: 9.38 kB
-2012-01-13 09:00:50.520+0100:   neostore.relationshipstore.db.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.arrays: 128.00 B
-2012-01-13 09:00:50.520+0100:   neostore.relationshipstore.db: 0.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.index.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db.id: 9.00 B
-2012-01-13 09:00:50.520+0100:   neostore.propertystore.db: 0.00 B
-2012-01-13 09:00:50.520+0100:   index:
-2012-01-13 09:00:50.521+0100:     lucene-store.db: 32.00 B
-2012-01-13 09:00:50.521+0100:     lucene.log.1: 16.00 B
-2012-01-13 09:00:50.521+0100:     lucene.log.active: 4.00 B
-2012-01-13 09:00:50.521+0100:   - Total: 52.00 B
-2012-01-13 09:00:50.521+0100:   tm_tx_log.1: 0.00 B
-2012-01-13 09:00:50.521+0100:   neostore.relationshiptypestore.db: 0.00 B
-2012-01-13 09:00:50.521+0100:   lock: 0.00 B
-2012-01-13 09:00:50.521+0100:   active_tx_log: 11.00 B
-2012-01-13 09:00:50.521+0100:   neostore.propertystore.db.index.keys: 38.00 B
-2012-01-13 09:00:50.521+0100: Id usage:
-2012-01-13 09:00:50.521+0100:   NodeStore: used=1 high=0
-2012-01-13 09:00:50.522+0100:   RelationshipStore: used=0 high=-1
-2012-01-13 09:00:50.522+0100:   RelationshipTypeStore: used=0 high=-1
-2012-01-13 09:00:50.522+0100:   PropertyStore: used=0 high=-1
-2012-01-13 09:00:50.522+0100:   PropertyIndexStore: used=0 high=-1
-2012-01-13 09:00:50.522+0100:   StringPropertyStore: used=1 high=0
-2012-01-13 09:00:50.522+0100:   ArrayPropertyStore: used=1 high=0
-2012-01-13 09:00:50.525+0100: Schedulers:   none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  none
-  noop deadline [cfq] 
-  noop deadline [cfq] 
-
-2012-01-13 09:00:50.525+0100: --- CONFIGURATION END ---
-2012-01-13 09:00:50.827+0100: Extension org.neo4j.kernel.KernelExtension[shell] loaded ok
-2012-01-13 09:00:50.901+0100: Extension org.neo4j.kernel.KernelExtension[kernel jmx] loaded ok
-2012-01-13 09:00:50.903+0100: Extension org.neo4j.kernel.KernelExtension[kernel udc] loaded ok
-2012-01-13 09:43:49.270+0100: Closed log /home/andreas/projects/neo4j/lib/db/nioneo_logical.log
-2012-01-13 09:43:49.362+0100: NeoStore closed
-2012-01-13 09:43:49.367+0100: Closed log /home/andreas/projects/neo4j/lib/db/index/lucene.log
-2012-01-13 09:43:49.367+0100: NeoStore closed
-2012-01-13 09:43:49.374+0100: TM shutting down

data/lib/db/neostore.relationshipstore.db

@@ -1 +0,0 @@
-RelationshipStore v0.A.0

data/lib/db/neostore.relationshiptypestore.db

@@ -1 +0,0 @@
-RelationshipTypeStore v0.A.0