neo4j 1.0.0.beta.29-java → 1.0.0.beta.30-java

data/CONTRIBUTORS

@@ -2,6 +2,8 @@ Maintainer:
   Andreas Ronge <andreas dot ronge at gmail dot com>
 
 Contributors:
+
+* Jay Adkisson 
 * Stephan Hagemann
 * Bobby Calderwood
 * Ben Jackson

data/config/neo4j/config.yml

@@ -19,6 +19,9 @@ lucene: { fulltext: { provider: lucene,
 # If set to true it you can use the database while it is migrating.
 migration_thread: false
 
+# If online backup should be available, if it is the Online JAR file will be loaded.
+online_backup_enabled: false
+
 #use the clustered Neo4j GraphDatabase (org.neo4j.kernel.HighlyAvailableGraphDatabase)
 ha.db: false
 

data/lib/neo4j.rb

@@ -13,25 +13,38 @@ require 'will_paginate/finders/base'
 
 require 'neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/core/lucene-core-3.0.3.jar'
-require 'neo4j/jars/core/neo4j-lucene-index-0.5-1.3.M01.jar'
-require 'neo4j/jars/core/neo4j-kernel-1.3-1.3.M01.jar'
-require 'neo4j/jars/ha/neo4j-management-1.3-1.3.M01.jar'
+require 'neo4j/jars/core/neo4j-lucene-index-1.3.M02.jar'
+require 'neo4j/jars/core/neo4j-kernel-1.3.M02.jar'
+require 'neo4j/jars/ha/neo4j-management-1.3.M02.jar'
 
 module Neo4j
 
   def self.load_local_jars
     # This is a temporary fix since the HA does not yet work with this JAR
     # It will be solved in a future version of the Java Neo4j library.
-    require 'neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar'
+    if Neo4j.config[:online_backup_enabled]
+      Neo4j.load_online_backup
+    else
+      # backup and HA does not work with this JAR FILE
+      require 'neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar'
+    end
   end
 
   def self.load_shell_jars
-    require 'neo4j/jars/ha/neo4j-shell-1.3-1.3.M01.jar'
+    require 'neo4j/jars/ha/neo4j-shell-1.3.M02.jar'
   end
-  
+
+  def self.load_online_backup
+    require 'neo4j/jars/ha/neo4j-com-1.3.M02.jar'
+    require 'neo4j/jars/core/neo4j-backup-1.3-SNAPSHOT.jar'
+    require 'neo4j/jars/ha/netty-3.2.1.Final.jar'
+    Neo4j.send(:const_set, :OnlineBackup, org.neo4j.backup.OnlineBackup)
+  end
+
   def self.load_ha_jars
     require 'neo4j/jars/ha/log4j-1.2.16.jar'
-    require 'neo4j/jars/ha/neo4j-ha-0.6-1.3.M01.jar'
+    require 'neo4j/jars/ha/neo4j-ha-1.3.M02.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.3.M02.jar'
     require 'neo4j/jars/ha/netty-3.2.1.Final.jar'
     require 'neo4j/jars/ha/org.apache.servicemix.bundles.jline-0.9.94_1.jar'
     require 'neo4j/jars/ha/org.apache.servicemix.bundles.lucene-3.0.1_2.jar'

data/lib/neo4j/algo/algo.rb

@@ -1,6 +1,6 @@
 # external neo4j dependencies
 require 'neo4j/to_java'
-require 'neo4j/jars/core/neo4j-graph-algo-0.8-1.3.M01.jar'
+require 'neo4j/jars/core/neo4j-graph-algo-1.3.M02.jar'
 
 module Neo4j
 

data/lib/neo4j/batch/indexer.rb

@@ -84,10 +84,11 @@ module Neo4j
         index_config = lucene_config(type)
 
         if entity_type == :node
-          self.class.index_provider.node_index("#{indexer_for}-#{type}", index_config)
+          self.class.index_provider.node_index(indexer_for.index_names[type], index_config)
         else
-          self.class.index_provider.relationship_index("#{indexer_for}-#{type}", index_config)
+          self.class.index_provider.relationship_index(indexer_for.index_names[type], index_config)
         end
+        
       end
 
       class << self

data/lib/neo4j/database.rb

@@ -64,6 +64,7 @@ module Neo4j
     def start_ha_graph_db
       Neo4j.logger.info "starting Neo4j in HA mode, machine id: #{Neo4j.config['ha.machine_id']} at #{Neo4j.config['ha.server']} db #{@storage_path}"
       Neo4j.load_ha_jars # those jars are only needed for the HighlyAvailableGraphDatabase
+      Neo4j.load_online_backup if Neo4j.config[:online_backup_enabled]      
       @graph = org.neo4j.kernel.HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
       @graph.register_transaction_event_handler(@event_handler)
       @lucene = @graph.index #org.neo4j.index.impl.lucene.LuceneIndexProvider.new

data/lib/neo4j/has_n/decl_relationship_dsl.rb

@@ -110,17 +110,29 @@ module Neo4j
       #  # generate a relationship between folder and file of type 'FileNode#files'
       #  folder.files << FileNode.new
       #
-      def to(*args)
+      # ==== Example, without prefix
+      #
+      #   class FolderNode
+      #     include Neo4j::NodeMixin
+      #     has_n(:files).to(:contains)
+      #   end
+      #
+      #   file = FileNode.new
+      #   # create an outgoing relationship of type 'contains' from folder node to file
+      #   folder.files << FolderNode.new
+      #
+      def to(target)
         @direction = :outgoing
 
-        if (args.size > 1)
-          raise "only one argument expected - the class of the node this relationship points to, got #{args.inspect}"
-        elsif (Class === args[0])
+        if (Class === target)
           # handle e.g. has_n(:friends).to(class)
-          @target_class = args[0]
+          @target_class = target
           @rel_type = "#{@target_class}##{@method_id}"
+        elsif (Symbol === target)
+          # handle e.g. has_n(:friends).to(:knows)
+          @rel_type = target.to_s
         else
-          raise "Expected a class for, got #{args[0]}/#{args[0].class}"
+          raise "Expected a class or a symbol for, got #{target}/#{target.class}"
         end
         self
       end

data/lib/neo4j/index/class_methods.rb

@@ -33,9 +33,33 @@ module Neo4j
       # It is possible to share the same index for several different classes, see #node_indexer.
       # :singleton-method: find
 
+      ##
+      # Specifies the location on the filesystem of the lucene index for the given index type.
+      #
+      # If not specified it will have the default location:
+      #
+      #   Neo4j.config[:storage_path]/index/lucene/node|relationship/ParentModuleName_SubModuleName_ClassName-indextype
+      #
+      # Forwards to the Indexer#index_names class
+      #
+      # ==== Example
+      #  module Foo
+      #    class Person
+      #       include Neo4j::NodeMixin
+      #       index :name
+      #       index_names[:fulltext] = 'my_location'
+      #    end
+      #  end
+      #
+      #  Person.index_names[:fulltext] => 'my_location'
+      #  Person.index_names[:exact] => 'Foo_Person-exact' # default Location
+      #  Notice in versions <= 1.0.0.beta.29 the default location was 'Foo::Person-exact'
+      #  which does not work on Windows [lighthouse ticket #147]
+      #
+      # :singleton-method: index_names
 
-      def_delegators :@_indexer, :index, :find, :index?, :index_type?, :delete_index_type, :rm_field_type, :add_index, :rm_index, :index_type_for, :index_name
 
+      def_delegators :@_indexer, :index, :find, :index?, :index_type?, :delete_index_type, :rm_field_type, :add_index, :rm_index, :index_type_for, :index_names
 
       # Sets which indexer should be used for the given node class.
       # You can share an indexer between several different classes.

data/lib/neo4j/index/indexer.rb

@@ -306,13 +306,16 @@ module Neo4j
         db           = Neo4j.started_db
         index_config = lucene_config(type)
         if @entity_type == :node
-          db.lucene.for_nodes("#{@indexer_for}-#{type}", index_config)
+          db.lucene.for_nodes(index_names[type], index_config)
         else
-          db.lucene.for_relationships("#{@indexer_for}-#{type}", index_config)
+          db.lucene.for_relationships(index_names[type], index_config)
         end
       end
 
-
+      def index_names
+        default_filename = @indexer_for.to_s.gsub('::', '_')
+        @index_names ||= Hash.new{|hash,index_type| hash[index_type] = "#{default_filename}-#{index_type}"}
+      end
 
     end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.29"
+  VERSION = "1.0.0.beta.30"
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.29
+  version: 1.0.0.beta.30
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-02-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -134,19 +134,21 @@ files:
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/rails/validations/non_nil.rb
   - lib/neo4j/jars/core/lucene-core-3.0.3.jar
-  - lib/neo4j/jars/core/neo4j-kernel-1.3-1.3.M01.jar
-  - lib/neo4j/jars/core/neo4j-lucene-index-0.5-1.3.M01.jar
+  - lib/neo4j/jars/core/neo4j-graph-algo-1.3.M02.jar
+  - lib/neo4j/jars/core/neo4j-backup-1.3-SNAPSHOT.jar
   - lib/neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar
-  - lib/neo4j/jars/core/neo4j-graph-algo-0.8-1.3.M01.jar
+  - lib/neo4j/jars/core/neo4j-kernel-1.3.M02.jar
+  - lib/neo4j/jars/core/neo4j-lucene-index-1.3.M02.jar
   - lib/neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar
-  - lib/neo4j/jars/ha/neo4j-management-1.3-1.3.M01.jar
+  - lib/neo4j/jars/ha/neo4j-management-1.3.M02.jar
   - lib/neo4j/jars/ha/org.apache.servicemix.bundles.lucene-3.0.1_2.jar
   - lib/neo4j/jars/ha/zookeeper-3.3.2.jar
-  - lib/neo4j/jars/ha/neo4j-shell-1.3-1.3.M01.jar
   - lib/neo4j/jars/ha/netty-3.2.1.Final.jar
-  - lib/neo4j/jars/ha/neo4j-ha-0.6-1.3.M01.jar
   - lib/neo4j/jars/ha/log4j-1.2.16.jar
+  - lib/neo4j/jars/ha/neo4j-ha-1.3.M02.jar
+  - lib/neo4j/jars/ha/neo4j-com-1.3.M02.jar
   - lib/neo4j/jars/ha/org.apache.servicemix.bundles.jline-0.9.94_1.jar
+  - lib/neo4j/jars/ha/neo4j-shell-1.3.M02.jar
   - lib/neo4j/index/indexer.rb
   - lib/neo4j/index/lucene_query.rb
   - lib/neo4j/index/indexer_registry.rb