[Yanel-commits] rev 21182 - in public/yanel/trunk/src: core/java/org/wyona/yanel/servlet webapp/WEB-INF

michi at wyona.com michi at wyona.com
Wed Dec 27 12:39:41 CET 2006


Author: michi
Date: 2006-12-27 12:39:39 +0100 (Wed, 27 Dec 2006)
New Revision: 21182

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
   public/yanel/trunk/src/webapp/WEB-INF/web.xml
Log:
xslt path made configurable within web.xml

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	2006-12-27 11:11:50 UTC (rev 21181)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2006-12-27 11:39:39 UTC (rev 21182)
@@ -70,6 +70,8 @@
     Map map;
     Yanel yanel;
 
+    File xsltFile;
+
     private static String IDENTITY_KEY = "identity";
 
     private static final String METHOD_PROPFIND = "PROPFIND";
@@ -85,6 +87,8 @@
      */
     public void init(ServletConfig config) throws ServletException {
         this.config = config;
+
+        xsltFile = org.wyona.commons.io.FileUtil.file(config.getServletContext().getRealPath("/"), config.getInitParameter("exception-and-info-screen-xslt"));
         
         try {
             yanel = Yanel.getInstance();
@@ -295,7 +299,7 @@
                         sizeElement.appendChild(doc.createTextNode(String.valueOf(size)));
                         view = ((ViewableV2) res).getView(viewId);
                     } else {
-                         Element noViewElement = (Element) resourceElement.appendChild(doc.createElement("no-view"));
+                         Element noViewElement = (Element) resourceElement.appendChild(doc.createElement("not-viewable"));
                          noViewElement.appendChild(doc.createTextNode(res.getClass().getName() + " is not viewable!"));
                     }
                     if (ResourceAttributeHelper.hasAttributeImplemented(res, "Modifiable", "2")) {
@@ -315,8 +319,12 @@
                                     Element revisionElement = (Element) revisionsElement.appendChild(doc.createElement("revision"));
                                     revisionElement.appendChild(doc.createTextNode(revisions[i]));
                                 }
+                            } else {
+                                Element noRevisionsYetElement = (Element) resourceElement.appendChild(doc.createElement("no-revisions-yet"));
                             }
                         }
+                    } else {
+                        Element notVersionableElement = (Element) resourceElement.appendChild(doc.createElement("not-versionable"));
                     }
                 } else {
                         Element resourceIsNullElement = (Element) rootElement.appendChild(doc.createElement("resource-is-null"));
@@ -1225,7 +1233,6 @@
                 out.close();
             } else {
                 response.setContentType("application/xhtml+xml");
-                File xsltFile = org.wyona.commons.io.FileUtil.file(config.getServletContext().getRealPath("/"), "xslt" + File.separator + "xmlInfo2xhtml.xsl");
                 Transformer transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(xsltFile));
                 transformer.transform(new javax.xml.transform.dom.DOMSource(doc), new javax.xml.transform.stream.StreamResult(response.getWriter()));
             }

Modified: public/yanel/trunk/src/webapp/WEB-INF/web.xml
===================================================================
--- public/yanel/trunk/src/webapp/WEB-INF/web.xml	2006-12-27 11:11:50 UTC (rev 21181)
+++ public/yanel/trunk/src/webapp/WEB-INF/web.xml	2006-12-27 11:39:39 UTC (rev 21182)
@@ -19,6 +19,11 @@
   <servlet>
     <servlet-name>YanelServlet</servlet-name>
     <servlet-class>org.wyona.yanel.servlet.YanelServlet</servlet-class>
+
+    <init-param>
+      <param-name>exception-and-info-screen-xslt</param-name>
+      <param-value>xslt/xmlInfo2xhtml.xsl</param-value>
+    </init-param>
   </servlet>
 
   <servlet-mapping>




More information about the Yanel-commits mailing list