wam 2002/10/09 07:15:26
Modified: src/webdav/server/org/apache/slide/webdav/method
SearchMethod.java
Log:
use TEXT_XML_UTF_8 instead of TEXT_XML (as contenttype)
Revision Changes Path
1.29 +11 -11
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java
Index: SearchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SearchMethod.java 16 Sep 2002 12:26:23 -0000 1.28
+++ SearchMethod.java 9 Oct 2002 14:15:25 -0000 1.29
@@ -198,28 +198,28 @@
}
catch (JDOMException e) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_BAD_QUERY,
e.getMessage());
throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
}
catch (InvalidQueryException e) {
resp.setStatus(WebdavStatus.SC_UNPROCESSABLE_ENTITY);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_UNPROCESSABLE_ENTITY,
e.getMessage());
throw new WebdavException(WebdavStatus.SC_UNPROCESSABLE_ENTITY);
}
catch (BadGatewayException e) {
resp.setStatus(WebdavStatus.SC_BAD_GATEWAY);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_BAD_GATEWAY,
e.getMessage());
throw new WebdavException(WebdavStatus.SC_BAD_GATEWAY);
}
catch (InvalidScopeException e) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_INVALID_SCOPE,
e.getMessage());
@@ -227,7 +227,7 @@
}
catch (BadQueryException e) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_BAD_QUERY,
e.getMessage());
throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
@@ -242,13 +242,13 @@
String msg = ade.getMessage();
resp.setStatus(WebdavStatus.SC_FORBIDDEN);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_FORBIDDEN, msg);
throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
}
catch (ObjectNotFoundException e) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_INVALID_SCOPE,
"scope " + slidePath + " is invalid");
@@ -260,7 +260,7 @@
}
else {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- resp.setContentType (TEXT_XML);
+ resp.setContentType (TEXT_XML_UTF_8);
createErrorResult (SearchQueryResult.STATUS_BAD_QUERY, "SEARCH not
implemented on this server");
throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
