Split boot.jar into mondrian-resource.jar and mondrian-xom.jar

Modify other build files to reflect the change.

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

build.bat

@@ -49,7 +49,7 @@
 @goto end
 :catalinaHomeOk
 
-@set CLASSPATH=%SRCROOT%/classes;%SRCROOT%/lib/javacup.jar;%SRCROOT%/lib/boot.jar
+@set CLASSPATH=%SRCROOT%/classes;%SRCROOT%/lib/javacup.jar;%SRCROOT%/lib/mondrian-xom.jar;%SRCROOT%/lib/mondrian-resource.jar
 
 @rem To use Oracle, uncomment the next line and modify appropriately
 @rem set ORACLE_HOME=%HOME_DRIVE%:/oracle/ora81

build.sh

@@ -42,7 +42,7 @@ if [ ! -d "${CATALINA_HOME}" ]; then
   exit 1
 fi
 
-export CLASSPATH="${SRCROOT}/classes${PS}${SRCROOT}/lib/javacup.jar${PS}${SRCROOT}/lib/boot.jar${PS}${XALAN_HOME}/bin/xml-apis.jar${PS}${XALAN_HOME}/bin/xercesImpl.jar${PS}${JUNIT_HOME}/junit.jar"
+export CLASSPATH="${SRCROOT}/classes${PS}${SRCROOT}/lib/javacup.jar${PS}${SRCROOT}/lib/mondrian-xom.jar${PS}${SRCROOT}/lib/mondrian-resource.jar${PS}${XALAN_HOME}/bin/xml-apis.jar${PS}${XALAN_HOME}/bin/xercesImpl.jar${PS}${JUNIT_HOME}/junit.jar"
 
 # To use Oracle, uncomment the next line and modify appropriately
 # set ORACLE_HOME="${PREFIX}/oracle/ora81"

build.xml

@@ -43,7 +43,8 @@
   <property name="dist.bin.file" value="${dist.dir}/${dist.name}.zip"/>
   <property name="jar.file" value="${lib.dir}/${name}.jar"/>
   <property name="workbench.jar.file" value="workbench.jar"/>
-  <property name="boot.jar.file" value="${lib.dir}/boot.jar"/>
+  <property name="resource.jar.file" value="${lib.dir}/mondrian-resource.jar"/>
+  <property name="xom.jar.file" value="${lib.dir}/mondrian-xom.jar"/>
   <property name="war.file" value="${lib.dir}/${name}.war"/>
   <property name="jdk.home" value="${env.JAVA_HOME}"/>
   <property name="catalina.home" value="${env.CATALINA_HOME}"/>
@@ -101,7 +102,8 @@ demo/mysql/FoodMartData.sql"/>
 
   <path id="project.boot.classpath">
     <path refid="project.classpath"/>
-    <pathelement location="${boot.jar.file}"/>
+    <pathelement location="${resource.jar.file}"/>
+    <pathelement location="${xom.jar.file}"/>
   </path>
 
   <taskdef name="javacup" classname="java_cup.JavaCUPTask">
@@ -433,7 +435,8 @@ ${java.dir}/mondrian/resource/Resource.xml,
 ${java.dir}/mondrian/olap/Mondrian.xml,
 ${java.dir}/mondrian/xom/Meta.xml,
 ${java.dir}/javax/jmi/model/resources/mof.xml,
-${lib.dir}/boot.jar,
+${lib.dir}/mondrian-xom.jar,
+${lib.dir}/mondrian-resource.jar,
 ${lib.dir}/javacup.jar,
 ${lib.dir}/jmi.jar,
 ${lib.dir}/mof.jar,
@@ -577,14 +580,21 @@ VERSION.txt"/>
   </target>
 
   <target name="bootjar"
-      description="Builds a jar file of the classes we need in order to run ant; when the new versions have built, we can replace them. Run this target when the bootstrap files have changed so much that you can't bootstrap, and you need o generate a new boot.jar to check in to source control.">
+      description="Builds a jar file of the classes we need in order to run ant; when the new versions have built, we can replace them. Run this target when the bootstrap files have changed so much that you can't bootstrap, and you need o generate a new mondrian-xom.jar or mondrian-resource.jar to check in to source control.">
     <mkdir dir="${lib.dir}" />
-    <delete file="${boot.jar.file}"/>
-    <jar jarfile="${boot.jar.file}">
+
+    <delete file="${xom.jar.file}"/>
+    <jar jarfile="${xom.jar.file}">
+      <fileset
+          dir="${classes.dir}"
+          includes="mondrian/xom/**/*.class"/>
+    </jar>
+
+    <delete file="${resource.jar.file}"/>
+    <jar jarfile="${resource.jar.file}">
       <fileset
           dir="${classes.dir}"
-          includes="mondrian/xom/**/*.class,
-mondrian/resource/**/*.class"/>
+          includes="mondrian/resource/**/*.class"/>
     </jar>
   </target>
 

misc/workbench-manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Main-Class: mondrian.gui.Workbench
-Class-Path: . lib/jlfgr-1_0.jar lib/boot.jar lib/javacup.jar lib/jmi.jar lib/mm.mysql-2.0.14-bin.jar lib/mof.jar lib/junit.jar
+Class-Path: . lib/jlfgr-1_0.jar lib/mondrian-xom.jar lib/mondrian-resource.jar lib/javacup.jar lib/jmi.jar lib/mm.mysql-2.0.14-bin.jar lib/mof.jar lib/junit.jar
 
 Name: Mondrian Workbench
 

src/main/mondrian/xom/package.html

@@ -145,7 +145,7 @@ <h2>Generation</h2>
 If you change <code>meta.xml</code>, you need to regenerate them as follows:
 <blockquote><pre>$ p4 edit src/main/mondrian/xom/meta.dtd src/main/mondrian/xom/MetaDef.java
 $ build metadef</pre></blockquote>
-<p>Then insert the modified class files into <code>lib/boot.jar</code>. If things get screwed up, refresh <code>MetaDef.java</code> and <code>meta.dtd</code>
+<p>Then insert the modified class files into <code>lib/mondrian-xom.jar</code>. If things get screwed up, refresh <code>MetaDef.java</code> and <code>meta.dtd</code>
 from perforce.</p>
 <h2>Guidelines for writing models</h2>
 <ol>