[Yanel-commits] rev 21961 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2007-01-21 09:39:05 +0100 (Sun, 21 Jan 2007)
New Revision: 21961

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
descriptor elements added

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-01-21 08:38:26 UTC (rev 21960)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-01-21 08:39:05 UTC (rev 21961)
@@ -269,9 +269,12 @@
             rtiElement.setAttribute("local-name",  rtd.getResourceTypeLocalName());
 
             try {
+/*
                 HttpRequest httpRequest = new HttpRequest(request);
                 HttpResponse httpResponse = new HttpResponse(response);
                 res = yanel.getResourceManager().getResource(httpRequest, httpResponse, realm, path, rtd, rti);
+*/
+                res = getResource(request, response);
                 if (res != null) {
 
                     Element resourceElement = (Element) rootElement.appendChild(doc.createElement("resource"));
@@ -313,7 +316,9 @@
                         ViewDescriptor[] vd = ((ViewableV2) res).getViewDescriptors();
                         if (vd != null) {
                             for (int i = 0; i < vd.length; i++) {
-                                viewElement.appendChild(doc.createTextNode("View Descriptor: " + vd[i].getMimeType()));
+                                Element descriptorElement = (Element) viewElement.appendChild(doc.createElement("descriptor"));
+                                descriptorElement.appendChild(doc.createTextNode(vd[i].getMimeType()));
+                                descriptorElement.setAttributeNS(NAMESPACE, "id", vd[i].getId());
                             }
                         } else {
                             viewElement.appendChild(doc.createTextNode("No View Descriptors!"));