Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642566,642568-642574,642576 via svnmerge from

https://svn.apache.org/repos/asf/poi/trunk

........
  r642566 | nick | 2008-03-29 17:45:28 +0000 (Sat, 29 Mar 2008) | 1 line
  
  Move the missing record aware eventusermodel code out of scratchpad
........
  r642571 | nick | 2008-03-29 18:11:48 +0000 (Sat, 29 Mar 2008) | 1 line
  
  Merge several bug tests into one file
........
  r642574 | nick | 2008-03-29 18:23:33 +0000 (Sat, 29 Mar 2008) | 1 line
  
  Move the FormulaEvaluator code out of scratchpad
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@642591 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -240,10 +240,10 @@ under the License.
     </path>
 
 
-  <path id="examples.classpath">
+    <path id="examples.classpath">
-    <path refid="main.classpath"/>
+        <path refid="main.classpath"/>
-    <pathelement location="${main.output.dir}"/>
+        <pathelement location="${main.output.dir}"/>
-  </path>
+    </path>
 
 
 
@@ -449,7 +449,7 @@ under the License.
       fork="yes" srcdir="${main.src.test}">
       <classpath>
         <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
+        <pathelement path="${main.output.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
       </classpath>
     </javac>
@@ -478,7 +478,7 @@ under the License.
       fork="yes" srcdir="${scratchpad.src.test}">
       <classpath>
         <path refid="scratchpad.classpath"/>
-        <pathelement location="${scratchpad.output.dir}"/>
+        <pathelement path="${scratchpad.output.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
       </classpath>
     </javac>
@@ -512,19 +512,20 @@ under the License.
       fork="yes" srcdir="${contrib.src.test}">
       <classpath>
         <path refid="contrib.classpath"/>
-        <pathelement location="${contrib.output.dir}"/>
+        <pathelement path="${contrib.output.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
       </classpath>
     </javac>
   </target>
 
-  <target name="compile-examples" depends="init">
+  <target name="compile-examples" depends="init,compile-ooxml">
     <javac target="${jdk.version.class}" source="${jdk.version.source}"
-      destdir="${examples.output.dir}" debug="on" srcdir="${examples.src}">
+      failonerror="true" destdir="${examples.output.dir}" debug="on" fork="yes"
+      srcdir="${examples.src}">
       <classpath>
         <path refid="examples.classpath"/>
         <path refid="ooxml.classpath"/>
-        <pathelement location="${ooxml.output.dir}"/>
+        <pathelement path="${ooxml.output.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
       </classpath>
     </javac>
@@ -542,7 +543,7 @@ under the License.
       fork="yes" srcdir="${ooxml.src.test}">
       <classpath>
         <path refid="ooxml.classpath"/>
-        <pathelement location="${ooxml.output.dir}"/>
+        <pathelement path="${ooxml.output.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
       </classpath>
     </javac>

src/documentation/content/xdocs/changes.xml

@@ -35,7 +35,9 @@
     </devs>
 
 		<!-- Don't forget to update status.xml too! -->
-        <release version="3.1-beta1" date="2008-??-??">
+        <release version="3.0.3-beta1" date="2008-04-??">
+           <action dev="POI-DEVELOPERS" type="add">Move the Formula Evaluator code out of scratchpad</action>
+           <action dev="POI-DEVELOPERS" type="add">Move the missing record aware eventusermodel code out of scratchpad</action>
            <action dev="POI-DEVELOPERS" type="add">44652 / 44603 - Improved handling of Pictures in Word Documents</action>
            <action dev="POI-DEVELOPERS" type="fix">44636 - Fix formula parsing of RefVPtg, which was causing #VALUE to be shown on subsequent edits</action>
            <action dev="POI-DEVELOPERS" type="fix">44627 - Improve the thread safety of POILogFactory</action>

src/documentation/content/xdocs/status.xml

@@ -32,7 +32,9 @@
 
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
-        <release version="3.1-beta1" date="2008-??-??">
+        <release version="3.0.3-beta1" date="2008-04-??">
+           <action dev="POI-DEVELOPERS" type="add">Move the Formula Evaluator code out of scratchpad</action>
+           <action dev="POI-DEVELOPERS" type="add">Move the missing record aware eventusermodel code out of scratchpad</action>
            <action dev="POI-DEVELOPERS" type="add">44652 / 44603 - Improved handling of Pictures in Word Documents</action>
            <action dev="POI-DEVELOPERS" type="fix">44636 - Fix formula parsing of RefVPtg, which was causing #VALUE to be shown on subsequent edits</action>
            <action dev="POI-DEVELOPERS" type="fix">44627 - Improve the thread safety of POILogFactory</action>