s2container 0.9.0 → 0.9.1

data/ChangeLog

@@ -1,7 +1,21 @@
 
+2009-06-20 s2container-0.9.1
+
+	* modify: for JRuby.
+	* info: s2container-0.9.1 release.
+
+2009-06-04 s2container-0.9.1
+
+	* add: add Seasar::DBI::TxInterceptor.
+
+2009-05-06 s2container-0.9.1
+
+	* fix: s2aspect method.
+
 2009-04-26 s2container-0.9.0
 
 	* add: destroy method to Seasar::Container::S2Container, Seasar::Container::ComponentDef.
+	* info: s2container-0.9.0 release.
 
 2009-04-15 s2container-0.8.0
 

data/Rakefile

@@ -1,4 +1,4 @@
-RUBY_S2CONTAINER_VERSION = '0.9.0'
+RUBY_S2CONTAINER_VERSION = '0.9.1'
 
 require 'rubygems'
 require 'rake'
@@ -18,7 +18,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 's2container'
-  s.date = '2009-04-26'
+  s.date = '2009-06-20'
   s.version = RUBY_S2CONTAINER_VERSION
   s.authors = ['klove']
   s.email = 'klovelion@gmail.com'

data/example/example032/example.rb

@@ -0,0 +1,10 @@
+module Example
+  class Action
+    def init
+      s2logger.debug(self.class){"init method called as constructor."}
+    end
+    def quit
+      s2logger.debug(self.class){"quit method called as destructor."}
+    end
+  end
+end

data/example/example032/run.rb

@@ -0,0 +1,21 @@
+$LOAD_PATH.unshift(File::expand_path(File::dirname(__FILE__)) + '/../../lib')
+
+require 's2container'
+require 'example'
+
+component_info = s2component(:class => Example::Action) {
+  # constructor block
+  action = Example::Action.new
+  action.init
+  next action
+}
+
+component_info.destructor {|component|
+  # destructor block
+  component.quit
+}
+
+container = s2app.create
+container.init                     # call constructor block
+container.destroy                  # call destructor block
+

data/example/example13/run.rb

@@ -6,17 +6,27 @@ require 'dbi'
 require 's2container'
 require 'example'
 
