[Yanel-commits] rev 23569 -
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet
michi at wyona.com
michi at wyona.com
Mon Apr 2 21:49:22 CEST 2007
Author: michi
Date: 2007-04-02 21:49:21 +0200 (Mon, 02 Apr 2007)
New Revision: 23569
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
mime type of introspection document fixed and formatting fixed and error message fixed
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-02 19:44:52 UTC (rev 23568)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-02 19:49:21 UTC (rev 23569)
@@ -511,22 +511,27 @@
// TODO: Move this introspection generation somewhere else ...
try {
- if (usecase != null && usecase.equals("introspection")) {
- if (ResourceAttributeHelper.hasAttributeImplemented(res, "Introspectable", "1")) {
- String introspection = ((IntrospectableV1)res).getIntrospection();
- response.setContentType("application/neutron+xml");
- response.setStatus(javax.servlet.http.HttpServletResponse.SC_OK);
- response.getWriter().print(introspection);
- } else {
- String message = "Resource is not introspectable.";
- Element exceptionElement = (Element) rootElement.appendChild(doc.createElementNS(NAMESPACE, "exception"));
- exceptionElement.appendChild(doc.createTextNode(message));
- setYanelOutput(request, response, doc);
- }
- return;
+ if (usecase != null && usecase.equals("introspection")) {
+ if (ResourceAttributeHelper.hasAttributeImplemented(res, "Introspectable", "1")) {
+ String introspection = ((IntrospectableV1)res).getIntrospection();
+ response.setContentType("application/xml");
+ response.setStatus(javax.servlet.http.HttpServletResponse.SC_OK);
+ response.getWriter().print(introspection);
+ } else {
+ String message = "Resource is not introspectable.";
+ Element exceptionElement = (Element) rootElement.appendChild(doc.createElementNS(NAMESPACE, "exception"));
+ exceptionElement.appendChild(doc.createTextNode(message));
+ setYanelOutput(request, response, doc);
}
+ return;
+ }
} catch(Exception e) {
log.error(e.getMessage(), e);
+ Element exceptionElement = (Element) rootElement.appendChild(doc.createElement("exception"));
+ exceptionElement.appendChild(doc.createTextNode(e.getMessage()));
+ response.setStatus(javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ setYanelOutput(request, response, doc);
+ return;
}
More information about the Yanel-commits
mailing list