mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
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
This commit is contained in:
parent
cabaa51247
commit
a0c48d7fa1
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/console"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/console"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<projectDescription>
|
<projectDescription>
|
||||||
<name>console-common</name>
|
<name>console</name>
|
||||||
<comment></comment>
|
<comment></comment>
|
||||||
<projects>
|
<projects>
|
||||||
</projects>
|
</projects>
|
||||||
|
|||||||
@ -318,9 +318,9 @@ public class ApiServlet extends HttpServlet {
|
|||||||
try {
|
try {
|
||||||
// is text/plain sufficient for XML and JSON?
|
// is text/plain sufficient for XML and JSON?
|
||||||
if (BaseCmd.RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
|
if (BaseCmd.RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
|
||||||
resp.setContentType("text/javascript");
|
resp.setContentType("text/javascript; charset=UTF-8");
|
||||||
} else {
|
} else {
|
||||||
resp.setContentType("text/xml");
|
resp.setContentType("text/xml; charset=UTF-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.setStatus(responseCode);
|
resp.setStatus(responseCode);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user