MONDRIAN:

* Update web.xml to new servlet class name
* Refactor according to Richard's suggestion

[git-p4: depot-paths = "//open/mondrian/": change = 4937]

src/main/mondrian/xmla/impl/DefaultXmlaServlet.java

@@ -46,18 +46,21 @@
 public class DefaultXmlaServlet extends XmlaServlet {
 
     private static final Logger LOGGER = Logger.getLogger(DefaultXmlaServlet.class);
-    private static final String EOL = System.getProperty("line.separator", "\n");
+    protected static final String EOL = System.getProperty("line.separator", "\n");
 
     private DocumentBuilderFactory domFactory = null;
 
     public void init(ServletConfig servletConfig) throws ServletException {
         super.init(servletConfig);
+        domFactory = getDocumentBuilderFactory();
+    }
 
-        // init: domFactory
-        domFactory = DocumentBuilderFactory.newInstance();
-        domFactory.setIgnoringComments(true);
-        domFactory.setIgnoringElementContentWhitespace(true);
-        domFactory.setNamespaceAware(true);
+    protected DocumentBuilderFactory getDocumentBuilderFactory() {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setIgnoringComments(true);
+        factory.setIgnoringElementContentWhitespace(true);
+        factory.setNamespaceAware(true);
+        return factory;
     }
 
     protected Element[] unmarshallSoapMessage(InputStream inputStream) throws Exception {

webapp/WEB-INF/web.xml

@@ -40,7 +40,7 @@ You must accept the terms of that agreement to use this software.
 
   <servlet>
     <servlet-name>MondrianXmlaServlet</servlet-name>
-    <servlet-class>mondrian.xmla.XmlaServlet</servlet-class>
+    <servlet-class>mondrian.xmla.impl.DefaultXmlaServlet</servlet-class>
 	<init-param>
 	  <param-name>DataSourcesConfig</param-name>
 	  <param-value>datasources.xml</param-value>