Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EAACAE049 for ; Wed, 27 Feb 2013 14:24:09 +0000 (UTC) Received: (qmail 90027 invoked by uid 500); 27 Feb 2013 14:24:09 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 90010 invoked by uid 500); 27 Feb 2013 14:24:09 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Received: (qmail 90002 invoked by uid 99); 27 Feb 2013 14:24:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2013 14:24:09 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of mfojtik@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2013 14:24:02 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1RENeph022951 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 27 Feb 2013 09:23:40 -0500 Received: from boosh.local.com (dhcp-29-236.brq.redhat.com [10.34.29.236]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r1RENckK012459 for ; Wed, 27 Feb 2013 09:23:40 -0500 From: mfojtik@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH core 2/3] Core: Fixed Rabbit namespacing issues with Addresses (DTACLOUD-500) Date: Wed, 27 Feb 2013 15:23:35 +0100 Message-Id: <1361975016-12592-2-git-send-email-mfojtik@redhat.com> In-Reply-To: <1361975016-12592-1-git-send-email-mfojtik@redhat.com> References: <1361975016-12592-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-Virus-Checked: Checked by ClamAV on apache.org From: Michal Fojtik NOTE: A sinatra-rabbit >= 1.15 is required to make this work and to fix the bug. Signed-off-by: Michal fojtik --- server/deltacloud-core.gemspec | 2 +- server/lib/cimi/collections/base.rb | 4 ++++ server/lib/deltacloud/collections/base.rb | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec index a8ecce0..d52c970 100644 --- a/server/deltacloud-core.gemspec +++ b/server/deltacloud-core.gemspec @@ -70,7 +70,7 @@ Gem::Specification.new do |s| s.add_dependency('rake', '>= 0.8.7') s.add_dependency('haml', '>= 2.2.17') s.add_dependency('sinatra', '>= 1.3.0') - s.add_dependency('sinatra-rabbit', '>= 1.0.11') + s.add_dependency('sinatra-rabbit', '>= 1.1.5') s.add_dependency('rack', '>= 1.0.0') s.add_dependency('rack-accept') s.add_dependency('json_pure', '>= 1.5.0') diff --git a/server/lib/cimi/collections/base.rb b/server/lib/cimi/collections/base.rb index cf92143..eac1c70 100644 --- a/server/lib/cimi/collections/base.rb +++ b/server/lib/cimi/collections/base.rb @@ -18,6 +18,10 @@ require_relative '../models' module CIMI::Collections class Base < Sinatra::Base + Sinatra::Rabbit.configure do + enable :use_namespace + end + include Sinatra::Rabbit include Sinatra::Rabbit::Features include CIMI::Model diff --git a/server/lib/deltacloud/collections/base.rb b/server/lib/deltacloud/collections/base.rb index fe8ba2b..e6d7333 100644 --- a/server/lib/deltacloud/collections/base.rb +++ b/server/lib/deltacloud/collections/base.rb @@ -16,6 +16,10 @@ module Deltacloud::Collections class Base < Sinatra::Base + Sinatra::Rabbit.configure do + enable :use_namespace + end + include Sinatra::Rabbit include Sinatra::Rabbit::Features -- 1.8.1.2