From 54b352525f299cec5bc4499b8133522867eeb2da Mon Sep 17 00:00:00 2001 From: "Piotr Gega (pietia)" Date: Sun, 6 Mar 2011 23:34:54 +0100 Subject: [PATCH] removed mvn --- Rakefile | 26 +++++++++++++++++++++++++ eventlog.rb | 2 +- lib/dm-hibernate-adapter.rb | 28 ++++++++++++++++++++++----- lib/dm-hibernate-adapter/hibernate.rb | 1 - 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index 09c224d..6dafe7c 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,5 @@ require 'rake' +require 'rake/gempackagetask' SPEC_LOCATIONS = { :abstract_adapter => "spec/abstract_adapter", @@ -55,4 +56,29 @@ with_gem 'yard' do end end +specification = Gem::Specification.new do |s| + s.name = "dm-hibernate-adapter" + s.summary = "dm-hibernate-adapter = DM + Hibernate" + s.version = "0.0.1" + s.author = 'Kristian Meier Piotr Gega Douglas Ferreira' + s.description = s.summary + #s.homepage = 'http://ribs.rubyforge.org' + #s.rubyforge_project = 'ribs' + + s.has_rdoc = false + #s.extra_rdoc_files = ['README.'] + #s.rdoc_options << '--title' << 'ribs' << '--main' << 'README' << '--line-numbers' + + s.email = 'piotrgega@gmail.com' + s.files = FileList['{lib,spec}/**/*.{rb,jar}', '[A-Z]*$', 'Rakefile'].to_a + s.add_dependency('dm-core', '1.0.0') + s.add_dependency('dm-transactions', '1.0.0') + s.add_dependency('dm-migrations', '1.0.0') + s.add_dependency("slf4r", "0.3.1") +end + +Rake::GemPackageTask.new(specification) do |package| + package.need_zip = false + package.need_tar = false +end diff --git a/eventlog.rb b/eventlog.rb index 8382969..63fc4bd 100644 --- a/eventlog.rb +++ b/eventlog.rb @@ -1,5 +1,5 @@ require 'rubygems' -require 'lib/dm-hibernate-adapter.rb' +require 'dm-hibernate-adapter' require 'dm-transactions' DataMapper.setup(:default, :adapter => "hibernate", :dialect => "H2", :username => "sa", :url => "jdbc:h2:target/eventlog") diff --git a/lib/dm-hibernate-adapter.rb b/lib/dm-hibernate-adapter.rb index 3aa4591..b678041 100644 --- a/lib/dm-hibernate-adapter.rb +++ b/lib/dm-hibernate-adapter.rb @@ -1,4 +1,24 @@ require 'java' +require 'pathname' + +# 3.6.1 +# HIBERNATE_LIBS = %w(antlr-2.7.6.jar dom4j-1.6.1.jar javassist-3.12.0.GA.jar jta-1.1.jar +# log4j-1.2.14.jar slf4j-api-1.6.1.jar hibernate3.jar hibernate-jpa-2.0-api-1.0.0.Final.jar) + +HIBERNATE_LIBS = %w(hibernate-core-3.3.2.GA.jar log4j-1.2.14.jar hibernate-tools-3.2.4.GA.jar slf4j-log4j12-1.5.2.jar + slf4j-api-1.5.2.jar javassist-3.8.0.GA.jar hibernate-annotations-3.4.0.GA.jar jta-1.1.jar + antlr-2.7.6.jar dom4j-1.6.1.jar hibernate-commons-annotations-3.3.0.ga.jar ejb3-persistence-3.3.2.Beta1.jar + commons-collections-3.1.jar) + +JDBC_DRIVERS = %w(h2-1.3.148.jar) + +base_path = Pathname(__FILE__).dirname.expand_path +dir = "#{base_path}/dm-hibernate-adapter" + +(JDBC_DRIVERS + HIBERNATE_LIBS).each do |lib_name| + require "#{base_path}/#{lib_name}" +end + begin require 'dm-hibernate-adapter_ext.jar' rescue LoadError @@ -16,11 +36,9 @@ require 'jruby/core_ext' require 'stringio' -dir = Pathname(__FILE__).dirname.expand_path / 'dm-hibernate-adapter' - -require dir / 'dialects' -require dir / 'hibernate' -require dir / 'transaction' +require "#{dir}/dialects" +require "#{dir}/hibernate" +require "#{dir}/transaction" module DataMapper diff --git a/lib/dm-hibernate-adapter/hibernate.rb b/lib/dm-hibernate-adapter/hibernate.rb index 56be7ed..8af392b 100644 --- a/lib/dm-hibernate-adapter/hibernate.rb +++ b/lib/dm-hibernate-adapter/hibernate.rb @@ -158,7 +158,6 @@ module ClassMethods def auto_migrate!(repo = nil) config = Hibernate::config - # TODO drop only one table, not all of them ! schema_export = SchemaExport.new(config) console = true # XXX here you can turn on/off logger