torquebox-cache 2.0.0.beta1-java → 2.0.0.beta2-java

data/lib/active_support/cache/torque_box_store.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/cache.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
@@ -94,6 +94,7 @@ module TorqueBox
       end
 
       def initialize(opts = {})
+        return nothing unless INFINISPAN_AVAILABLE
         @options = opts
         options[:transaction_mode] = :transactional unless options.has_key?( :transaction_mode )
         options[:locking_mode] ||= :optimistic if (transactional? && !options.has_key?( :locking_mode ))
@@ -364,9 +365,13 @@ module TorqueBox
         if options[:index]
           log( "Configuring #{name} local cache for local-only indexing" )
           config.indexing.index_local_only(true)
+        else
+          log( "Configuring #{name} local cache with no indexing" )
+          config.indexing.disable
         end
 
         if ((local_manager = Cache.find_local_manager(name)) == nil)
+          log( "No local CacheManager exists for #{name}. Creating one." )
           local_manager = org.infinispan.manager.DefaultCacheManager.new
           local_manager.define_configuration( name, config.build )
           Cache.local_managers << local_manager

data/lib/cache_listener.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/datamapper/dm-infinispan-adapter.rb

@@ -1,18 +1,20 @@
-#
-# Copyright 2011 Red Hat, Inc.
-#
-# 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.
-#
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
 require "digest/sha1"
 require 'dm-core'
 require 'cache'
@@ -53,7 +55,6 @@ module DataMapper::Adapters
     end
 
     def read( query )
-      records = []
       query.filter_records(@search.search( query ))
     end
 

data/lib/datamapper/model.rb

@@ -1,18 +1,20 @@
-#
-# Copyright 2011 Red Hat, Inc.
-#
-# 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.
-#
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
 require 'dm-serializer'
 require 'jruby/core_ext'
 require 'json'

data/lib/datamapper/search.rb

@@ -1,18 +1,19 @@
-#
-# Copyright 2011 Red Hat, Inc.
-#
-# 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.
-#
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 module Infinispan
 

data/lib/dm-infinispan-adapter.rb

@@ -1 +1,18 @@
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
 require 'datamapper/dm-infinispan-adapter'

data/lib/gem_hook.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox-cache.rb

@@ -1,6 +1,6 @@
 module TorqueboxCache
-  VERSION = '2.0.0.beta1'
-  MAVEN_VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.beta2'
+  MAVEN_VERSION = '2.0.0.beta2'
 end
 begin
   require 'java'

data/spec/dm-infinispan-adapter_spec.rb

@@ -339,8 +339,8 @@ describe DataMapper::Adapters::InfinispanAdapter do
     end
 
     after :all do
-      #FileUtils.rm_rf( @configured_dir )
-      #FileUtils.rm_rf( @default_dir )
+      FileUtils.rm_rf( @configured_dir )
+      FileUtils.rm_rf( @default_dir )
       FileUtils.rm_rf( @snuffy )
     end
 

metadata

@@ -2,7 +2,7 @@
 name: torquebox-cache
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -42,7 +42,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta1
+            version: 2.0.0.beta2
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta1
+            version: 2.0.0.beta2
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency