etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-29 13:46:14 -07:00
parent 4a84ff7ee1 88dac13bb0
commit 6134565436
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/BaseCmd.java
View File

@ -113,7 +113,7 @@ public abstract class BaseCmd {
_responseObject = responseObject;
}
public String getDateString(Date date) {
public static String getDateString(Date date) {
if (date == null) {
return "";
}

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

@ -33,6 +33,7 @@ import com.cloud.async.AsyncJobVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.host.HostVO;
import com.cloud.storage.GuestOS;
import com.cloud.storage.Storage;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.VMTemplateVO;
@ -152,9 +153,7 @@ public class ListTemplatesCmd extends BaseListCmd {
List<TemplateResponse> templateResponses = new ArrayList<TemplateResponse>();
for (VMTemplateVO template : templates) {
// Since we've added multiple domR templates and with different DB ids, I'm changing
// this to filter out any templates with names that start with system for now.
if (!showDomr && template.getName().startsWith("SystemVM")) {
if (!showDomr && template.getTemplateType() == Storage.TemplateType.SYSTEM) {
continue;
}

5
server/src/com/cloud/api/response/ApiResponseSerializer.java
View File

@ -4,6 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Date;
import java.util.List;
import org.apache.log4j.Logger;
@ -28,7 +29,7 @@ public class ApiResponseSerializer {
private static String toJSONSerializedString(ResponseObject result) {
if (result != null) {
Gson gson = GsonHelper.getBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).create();
Gson gson = GsonHelper.getBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").create();
StringBuilder sb = new StringBuilder();
sb.append("{ \"" + result.getResponseName() + "\" : ");
@ -133,6 +134,8 @@ public class ApiResponseSerializer {
if (fieldValue instanceof ResponseObject) {
ResponseObject subObj = (ResponseObject)fieldValue;
serializeResponseObjXML(sb, subObj);
} else if (fieldValue instanceof Date) {
sb.append("<" + serializedName.value() + ">" + BaseCmd.getDateString((Date)fieldValue) + "</" + serializedName.value() + ">");
} else {
sb.append("<" + serializedName.value() + ">" + fieldValue.toString() + "</" + serializedName.value() + ">");
}