[Yanel-commits] rev 47463 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2010-02-06 15:41:00 +0100 (Sat, 06 Feb 2010)
New Revision: 47463

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
handle particular introspection requests at the beginning

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-02-05 14:15:56 UTC (rev 47462)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-02-06 14:41:00 UTC (rev 47463)
@@ -436,6 +436,14 @@
             Environment environment = getEnvironment(request, response);
             res = getResource(request, response);
             if (res != null) {
+
+                // START introspection generation
+                if (usecase != null && usecase.equals("introspection")) {
+                    sendIntrospectionAsResponse(res, doc, rootElement, request, response);
+                    return;
+                }
+                // END introspection generation
+
                 Element resourceElement = getResourceMetaData(res, doc, rootElement);
                 Element viewElement = (Element) resourceElement.appendChild(doc.createElement("view"));
                 if (ResourceAttributeHelper.hasAttributeImplemented(res, "Viewable", "1")) {
@@ -624,14 +632,6 @@
         }
         // END first try
 
-        // START introspection generation
-        if (usecase != null && usecase.equals("introspection")) {
-            sendIntrospectionAsResponse(res, doc, rootElement, request, response);
-            return;
-        }
-        // END introspection generation
-
-
         String meta = request.getParameter(RESOURCE_META_ID_PARAM_NAME);
         if (meta != null) {
             if (meta.length() > 0) {
@@ -2242,12 +2242,12 @@
     private void sendIntrospectionAsResponse(Resource res, Document doc, Element rootElement, HttpServletRequest request, HttpServletResponse response) throws ServletException {
         try {
             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);
+                response.getWriter().print(((IntrospectableV1)res).getIntrospection());
             } else {
-                String message = "Resource is not introspectable.";
+                String message = "Resource '" + res.getPath() + "' is not introspectable!";
+                log.warn(message);
                 Element exceptionElement = (Element) rootElement.appendChild(doc.createElementNS(NAMESPACE, "exception"));
                 exceptionElement.appendChild(doc.createTextNode(message));
                 setYanelOutput(request, response, doc);