Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08332E581 for ; Sat, 26 Jan 2013 16:21:55 +0000 (UTC) Received: (qmail 5965 invoked by uid 500); 26 Jan 2013 16:21:51 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 4841 invoked by uid 500); 26 Jan 2013 16:21:48 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 1471 invoked by uid 99); 26 Jan 2013 16:21:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 16:21:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD87B825E30; Sat, 26 Jan 2013 16:21:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/50] [abbrv] git commit: api: Fix correct annotation value in template cmds for template id Message-Id: <20130126162139.CD87B825E30@tyr.zones.apache.org> Date: Sat, 26 Jan 2013 16:21:39 +0000 (UTC) api: Fix correct annotation value in template cmds for template id Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ec0c6b00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ec0c6b00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ec0c6b00 Branch: refs/heads/marvin-refactor-phase1 Commit: ec0c6b00b4a663af08527990bb019c239fcb2816 Parents: 9e91584 Author: Rohit Yadav Authored: Wed Jan 23 16:00:39 2013 -0800 Committer: Rohit Yadav Committed: Wed Jan 23 16:00:39 2013 -0800 ---------------------------------------------------------------------- .../command/user/template/DeleteTemplateCmd.java | 4 ++-- .../command/user/template/ExtractTemplateCmd.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ec0c6b00/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java index 8ee3041..12359bf 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java @@ -17,7 +17,7 @@ package org.apache.cloudstack.api.command.user.template; import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; @@ -38,7 +38,7 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = UserVmResponse.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = TemplateResponse.class, required=true, description="the ID of the template") private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ec0c6b00/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java index 54f3e37..8b4e809 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java @@ -17,7 +17,7 @@ package org.apache.cloudstack.api.command.user.template; import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; @@ -40,7 +40,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = UserVmResponse.class, + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = TemplateResponse.class, required=true, description="the ID of the template") private Long id;