MONDRIAN

       This change should have been part of the 6652 checkin.
       Changed to support new datasouces xml format.

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

demo/derby/datasources.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
 <DataSources>
 	<DataSource>
-		<DataSourceName>Provider=Mondrian;DataSource=MondrianFoodMart;</DataSourceName>
+		<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';Catalog=/WEB-INF/queries/FoodMart.xml;JdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver;JdbcUser=sa;JdbcPassword=sa;PoolNeeded=false;</DataSourceInfo>
+		<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>
-</DataSources>
+</DataSources>