From 9a4f5f90a29b4027e1c7bb4c2da2c01d477afc5c Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 30 Apr 2012 16:19:15 -0700
Subject: [PATCH] Fix error from merge

---
 api/src/com/cloud/api/ApiConstants.java         |  2 +-
 awsapi/.project                                 | 17 +++++++++++++++++
 server/src/com/cloud/api/ApiResponseHelper.java |  3 ++-
 utils/conf/log4j-vmops.xml                      |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 awsapi/.project

diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java
index 8bccbbccfd3..19d3b4ff125 100755
--- a/api/src/com/cloud/api/ApiConstants.java
+++ b/api/src/com/cloud/api/ApiConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Copyright 2012 Citrix Systems, Inc. Licensed under the
 // Apache License, Version 2.0 (the "License"); you may not use this
 // file except in compliance with the License.  Citrix Systems, Inc.
 // reserves all rights not expressly granted by the License.
diff --git a/awsapi/.project b/awsapi/.project
new file mode 100644
index 00000000000..8bce14ddc45
--- /dev/null
+++ b/awsapi/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>awsapi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 2cbcb5763eb..a230f808021 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Copyright 2012 Citrix Systems, Inc. Licensed under the
 // Apache License, Version 2.0 (the "License"); you may not use this
 // file except in compliance with the License.  Citrix Systems, Inc.
 // reserves all rights not expressly granted by the License.
@@ -240,6 +240,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         accountResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName());
         accountResponse.setState(account.getState().toString());
         accountResponse.setNetworkDomain(account.getNetworkDomain());
+        accountResponse.setDefaultZone(account.getDefaultZoneId());
 
         // get network stat
         List<UserStatisticsVO> stats = ApiDBUtils.listUserStatsBy(account.getId());
diff --git a/utils/conf/log4j-vmops.xml b/utils/conf/log4j-vmops.xml
index 2d13ef52dbf..0ac6083d512 100644
--- a/utils/conf/log4j-vmops.xml
+++ b/utils/conf/log4j-vmops.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">