MONDRIAN:

   * Revise packaging for Derby distribution.
   * Update Derby test database with latest agg changes.
   * Ensure mondrian.properties in the WARs include options to use aggregates and native SQL.

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

build.xml

@@ -17,7 +17,7 @@
   <property name="project.build.debug" value="on"/>
   <property name="Name" value="Mondrian"/>
   <property name="name" value="mondrian"/>
-  <property name="version" value="2.0.1"/>
+  <property name="version" value="2.1-RC"/>
 
   <!--
     ===================================================================
@@ -38,6 +38,7 @@
   <property name="testclasses.dir" value="testclasses"/>
   <property name="build.dir" value="build"/>
   <property name="dist.name" value="${name}-${version}"/>
+  <property name="embedded.dist.name" value="${name}-${version}-embedded"/>
   <property name="dist.base" value="distribution"/>
   <property name="dist.dir" value="dist"/>
   <property name="demo.dir" value="demo"/>
@@ -660,7 +661,7 @@ ${doc.dir}/api/src-html/**/*"/>
     <zip zipfile="${dist.bin.derby.file}">
       <zipfileset
           dir="."
-          prefix="${dist.name}"
+          prefix="${embedded.dist.name}"
           includes="
 ${doc.dir}/**/*.jpg,
 ${doc.dir}/**/*.html,
@@ -681,7 +682,7 @@ VERSION.txt"
 ${doc.dir}/api/src-html/**/*"/>
       <zipfileset
           dir="${dist.dir}"
-          prefix="${dist.name}"
+          prefix="${embedded.dist.name}"
           includes="${dist.name}-src.zip"/>
     </zip>
   </target>
@@ -831,7 +832,7 @@ Assumes that mondrian.jar exists (use 'jar' target)">
 
     <war warfile="${war.file}"
         webxml="${build.dir}/mondrian/WEB-INF/web.xml">
-      <webinf dir="${webapp.dir}/WEB-INF" includes="datasources.xml,*.xsl,*.tld,**/*.jsp"/>
+      <webinf dir="${webapp.dir}/WEB-INF" includes="mondrian.properties,datasources.xml,*.xsl,*.tld,**/*.jsp"/>
       <webinf dir="${build.dir}/mondrian/WEB-INF" includes="jpivot/**/*.*,wcf/**/*.*,queries/*.jsp"
       		excludes="queries/xmla.jsp"/>
       <!-- our FoodMart.xml may be newer than jpivot's  excludes="web.xml,web-jpivot.xml" -->

demo/derby/mondrian.properties

@@ -0,0 +1,10 @@
+# Allow the use of aggregates
+mondrian.rolap.aggregates.Use=true
+mondrian.rolap.aggregates.Read=true
+mondrian.native.topcount.enable=true
+mondrian.native.filter.enable=true
+
+# mondrian.properties
+mondrian.result.limit=50000
+
+mondrian.test.connectString=Provider=mondrian;Jdbc='jdbc:derby:classpath:/foodmart';Catalog=/WEB-INF/queries/FoodMart.xml;JdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver;RoleXX='California manager';JdbcUser=APP;JdbcPassword=APP;PoolNeeded=false;

webapp/WEB-INF/mondrian.properties

@@ -1,6 +1,8 @@
 # Allow the use of aggregates
 mondrian.rolap.aggregates.Use=true
 mondrian.rolap.aggregates.Read=true
+mondrian.native.topcount.enable=true
+mondrian.native.filter.enable=true
 
 # mondrian.properties
 mondrian.result.limit=50000