From de4f781a2be3f6ba33bc778173c29761893fcfdb Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Thu, 27 Mar 2014 11:00:00 +0100
Subject: [PATCH] Dav4rack sources replaces with correspondig gem

---
 lib/redmine_dmsf.rb                       | 13 +++++--------
 lib/redmine_dmsf/vendored_dav4rack.rb     | 21 ---------------------
 lib/redmine_dmsf/webdav/base_resource.rb  |  2 ++
 lib/redmine_dmsf/webdav/controller.rb     |  2 ++
 lib/redmine_dmsf/webdav/resource_proxy.rb |  2 ++
 5 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 lib/redmine_dmsf/vendored_dav4rack.rb

diff --git a/lib/redmine_dmsf.rb b/lib/redmine_dmsf.rb
index ae1a483c..4c6d70eb 100644
--- a/lib/redmine_dmsf.rb
+++ b/lib/redmine_dmsf.rb
@@ -1,8 +1,8 @@
 # Redmine plugin for Document Management System "Features"
 #
-# Copyright (C) 2011   Vít Jonáš <vit.jonas@gmail.com>
-# Copyright (C) 2012   Daniel Munn <dan.munn@munnster.co.uk>
-# Copyright (C) 2013   Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright (C) 2012    Daniel Munn <dan.munn@munnster.co.uk>
+# Copyright (C) 2011-14 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -20,9 +20,6 @@
 
 DMSF_MAX_NOTIFICATION_RECEIVERS_INFO = 10
 
-# Vendor
-require 'redmine_dmsf/vendored_dav4rack'
-
 # DMSF libraries
 require 'redmine_dmsf/patches' #plugin patches
 require 'redmine_dmsf/webdav' #DAV4Rack implementation
@@ -35,5 +32,5 @@ require 'redmine_dmsf/hooks/base_view_hooks'
 module RedmineDmsf
 end
 
-# Add plugin's view folder into ActionMailer's paths to search
-ActionMailer::Base.append_view_path(File.expand_path(File.dirname(__FILE__) + '/../app/views'))
+# Add the plugin view folder into ActionMailer's paths to search
+ActionMailer::Base.append_view_path(File.expand_path(File.dirname(__FILE__) + '/../app/views'))
\ No newline at end of file
diff --git a/lib/redmine_dmsf/vendored_dav4rack.rb b/lib/redmine_dmsf/vendored_dav4rack.rb
deleted file mode 100644
index 84fdb927..00000000
--- a/lib/redmine_dmsf/vendored_dav4rack.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Redmine plugin for Document Management System "Features"
-#
-# Copyright (C) 2012   Daniel Munn <dan.munn@munnster.co.uk>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-vendor = File.expand_path('../vendor', __FILE__)
-$:.unshift(vendor) unless $:.include?(vendor)
-require 'dav4rack'
diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb
index 99a459d8..5340c226 100644
--- a/lib/redmine_dmsf/webdav/base_resource.rb
+++ b/lib/redmine_dmsf/webdav/base_resource.rb
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'dav4rack'
+
 module RedmineDmsf
   module Webdav
     class BaseResource < DAV4Rack::Resource
diff --git a/lib/redmine_dmsf/webdav/controller.rb b/lib/redmine_dmsf/webdav/controller.rb
index 890c9b36..73b8387e 100644
--- a/lib/redmine_dmsf/webdav/controller.rb
+++ b/lib/redmine_dmsf/webdav/controller.rb
@@ -17,6 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'dav4rack'
+
 module RedmineDmsf
   module Webdav
     class Controller < DAV4Rack::Controller
diff --git a/lib/redmine_dmsf/webdav/resource_proxy.rb b/lib/redmine_dmsf/webdav/resource_proxy.rb
index 50ca06c5..82c50d07 100644
--- a/lib/redmine_dmsf/webdav/resource_proxy.rb
+++ b/lib/redmine_dmsf/webdav/resource_proxy.rb
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'dav4rack'
+
 module RedmineDmsf
   module Webdav