svn commit: r603461 - in /ode/sandbox/singleshot: NOTICE lib/extensions.rb lib/extensions/json_request.rb vendor/plugins/

[as...@apache.org]

Author: assaf
Date: Tue Dec 11 21:23:15 2007
New Revision: 603461

URL: http://svn.apache.org/viewvc?rev=603461&view=rev
Log:
Added json_request plugin

Removed:
    ode/sandbox/singleshot/lib/extensions/json_request.rb
Modified:
    ode/sandbox/singleshot/NOTICE
    ode/sandbox/singleshot/lib/extensions.rb
    ode/sandbox/singleshot/vendor/plugins/   (props changed)

Modified: ode/sandbox/singleshot/NOTICE
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/NOTICE?rev=603461&r1=603460&r2=603461&view=diff
==============================================================================
--- ode/sandbox/singleshot/NOTICE (original)
+++ ode/sandbox/singleshot/NOTICE Tue Dec 11 21:23:15 2007
@@ -61,6 +61,30 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+Includes if_modified and json_request, copyright of Assaf Arkin.
+
+Copyright (c) 2007 Assaf Arkin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 Theme adapted from Blueprint CSS, copyright of Olav Bjorkoy, buttons plugin
 by Kevin Hale.
 

Modified: ode/sandbox/singleshot/lib/extensions.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/lib/extensions.rb?rev=603461&r1=603460&r2=603461&view=diff
==============================================================================
--- ode/sandbox/singleshot/lib/extensions.rb (original)
+++ ode/sandbox/singleshot/lib/extensions.rb Tue Dec 11 21:23:15 2007
@@ -1,9 +1,7 @@
 require File.expand_path('extensions/instance', File.dirname(__FILE__))
-require File.expand_path('extensions/json_request', File.dirname(__FILE__))
 
 ActionController::Base.class_eval do
   include ActionController::Instance
-  include ActionController::JsonRequest
 end
 
 require File.expand_path('extensions/enumerable', File.dirname(__FILE__))

Propchange: ode/sandbox/singleshot/vendor/plugins/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Dec 11 21:23:15 2007
@@ -2,3 +2,4 @@
 rspec_on_rails                svn://rubyforge.org/var/svn/rspec/trunk/rspec_on_rails
 relative_time_helpers         http://ar-code.svn.engineyard.com/plugins/relative_time_helpers
 if_modified                   https://labnotes.org/svn/public/ruby/rails_plugins/if_modified
+json_request                  https://labnotes.org/svn/public/ruby/rails_plugins/json_request