MONDRIAN: Add olap4j-xmla library to intellij project;

add new machine marmite to megatest configuration. [git-p4: depot-paths = "//open/mondrian/": change = 14169]
pentaho · Mar 23, 2011 · 9c3fc98 · 9c3fc98
1 parent e386c4b
commit 9c3fc98
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/bin/megatest b/bin/megatest
@@ -16,8 +16,10 @@
 # This is for mondrian developers & QA. It is not intended to run in a
 # release environment.
 
+#ANT_FLAGS=-Dskip.download=true
 ANT_FLAGS=
 CLEAN=clean
+#CLEAN=
 
 # The script's path is $OPEN_DIR/mondrian/bin/megatest; deduce OPEN_DIR.
 OPEN_DIR=$(cd $(dirname $0)/../..; pwd)
@@ -64,6 +66,10 @@ marmalade)
   databaseList="derby hsqldb mysql oracle luciddb postgresql"
   jdkList="jdk1.4 jdk1.5 jdk1.6 openjdk1.6"
   ;;
+marmite)
+  databaseList="derby hsqldb mysql"
+  jdkList="jdk1.4 jdk1.5 jdk1.6 openjdk1.6"
+  ;;
 ATRHisv1)
   databaseList="hsqldb neoview"
   jdkList="jdk1.6"

diff --git a/intellij/mondrian.ipr b/intellij/mondrian.ipr
@@ -228,6 +228,9 @@
       <module fileurl="file://$PROJECT_DIR$/mondrianTest.iml" filepath="$PROJECT_DIR$/mondrianTest.iml" />
     </modules>
   </component>
+  <component name="ProjectResources">
+    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK" />
   <component name="ResourceManagerContainer">
     <option name="myResourceBundles">
@@ -316,6 +319,15 @@
         <root url="file://$PROJECT_DIR$/../../farrago/src" />
       </SOURCES>
     </library>
+    <library name="jdbcDrivers">
+      <CLASSES>
+        <root url="jar:///usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jdbc/lib/ojdbc14.jar!/" />
+        <root url="jar:///usr/local/mysql-connector-java-3.1.12/mysql-connector-java-3.1.12-bin.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/derby.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
     <library name="junit">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/../lib/junit.jar!/" />
@@ -327,18 +339,27 @@
         <root url="jar://$PROJECT_DIR$/../lib/junit-source.jar!/" />
       </SOURCES>
     </library>
-    <library name="jdbcDrivers">
+    <library name="olap4j">
       <CLASSES>
-        <root url="jar:///usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jdbc/lib/ojdbc14.jar!/" />
-        <root url="jar:///usr/local/mysql-connector-java-3.1.12/mysql-connector-java-3.1.12-bin.jar!/" />
-        <root url="jar://$PROJECT_DIR$/../lib/derby.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/olap4j.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="http://www.olap4j.org/api" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/../lib/olap4j-source.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="olap4j-tck">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/../lib/olap4j-tck.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="xmlunit">
+    <library name="olap4j-xmla">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../lib/xmlunit.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/olap4j-xmla.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
@@ -356,20 +377,9 @@
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="olap4j">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../lib/olap4j.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="http://www.olap4j.org/api" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$PROJECT_DIR$/../lib/olap4j-source.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="olap4j-tck">
+    <library name="xmlunit">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../lib/olap4j-tck.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/xmlunit.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />

diff --git a/intellij/mondrianTest.iml b/intellij/mondrianTest.iml
@@ -18,6 +18,7 @@
     <orderEntry type="library" name="xmlunit" level="project" />
     <orderEntry type="library" name="olap4j" level="project" />
     <orderEntry type="library" name="olap4j-tck" level="project" />
+    <orderEntry type="library" name="olap4j-xmla" level="project" />
   </component>
 </module>