From a0c48d7fa1fbc62b379c27e003557247fc1692b5 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 15 Feb 2011 10:04:06 -0800
Subject: [PATCH] 1) Rename console-common to console so that Eclipse project
 name is the same as folder name

2) Fix UTF encoding issue at servlet response
---
 console-proxy/.classpath                 | 16 ++++++++--------
 console-viewer/.classpath                | 14 +++++++-------
 console/.project                         |  2 +-
 server/src/com/cloud/api/ApiServlet.java |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/console-proxy/.classpath b/console-proxy/.classpath
index 524896c284b..b5806ca9ec6 100644
--- a/console-proxy/.classpath
+++ b/console-proxy/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/console"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/console-viewer/.classpath b/console-viewer/.classpath
index 170f58a8bbb..a17473e988d 100644
--- a/console-viewer/.classpath
+++ b/console-viewer/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/console"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/console/.project b/console/.project
index b5e281cd87c..c359a0eb4d2 100644
--- a/console/.project
+++ b/console/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>console-common</name>
+	<name>console</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index cbe5d9a5276..5ecfa759ce9 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -318,9 +318,9 @@ public class ApiServlet extends HttpServlet {
         try {
             // is text/plain sufficient for XML and JSON?
             if (BaseCmd.RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
-                resp.setContentType("text/javascript");
+                resp.setContentType("text/javascript; charset=UTF-8");
             } else {
-                resp.setContentType("text/xml");
+                resp.setContentType("text/xml; charset=UTF-8");
             }
             
             resp.setStatus(responseCode);