Changes related to new datasources.xml format

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

demo/derby/datasources.xml

@@ -1,15 +1,99 @@
 <?xml version="1.0"?>
+<!--
+  == $Id$
+  == This software is subject to the terms of the Common Public License
+  == Agreement, available at the following URL:
+  == http://www.opensource.org/licenses/cpl.html.
+  == (C) Copyright 2005-2006 Julian Hyde and others.
+  == All Rights Reserved.
+  == You must accept the terms of that agreement to use this software.
+  -->
 <DataSources>
-	<DataSource>
-		<DataSourceName>MondrianFoodMart;</DataSourceName>
-		<DataSourceDescription>FoodMart 2000 Data Warehouse</DataSourceDescription>
-		<URL>http://localhost:8080/mondrian-embedded/xmla</URL>
-		<DataSourceInfo>Provider=mondrian;Jdbc='jdbc:derby:classpath:/foodmart';JdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver;JdbcUser=sa;JdbcPassword=sa;PoolNeeded=false;</DataSourceInfo>
-		<Catalogs>
-		    <Catalog name="FoodMart" >/WEB-INF/queries/FoodMart.xml</Catalog>
-                </Catalogs>
-		<ProviderName>Mondrian</ProviderName>
-		<ProviderType>MDP</ProviderType>
-		<AuthenticationMode>Unauthenticated</AuthenticationMode>
-	</DataSource>
+    <!-- 
+         A data source is a collection of logically related Mondrian
+         catalogs.
+
+         The XMLA specification allows an XMLA provider to have
+         multiple data sources, but some clients, particularly ones
+         based on ADOMD.NET such as Simba's O2X client and Pentaho
+         Spreadsheet Services, can only connect to the first declared
+         data source. Therefore, we recommend that you use a single
+         data source, containing multiple catalogs if necessary.
+
+	 This has been configured for the Mondrian WAR with an embedded Derby database.
+
+     -->
+    <DataSource>
+        <!--
+             Name of the data source.
+        -->
+        <DataSourceName>Provider=Mondrian;DataSource=MondrianFoodMart;</DataSourceName>
+
+        <!--
+             Description of the data source.
+        -->
+        <DataSourceDescription>Mondrian FoodMart Data Warehouse</DataSourceDescription>
+
+        <!-- 
+             The URL of the servlet.
+        -->
+        <URL>http://localhost:8080/mondrian-embedded/xmla</URL>
+
+        <!--
+             Mondrian connect string for the data source. If this data
+             source contains multiple catalogs, omit the 'Catalog'
+             property, and specify the URI of the schema.xml file in
+             the catalog's <Definition> element.
+
+             Catalogs can override the connect string with their own
+             <DataSourceInfo> element.
+          -->
+        <DataSourceInfo>Provider=mondrian;Jdbc=jdbc:derby:classpath:/foodmart;JdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver;JdbcUser=sa;JdbcPassword=sa;PoolNeeded=false;Catalog=/WEB-INF/queries/FoodMart.xml</DataSourceInfo>
+
+        <!-- 
+             Provider name must be 'Mondrian'.
+        -->
+        <ProviderName>Mondrian</ProviderName>
+
+        <!-- 
+             Provider type must be 'MDP'.
+        -->
+        <ProviderType>MDP</ProviderType>
+
+        <!-- 
+             Authentication mode. Allowable values are
+             'Unauthenticated', 'Authenticated', 'Integrated'. 
+        -->
+        <AuthenticationMode>Unauthenticated</AuthenticationMode>
+
+        <!-- 
+             A data source contains one or more catalogs.
+        -->
+        <Catalogs>
+            <!-- 
+                Catalog names must match the name inside the
+                schema.xml file, and must be unique across all data
+                sources defined in this datasources.xml file.
+            -->
+            <Catalog name="FoodMart">
+                <!--
+                     Mondrian connect string for the data source. This
+                     element is optional; if specified, it overrides the
+                     data source's <DataSourceInfo> element. Typically,
+                     you would use this element if the catalogs have
+                     different JDBC data sources.
+                 -->
+                <!--
+                <DataSourceInfo>Provider=mondrian;Jdbc=jdbc:odbc:MondrianFoodMart;JdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver</DataSourceInfo>
+                 -->
+
+                <!-- 
+                    URI of the schema definition file.
+                -->
+                <Definition>/WEB-INF/queries/FoodMart.xml</Definition>
+            </Catalog>
+        </Catalogs>
+
+    </DataSource>
+
 </DataSources>

demo/derby/web.xml

@@ -88,10 +88,6 @@ database which is exploded in the class path of the WAR.
   <servlet>
     <servlet-name>MondrianXmlaServlet</servlet-name>
     <servlet-class>mondrian.xmla.impl.DefaultXmlaServlet</servlet-class>
-    <init-param>
-      <param-name>DataSourcesConfig</param-name>
-      <param-value>datasources.xml</param-value>
-	</init-param>
   </servlet>