[Yanel-commits] rev 48308 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2010-03-26 10:34:35 +0100 (Fri, 26 Mar 2010)
New Revision: 48308

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
Log:
logging improved, formatting and javadoc

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2010-03-26 09:31:03 UTC (rev 48307)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2010-03-26 09:34:35 UTC (rev 48308)
@@ -232,6 +232,7 @@
             view.setInputStream(getTransformedInputStream(xmlInputStream, viewDescriptor, errorWriter));
             return view;
         } catch(Exception e) {
+            log.error(e, e);
             log.error(e + " (" + getPath() + ", " + getRealm() + ")", e);
             String errorMsg;
             String transformationError = errorWriter.toString();
@@ -245,13 +246,18 @@
         }
     }
 
+    /**
+     * @param xmlInputStream XML as input stream
+     */
     private InputStream getTransformedInputStream(InputStream xmlInputStream, ConfigurableViewDescriptor viewDescriptor, StringWriter errorWriter) throws Exception {
-            // create reader:
-            XMLReader xmlReader = XMLReaderFactory.createXMLReader();
-            CatalogResolver catalogResolver = new CatalogResolver();
-            xmlReader.setEntityResolver(catalogResolver);
-            xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+        //log.debug("View descriptor: " + viewDescriptor.getId());
 
+        // create reader:
+        XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+        CatalogResolver catalogResolver = new CatalogResolver();
+        xmlReader.setEntityResolver(catalogResolver);
+        xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+
             SourceResolver uriResolver = new SourceResolver(this);
             ListingErrorHandler errorListener = new ListingErrorHandler(new PrintWriter(errorWriter));
 
@@ -347,7 +353,11 @@
 
             if (MimeTypeUtil.isHTML(mimeType) && !MimeTypeUtil.isXML(mimeType)) {
                 serializer = SerializerFactory.getSerializer(SerializerFactory.HTML_TRANSITIONAL);
-            } else if (MimeTypeUtil.isHTML(mimeType) && MimeTypeUtil.isXML(mimeType)){
+/* TODO: Implement XHTML_TRANSITIONAL
+            } else if (MimeTypeUtil.isHTML(mimeType) && MimeTypeUtil.isXML(mimeType)) { // TODO: ...
+                serializer = SerializerFactory.getSerializer(SerializerFactory.XHTML_TRANSITIONAL);
+*/
+            } else if (MimeTypeUtil.isHTML(mimeType) && MimeTypeUtil.isXML(mimeType)) {
                 serializer = SerializerFactory.getSerializer(SerializerFactory.XHTML_STRICT);
             } else if (MimeTypeUtil.isXML(mimeType)) {
                 serializer = SerializerFactory.getSerializer(SerializerFactory.XML);