-s2comp(:class => DBI::DatabaseHandle, :name => :dbh, :autobinding => :none) {
-  DBI.connect("dbi:SQLite3:sample.db")
+component_info = s2comp(:class => DBI::DatabaseHandle, :name => :dbh, :autobinding => :none) {
+  s2logger.info(File.basename(__FILE__)){"Database handle connected."}
+  next DBI.connect("dbi:SQLite3:sample.db")
 }
 
+component_info.destructor {|dbh|
+  s2logger.info(File.basename(__FILE__)){"Database handle disconnected."}
+  dbh.disconnect
+}
+
+container = s2app.create
 begin
-  s2app[Example::Dao].find_by_name('hoge')
-rescue Seasar::DBI::DBIInterceptor::ConnectError => e
-  s2logger.fatal(e.cause.class.name){"#{e.cause.message} #{e.cause.backtrace}"}
+  dao = container.get(Example::Dao)
+  dao.find_by_name('hoge')
 rescue => e
   s2logger.fatal(e.class.name){"#{e.message} #{e.backtrace}"}
 ensure
-  s2app[DBI::DatabaseHandle].disconnect if s2app[DBI::DatabaseHandle]
+  begin
+    container.destroy
+  rescue => e
+    s2logger.error(self) {"destroy of s2container failed. #{e.message} #{e.backtrace}"}
+  end
 end
 

data/example/example14/example.rb

@@ -54,4 +54,20 @@ module Example
   class PrefectureDto < Seasar::DBI::Paginate
     attr_accessor :name_like
   end
+
+  class TxService
+    s2comp
+    s2aspect :interceptor => "dbi.tx"
+    attr_accessor :prefecture_dao
+    def execute
+      @prefecture_dao.insert(100, 'tx test1')
+      @prefecture_dao.insert(1, 'tx test2')
+    end
+
+    def execute2
+      @prefecture_dao.insert(200, 'tx test3')
+      return self.execute
+    end
+
+  end
 end

data/example/example14/run6.rb

@@ -0,0 +1,35 @@
+$LOAD_PATH.unshift(File::expand_path(File::dirname(__FILE__)) + '/../../lib')
+
+require 'rubygems'
+require 'dbi'
+
+require 's2container'
+require 'seasar/dbi'
+require 'example'
+
+comp_info = s2comp(:class => DBI::DatabaseHandle, :namespace => "dbi", :autobinding => :none) {
+  DBI.connect("dbi:SQLite3:example.db")
+}
+
+comp_info.destructor {|dbh|
+  dbh.disconnect
+}
+
+container = s2app.create
+begin
+  container[Example::TxService].execute
+rescue => e
+  s2logger.fatal(e.class.name){"#{e.message}"}
+ensure
+  container.destroy
+end
+
+container = s2app.create
+begin
+  container[Example::TxService].execute2
+rescue => e
+  s2logger.fatal(e.class.name){"#{e.message}"}
+ensure
+  container.destroy
+end
+

data/lib/s2container.rb

@@ -23,3 +23,11 @@ require 'seasar/util'
 require 'seasar/exception'
 require 'seasar/beans'
 
+if RUBY_VERSION < '1.8.7'
+  class Method
+    def name
+      return self.inspect.scan(/.+#(.+?)>$/)[0][0]
+    end
+  end
+end
+

data/lib/seasar/aop.rb

@@ -23,7 +23,11 @@ module Seasar
     autoload :Aspect, 'seasar/aop/aspect'
     autoload :MethodInvocation, 'seasar/aop/method-invocation'
     autoload :Pointcut, 'seasar/aop/pointcut'
-    autoload :S2AopFactory, 'seasar/aop/s2aop-factory'
+    if '1.8.6' < RUBY_VERSION
+      autoload :S2AopFactory, 'seasar/aop/s2aop-factory'
+    else
+      autoload :S2AopFactory, 'seasar/aop/s2aop-factory186'
+    end
   end
 end
 

data/lib/seasar/aop/s2aop-factory.rb

@@ -107,16 +107,18 @@ module Seasar
         #   - none
         #
         def weave_aspect(component_class, enhanced_class, method_name, interceptors)
-          enhanced_class.__send__(:define_method, method_name) {|*args, &procedure|
-            invoker = MethodInvocation.new
-            invoker.method = component_class.instance_method(method_name).bind(self)
-            invoker.interceptors = interceptors
-            invoker.enhanced_class = enhanced_class
-            invoker.component_class = component_class
-            invoker.args = args
-            invoker.procedure = procedure
-            invoker.this = self
-            return invoker.proceed
+          enhanced_class.class_eval {|mod|
+            define_method(method_name) {|*args, &procedure|
+              invoker = MethodInvocation.new
+              invoker.method = component_class.instance_method(method_name).bind(self)
+              invoker.interceptors = interceptors
+              invoker.enhanced_class = enhanced_class
+              invoker.component_class = component_class
+              invoker.args = args
+              invoker.procedure = procedure
+              invoker.this = self
+              return invoker.proceed
+            }
           }
         end
       end

data/lib/seasar/aop/s2aop-factory186.rb

@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+#--
+# +----------------------------------------------------------------------+
+# | Copyright 2005-2008 the Seasar Foundation and the Others.            |
+# +----------------------------------------------------------------------+
+# | Licensed 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.             |
+# +----------------------------------------------------------------------+
+#++
+require "thread"
+module Seasar
+  module Aop
+
+    # アスペクトを適用したクラスを生成するファクトリクラスです。
+    class S2AopFactory
+      @@index = 0
+      @@mutex = ::Mutex.new
+
+      class << self
+
+        #クラスにアスペクトを適用します。
+        #
+        # - args
+        #   1. Class <em>component_class</em>
+        #   2. Array <em>aspects</em>
+        # - return
+        #   - Class
+        #
+        def create(component_class, aspects)
+          enhanced_class = S2AopFactory.generate_enhanced_class(component_class)
+          method_interceptors_map = S2AopFactory.creat_method_interceptors_map(component_class, aspects)
+          method_interceptors_map.each {|method_name, interceptors|
+            S2AopFactory.weave_aspect(component_class, enhanced_class, method_name, interceptors)
+          }
+          return enhanced_class
+        end
+  
+        # 元のクラスを継承した新規クラスを返します。
+        # 新規クラスの名前には、「_EnhancedByS2Aop_###」が付加されます。
+        #
+        # - args
+        #   1. Class <em>component_class</em>
+        # - return
+        #   - Class
+        #
+        def generate_enhanced_class(component_class)
+          #return Class.new(component_class)
+          consts = component_class.name.split(/::/)
+          enhanced_class_name = nil
+          @@mutex.synchronize {
+            enhanced_class_name = consts.pop + '_EnhancedByS2Aop_' + @@index.to_s
+            @@index += 1
+          }
+          if consts.size == 0
+            namespace = Object
+          else
+            namespace = eval(consts.join('::'))
+          end
+          clazz = Class.new(component_class)
+          # TODO: should throw exception? if contant has already defined in the namespace(module)
+          namespace.const_set(enhanced_class_name, clazz) unless namespace.const_defined?(enhanced_class_name)
+          return clazz
+        end
+  
+        # クラスの各メソッドに適用するアスペクトを分類します。
+        #
+        # - args
+        #   1. Class <em>component_class</em>
+        #   2. Array <em>aspects</em>
+        # - return
+        #   - Hash
+        #
+        def creat_method_interceptors_map(component_class, aspects)
+          methods = Seasar::Util::ClassUtil.get_aspectable_methods(component_class)
+          method_interceptors_map = {}
+          methods.each {|method_name|
+            interceptors = []
+            aspects.each {|aspect| 
+              if aspect.pointcut.applicable?(method_name)
+                interceptors << aspect.interceptor
+              end
+            }
+            if 0 < interceptors.length
+              method_interceptors_map[method_name] = interceptors
+            end
+          }
+          return method_interceptors_map
+        end
+  
+        # メソッドにアスペクトを織り込みます。(メソッドをinvokeクロージャで置き換えます)
+        #
+        # - args
+        #   1. Class <em>component_class</em>
+        #   2. Class <em>enhanced_class</em>
+        #   3. String|Symbol <em>method_name</em>
+        #   4. Array <em>interceptors</em>
+        # - return
+        #   - none
+        #
+        def weave_aspect(component_class, enhanced_class, method_name, interceptors)
+          enhanced_class.class_eval {|mod|
+            define_method(method_name) {|*args|
+              invoker = MethodInvocation.new
+              invoker.method = component_class.instance_method(method_name).bind(self)
+              invoker.interceptors = interceptors
+              invoker.enhanced_class = enhanced_class
+              invoker.component_class = component_class
+              invoker.args = args
+              invoker.this = self
+              return invoker.proceed
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/seasar/container.rb

@@ -65,20 +65,16 @@ alias s2comp s2component
 #   - nil
 #
 def s2aspect(option = {}, &procedure)
-  clazz = nil
-  if option[:class].nil?
+  clazz = option[:class]
+  if clazz.nil?
     if self.class == Class
       clazz = self
       option[:static] = true
     end
-  else
-    clazz = option[:class]
   end
 
-  if option[:pattern].nil?
-    if not clazz.nil?
-      option[:pattern] = self.name
-    end
+  if option[:pattern].nil? && !clazz.nil?
+    option[:pattern] = clazz.name
   end
   return s2app.aspect(option, &procedure)
 end

data/lib/seasar/dbi.rb

@@ -19,6 +19,7 @@
 
 require 'dbi'
 require 'seasar/dbi/dbi-interceptor'
+require 'seasar/dbi/tx-interceptor'
 module Seasar
   module DBI
     autoload :Paginate, 'seasar/dbi/paginate'

data/lib/seasar/dbi/tx-interceptor.rb

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#--
+# +----------------------------------------------------------------------+
+# | Copyright 2005-2008 the Seasar Foundation and the Others.            |
+# +----------------------------------------------------------------------+
+# | Licensed 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.             |
+# +----------------------------------------------------------------------+
+#++
+module Seasar
+  module DBI
+    class TxInterceptor
+      s2comp :namespace => 'dbi', :name => 'tx', :default => true
+
+      # - args
+      #   - none
+      #
+      def initialize
+        @dbh = :di, ::DBI::DatabaseHandle
+      end
+
+      #
+      # - args
+      #   1. Seasar::Aop::MethodInvocation <em>invocation</em>
+      # - return
+      #   - Object
+      #
+      def call(invocation)
+        result = nil
+        @dbh['AutoCommit'] = false
+        begin
+          result = invocation.proceed
+          @dbh.commit
+        rescue
+          s2logger.info(self.class.name){"doing rollback..."}
+          @dbh.rollback
+          s2logger.info(self.class.name){"rollback has occured."}
+          raise
+        ensure
+          @dbh['AutoCommit'] = true
+        end
+        return result
+      end
+    end
+  end
+end

data/lib/seasar/log.rb

@@ -19,20 +19,26 @@
 
 #
 # - args
-#   1. IO _logdev_
+#   - none
 # - return
 #   - Logger
 #
-def s2logger(logdev = nil)
-  if not logdev.nil?
-    Seasar::Log::S2Logger.set
-    Seasar::Log::S2Logger.logdev = logdev
-  end
+def s2logger
   return Seasar::Log::S2Logger.get
 end
 
 module Seasar
   module Log
     autoload :S2Logger, 'seasar/log/s2logger'
+    autoload :JLogger, 'seasar/log/jlogger'
+    module Factory
+      autoload :RubyLoggerFactory, 'seasar/log/factory/ruby-logger-factory'
+      autoload :JavaLoggerFactory, 'seasar/log/factory/java-logger-factory'
+    end
   end
 end
+
+if defined? JRUBY_VERSION
+  Seasar::Log::S2Logger.factory = Seasar::Log::Factory::JavaLoggerFactory
+end
+

data/lib/seasar/log/factory/java-logger-factory.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+#--
+# +----------------------------------------------------------------------+
+# | Copyright 2005-2008 the Seasar Foundation and the Others.            |
+# +----------------------------------------------------------------------+
+# | Licensed 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.             |
+# +----------------------------------------------------------------------+
+#++
+module Seasar
+  module Log
+    module Factory
+      class JavaLoggerFactory
+        @@logger = nil
+        class << self
+
+          #
+          # - args
+          #   - none
+          # - return
+          #   - java.util.logging.Logger
+          #
+          def create
+            if @@logger.nil?
+              @@logger = Seasar::Log::JLogger.new
+            end
+            return @@logger
+          end
+
+          #
+          # - args
+          #   - none
+          # - return
+          #   - none
+          #
+          def init
+            @@logger = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/seasar/log/factory/ruby-logger-factory.rb

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+#--
+# +----------------------------------------------------------------------+
+# | Copyright 2005-2008 the Seasar Foundation and the Others.            |
+# +----------------------------------------------------------------------+
+# | Licensed 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.             |
+# +----------------------------------------------------------------------+
+#++
+require "logger"
+
+module Seasar
+  module Log
+    module Factory
+      class RubyLoggerFactory
+        @@logger = nil
+        @@logdev = STDERR
+        class << self
+
+          #
+          # - args
+          #   - none
+          # - return
+          #   - Logger
+          #
+          def create
+            if @@logger.nil?
+              @@logger = Logger.new(@@logdev)
+              @@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+            end
+            return @@logger
+          end
+
+          #
+          # - args
+          #   - none
+          # - return
+          #   - none
+          #
+          def init
+            @@logger = nil
+            @@logdev = STDERR
+          end
+
+          #
+          # - args
+          #   1. Object <em>logdev</em>
+          # - return
+          #   - nil
+          #
+          def logdev=(logdev)
+            @@logdev = logdev
+            @@logger = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/seasar/log/jlogger.rb

@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+#--
+# +----------------------------------------------------------------------+
+# | Copyright 2005-2008 the Seasar Foundation and the Others.            |
+# +----------------------------------------------------------------------+
+# | Licensed 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.             |
+# +----------------------------------------------------------------------+
+#++
+require "java"
+#import 'java.util.logging.Logger'
+module Seasar
+  module Log
+    class JLogger
+
+      #
+      # - args
+      #   - 1. String <em>val</em>
+      # - return
+      #   - java.util.logging.Logger
+      #
+      def instance(val = nil)
+        if val.nil?
+          return java.util.logging.Logger.global
+        else
+          return java.util.logging.Logger.getLogger(val.to_s.to_s)
+        end
+      end
+      alias get instance
+
+      #
+      # - args
+      #   - 1. String <em>val</em>
+      # - return
+      #   - none
+      #
+      def debug(val = nil, &block)
+        self.fine(val, &block)
+      end
+
+      #
+      # - args
+      #   - 1. String <em>val</em>
+      # - return
+      #   - none
+      #
+      def warn(val = nil, &block)
+        self.warning(val, &block)
+      end
+
+      #
+      # - args
+      #   - 1. String <em>val</em>
+      # - return
+      #   - none
+      #
+      def error(val = nil, &block)
+        self.severe(val, &block)
+      end
+
+      #
+      # - args
+      #   - 1. String <em>val</em>
+      # - return
+      #   - none
+      #
+      def fatal(val = nil, &block)
+        self.severe(val, &block)
+      end
+
+      #
+      # - args
+      #   - 1. String <em>name</em>
+      #   - 2. String <em>val</em>
+      # - return
+      #   - none
+      #
+      def method_missing(name, val)
+        if block_given?
+          if val.nil?
+            java.util.logging.Logger.global.method(name).call(yield)
+          else
+            java.util.logging.Logger.getLogger(val.to_s).method(name).call(yield)
+          end
+        else
+          java.util.logging.Logger.global.method(name).call(val)
+        end
+      end
+    end
+  end
+end
+
+

data/lib/seasar/log/s2logger.rb

@@ -21,9 +21,8 @@ require "logger"
 module Seasar
   module Log
     class S2Logger
-      @@logger = nil
-      @@logdev = STDERR
       class << self
+        @@factory = Seasar::Log::Factory::RubyLoggerFactory
 
         #
         # - args
@@ -31,43 +30,19 @@ module Seasar
         # - return
         #   - Logger
         #
-        def get
-          if @@logger.nil?
-            @@logger = Logger.new(@@logdev)
-            @@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-          end
-          return @@logger
+        def instance
+          @@factory.create
         end
+        alias get instance
 
         #
         # - args
-        #   1. Logger <em>logger</em>
+        #   - 1. Seasar::Log::Factory <em>val</em>
         # - return
-        #   - nil
-        #
-        def set(logger = nil)
-          @@logger = logger
-        end
-
-        #
-        # - args
-        #   1. Object <em>logdev</em>
-        # - return
-        #   - nil
-        #
-        def logdev=(logdev)
-          @@logdev = logdev
-          @@logger = nil
-        end
-
-        #
-        # - args
         #   - none
-        # - return
-        #   - Logger
         #
-        def logger
-          return @@logger
+        def factory=(val)
+          @@factory = val
         end
       end
     end

data/lib/seasar/util/class-util.rb

@@ -52,6 +52,8 @@ module Seasar
           attributes = []
           method_names.each {|name|
             next if name.match(/^==+$/)
+            next if name.match(/^@/)
+            next if name.match(/^\!/)
             if name.match(/^(.+)=$/) && method_names.member?($1)
               attributes << "@#{$1}".to_sym
             end

data/test/seasar/aop/test_s2aop_factory.rb

@@ -16,6 +16,7 @@ module Seasar
       end
 
       def test_procedure_arg
+        return if RUBY_VERSION < '1.8.7'
         aspect_def = Seasar::Container::AspectDef.new(/^hoge$/) {|invocation|
             result = invocation.proceed
             next result * 10

data/test/seasar/test_log.rb

@@ -10,11 +10,29 @@ module Seasar
       end
 
       def test_logging
+        return if defined? JRUBY_VERSION
         #logger = s2logger('/tmp/a.log')
         logger = s2logger
         logger.level = Logger::DEBUG
         s2logger.debug(self) {"debug level logging"}
       end
+
+      def test_jlogger
+        return unless defined? JRUBY_VERSION
+        require 'lib/seasar/log/jlogger.rb'
+        require "java"
+        import 'java.util.logging.Level'
+
+        logger = Seasar::Log::JLogger.new
+        logger.finest("finest") {"finest"}
+        logger.finer("finer") {"finer"}
+        logger.debug("debug")
+        logger.info("info")
+        logger.warn("warn") {"warn"}
+        logger.error("error") {"error"}
+        logger.fatal("fatal") {"fatal"}
+        logger.config("config") {"config"}
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s2container
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - klove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-26 00:00:00 +09:00
+date: 2009-06-20 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -68,7 +68,11 @@ files:
 - lib/seasar/exception/notyet-implemented-exception.rb
 - lib/seasar/exception/property-notfound-runtime-exception.rb
 - lib/seasar/log/s2logger.rb
+- lib/seasar/log/factory/ruby-logger-factory.rb
+- lib/seasar/log/factory/java-logger-factory.rb
+- lib/seasar/log/jlogger.rb
 - lib/seasar/aop/interceptor/trace-interceptor.rb
+- lib/seasar/aop/s2aop-factory186.rb
 - lib/seasar/aop/method-invocation.rb
 - lib/seasar/aop/pointcut.rb
 - lib/seasar/aop/aspect.rb
@@ -80,6 +84,7 @@ files:
 - lib/seasar/util/class-util.rb
 - lib/seasar/container.rb
 - lib/seasar/dbi/dbi-interceptor.rb
+- lib/seasar/dbi/tx-interceptor.rb
 - lib/seasar/dbi/paginate.rb
 - lib/seasar/beans/instance-variable-desc.rb
 - lib/seasar/beans/attribute-accessor-desc.rb
@@ -120,6 +125,7 @@ files:
 - example/example08/example.rb
 - example/example14
 - example/example14/example.rb
+- example/example14/run6.rb
 - example/example14/run5.rb
 - example/example14/run4.rb
 - example/example14/run3.rb
@@ -133,6 +139,9 @@ files:
 - example/example01
 - example/example01/run.rb
 - example/example01/example.rb
+- example/example032
+- example/example032/run.rb
+- example/example032/example.rb
 - example/example04
 - example/example04/run.rb
 - example/example04/example.rb