From e41729cc43a94fd248479baf2acd6862f8f67c9a Mon Sep 17 00:00:00 2001 From: edison Date: Sat, 16 Oct 2010 01:03:31 -0700 Subject: [PATCH] fix rpm build --- deps/wscript_build | 2 +- server/src/com/cloud/api/commands/ListIsosCmd.java | 8 ++++---- .../com/cloud/api/commands/ListResourceLimitsCmd.java | 10 +++++----- .../src/com/cloud/api/commands/ListTemplatesCmd.java | 8 ++++---- .../com/cloud/api/commands/UpdateResourceLimitCmd.java | 10 +++++----- .../src/com/cloud/api/response/AsyncJobResponse.java | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deps/wscript_build b/deps/wscript_build index 11697814dd0..be03a261cbc 100644 --- a/deps/wscript_build +++ b/deps/wscript_build @@ -1 +1 @@ -bld.install_files('${JAVADIR}','*.jar') +bld.install_files('${JAVADIR}',bld.path.ant_glob("*.jar", excl=["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar", "cloud-commons-httpclient-3.1.jar", "cloud-commons-pool-1.4.jar", "cloud-servlet-api.jar"])) diff --git a/server/src/com/cloud/api/commands/ListIsosCmd.java b/server/src/com/cloud/api/commands/ListIsosCmd.java index c225cd1cc1f..e3b1a0e4326 100644 --- a/server/src/com/cloud/api/commands/ListIsosCmd.java +++ b/server/src/com/cloud/api/commands/ListIsosCmd.java @@ -74,10 +74,10 @@ public class ListIsosCmd extends BaseListCmd { private Boolean ready; @Parameter(name="isofilter", type=CommandType.STRING, description="possible values are \"featured\", \"self\", \"self-executable\",\"executable\", and \"community\". " + - "* featured—ISOs that are featured and are publicself—ISOs that have been registered/created by the owner. " + - "* selfexecutable— ISOs that have been registered/created by the owner that can be used to deploy a new VM. " + - "* executable— all ISOs that can be used to deploy a new VM " + - "* community—ISOs that are public.") + "* featured-ISOs that are featured and are publicself-ISOs that have been registered/created by the owner. " + + "* selfexecutable-ISOs that have been registered/created by the owner that can be used to deploy a new VM. " + + "* executable-all ISOs that can be used to deploy a new VM " + + "* community-ISOs that are public.") private String isoFilter = TemplateFilter.selfexecutable.toString(); @Parameter(name="name", type=CommandType.STRING, description="list all isos by name") diff --git a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java index a71cafd84c2..fa204e323ad 100644 --- a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java +++ b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java @@ -52,11 +52,11 @@ public class ListResourceLimitsCmd extends BaseListCmd { @Parameter(name="id", type=CommandType.LONG, description="Lists resource limits by ID.") private Long id; - @Parameter(name="resourcetype", type=CommandType.INTEGER, required=true, description="Type of resource to update. Values are 0, 1, 2, 3, and 4. 0 — Instance. Number of instances a user can create. " + - "1 — IP. Number of public IP addresses a user can own. " + - "2 — Volume. Number of disk volumes a user can create." + - "3 — Snapshot. Number of snapshots a user can create." + - "4 — Template. Number of templates that a user can register/create.") + @Parameter(name="resourcetype", type=CommandType.INTEGER, required=true, description="Type of resource to update. Values are 0, 1, 2, 3, and 4. 0 - Instance. Number of instances a user can create. " + + "1 - IP. Number of public IP addresses a user can own. " + + "2 - Volume. Number of disk volumes a user can create." + + "3 - Snapshot. Number of snapshots a user can create." + + "4 - Template. Number of templates that a user can register/create.") private Integer resourceType; ///////////////////////////////////////////////////// diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index 5ee06985563..629d0447d79 100644 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -67,10 +67,10 @@ public class ListTemplatesCmd extends BaseListCmd { private String templateName; @Parameter(name="templatefilter", type=CommandType.STRING, required=true, description="possible values are \"featured\", \"self\", \"self-executable\", \"executable\", and \"community\"." + - "* featured—templates that are featured and are public" + - "* self—templates that have been registered/created by the owner" + - "* selfexecutable— templates that have been registered/created by the owner that can be used to deploy a new VM" + - "* executable— all templates that can be used to deploy a new VM* community—templates that are public.") + "* featured-templates that are featured and are public" + + "* self-templates that have been registered/created by the owner" + + "* selfexecutable-templates that have been registered/created by the owner that can be used to deploy a new VM" + + "* executable-all templates that can be used to deploy a new VM* community-templates that are public.") private String templateFilter; @Parameter(name="zoneid", type=CommandType.LONG, description="list templates by zoneId") diff --git a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java index 28ed292bf76..361b66f2cd9 100644 --- a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java +++ b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java @@ -49,11 +49,11 @@ public class UpdateResourceLimitCmd extends BaseCmd { @Parameter(name="max", type=CommandType.LONG, description=" Maximum resource limit.") private Long max; - @Parameter(name="resourcetype", type=CommandType.INTEGER, required=true, description="Type of resource to update. Values are 0, 1, 2, 3, and 4. 0 — Instance. Number of instances a user can create. " + - "1 — IP. Number of public IP addresses a user can own. " + - "2 — Volume. Number of disk volumes a user can create." + - "3 — Snapshot. Number of snapshots a user can create." + - "4 — Template. Number of templates that a user can register/create.") + @Parameter(name="resourcetype", type=CommandType.INTEGER, required=true, description="Type of resource to update. Values are 0, 1, 2, 3, and 4. 0 - Instance. Number of instances a user can create. " + + "1 - IP. Number of public IP addresses a user can own. " + + "2 - Volume. Number of disk volumes a user can create." + + "3 - Snapshot. Number of snapshots a user can create." + + "4 - Template. Number of templates that a user can register/create.") private Integer resourceType; ///////////////////////////////////////////////////// diff --git a/server/src/com/cloud/api/response/AsyncJobResponse.java b/server/src/com/cloud/api/response/AsyncJobResponse.java index e9653f10465..4f299e325ee 100644 --- a/server/src/com/cloud/api/response/AsyncJobResponse.java +++ b/server/src/com/cloud/api/response/AsyncJobResponse.java @@ -36,7 +36,7 @@ public class AsyncJobResponse extends BaseResponse { @SerializedName("cmd") @Param(description="the async command executed") private String cmd; - @SerializedName("jobstatus") @Param(description="the current job status—should be 0 for PENDING") + @SerializedName("jobstatus") @Param(description="the current job status-should be 0 for PENDING") private Integer jobStatus; @SerializedName("jobprocstatus") @Param(description="the progress information of the PENDING job")