apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix rpm build

Browse Source
This commit is contained in:
edison 2010-10-16 01:03:31 -07:00
parent ef600e10b5
commit e41729cc43
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/wscript_build vendored
View File

@ -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"]))

8
server/src/com/cloud/api/commands/ListIsosCmd.java
View File

@ -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")

10
server/src/com/cloud/api/commands/ListResourceLimitsCmd.java
View File

@ -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;
/////////////////////////////////////////////////////

8
server/src/com/cloud/api/commands/ListTemplatesCmd.java
View File

@ -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")

10
server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java
View File

@ -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;
/////////////////////////////////////////////////////

2
server/src/com/cloud/api/response/AsyncJobResponse.java
View File

@ -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")