Most test passs

- Fixed exec of the TestAll program so that the majority of test passes
- Failures at the moment have to do with missing resources such as web/server/res JSP files

h2/pom.xml

@@ -120,8 +120,43 @@
     </dependency>
     <!-- END BENCHMARK DEPENDENCIES !-->
 
+    <!--  JDK dependencies  -->
+    <dependency>
+      <groupId>com.sun</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.6</version>
+      <scope>system</scope>
+      <systemPath>${tools.jar}</systemPath>
+    </dependency>
   </dependencies>
 
+  <!-- The test code creates proxy files using javac or tools.jar. Through maven we need to tell it
+       where to possibly find tools.jar and annoyingly its called classes.jar on OSX -->
+  <profiles>
+    <profile>
+      <id>default-tools.jar</id>
+      <activation>
+        <file>
+          <exists>${java.home}/../lib/tools.jar</exists>
+        </file>
+      </activation>
+      <properties>
+        <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
+      </properties>
+    </profile>
+    <profile>
+      <id>default-tools.jar-mac</id>
+      <activation>
+        <file>
+          <exists>${java.home}/../Classes/classes.jar</exists>
+        </file>
+      </activation>
+      <properties>
+        <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
@@ -131,9 +166,20 @@
         <directory>src/main</directory>
         <includes>
           <include>**/*.prop</include>
+          <include>org/h2/res/help.csv</include>
         </includes>
       </resource>
     </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test</directory>
+        <includes>
+          <include>org/h2/test/testSimple.in.txt</include>
+          <include>org/h2/test/testScript.sql</include>
+          <include>org/h2/samples/newsfeed.sql</include>
+        </includes>
+      </testResource>
+    </testResources>
     <plugins>
       <!-- Add tools folder to test sources but consider moving them to src/test -->
       <plugin>
@@ -194,7 +240,9 @@
           </signature>
         </configuration>
       </plugin>
-      <!-- Run our custom test suite -->
+      <!-- Run our custom test suite.
+           This needed to be done with exec:exec as that forks a JVM otherwise there were difficulties
+           getting the ProxyCodeGenerator to work (maven uses a different ClassLoader) -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -204,14 +252,19 @@
             <id>default-test</id>
             <phase>test</phase>
             <goals>
-              <goal>java</goal>
+              <goal>exec</goal>
             </goals>
           </execution>
         </executions>
         <configuration>
           <classpathScope>test</classpathScope>
-          <mainClass>org.h2.test.TestAll</mainClass>
+          <executable>java</executable>
           <arguments>
+            <argument>-classpath</argument>
+            <!-- automatically creates the classpath using all project dependencies,
+                 also adding the project build directory -->
+            <classpath/>
+            <argument>org.h2.test.TestAll</argument>
             <argument>fast</argument>
           </arguments>
         </configuration>