MONDRIAN: Upgrade to ivy-2.0.0-rc2.

Save source and javadoc artifacts in different filenames than jar artifacts. (Fixes a problem that curiously only seems to show up on Windows.) Update IntelliJ IDEA projects to reference the new javadoc and source jars, for modules that have them. Also upgrade IntelliJ IDEA modules & projects to version 8 format. [git-p4: depot-paths = "//open/mondrian/": change = 12183]
pentaho · Dec 30, 2008 · f17d346 · f17d346
1 parent c50af6b
commit f17d346
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 63 deletions.
diff --git a/build.xml b/build.xml
@@ -12,7 +12,7 @@
   <property environment="env"/>
 
   <!-- Define desired ivy version and location. -->
-  <property name="ivy.install.version" value="2.0.0-rc1"/>
+  <property name="ivy.install.version" value="2.0.0-rc2"/>
   <property name="ivy.jar.dir" value="${basedir}/ivy"/>
   <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
 
@@ -386,11 +386,13 @@ demo/access/MondrianFoodMart.mdb"/>
   <target name="resolve" unless="skip.download">
       <!-- Workbench dependencies to workbench/plugins -->
       <ivy:resolve file="workbench/ivy.xml"/>
-      <ivy:retrieve pattern="${wb.plugins.dir}/[module].[ext]"/>
+      <ivy:retrieve type="jar" pattern="${wb.plugins.dir}/[module].[ext]"/>
+      <ivy:retrieve type="source,javadoc" pattern="${wb.plugins.dir}/[module]-[type].[ext]"/>
 
       <!-- Mondrian depenencies. -->
       <ivy:resolve file="ivy.xml"/>
-      <ivy:retrieve pattern="${lib.dir}/[module].[ext]"/>
+      <ivy:retrieve type="jar" pattern="${lib.dir}/[module].[ext]"/>
+      <ivy:retrieve type="source,javadoc" pattern="${lib.dir}/[module]-[type].[ext]"/>
   </target>
 
   <target name="cmdrunner" depends="jar">

diff --git a/intellij/mondrian.iml b/intellij/mondrian.iml
@@ -1,20 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../classes" />
-    <exclude-output />
-    <output-test url="file://$MODULE_DIR$/../classes" />
-    <content url="file://$MODULE_DIR$/../src">
-      <sourceFolder url="file://$MODULE_DIR$/../src/main" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="all" level="project" />
-    <orderEntry type="library" name="eigenbase-properties" level="project" />
-    <orderEntry type="library" name="commons-math" level="project" />
-    <orderEntry type="library" name="jdbcDrivers" level="project" />
-    <orderEntry type="module" module-name="olap4j" />
-    <orderEntryProperties />
-  </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../classes" />
+    <output-test url="file://$MODULE_DIR$/../classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../src">
+      <sourceFolder url="file://$MODULE_DIR$/../src/main" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="all" level="project" />
+    <orderEntry type="library" name="eigenbase-properties" level="project" />
+    <orderEntry type="library" name="jdbcDrivers" level="project" />
+    <orderEntry type="module" module-name="olap4j" />
+  </component>
+</module>
+
diff --git a/intellij/mondrian.ipr b/intellij/mondrian.ipr
@@ -59,6 +59,7 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
@@ -278,6 +279,9 @@
       </item>
     </group>
   </component>
+  <component name="ProjectDetails">
+    <option name="projectName" value="mondrian" />
+  </component>
   <component name="ProjectFileVersion" converted="true" />
   <component name="ProjectModuleManager">
     <modules>
@@ -286,6 +290,7 @@
       <module fileurl="file://$PROJECT_DIR$/../../olap4j/olap4j.iml" filepath="$PROJECT_DIR$/../../olap4j/olap4j.iml" />
     </modules>
   </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">
       <value>
@@ -300,6 +305,9 @@
     <option name="GENERATE_IIOP_STUBS" value="false" />
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="myVersion" value="124" />
+  </component>
   <component name="TestDox.ConfigurationController">
     <option name="allowCustomPackages" value="false" />
     <option name="testNameTemplate" value="&lt;classname&gt;Test" />
@@ -351,15 +359,21 @@
         <root url="jar://$PROJECT_DIR$/../lib/jlfgr.jar!/" />
         <root url="jar://$PROJECT_DIR$/../lib/servlet-api.jar!/" />
       </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="commons-math">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../lib/commons-math.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
+      <JAVADOC>
+        <root url="jar://$PROJECT_DIR$/../lib/commons-math-javadoc.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-lang-javadoc.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-collections-javadoc.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-logging-javadoc.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-dbcp-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/../lib/servlet-api-source.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-io-source.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/log4j-source.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-lang-source.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-logging-source.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../lib/commons-collections-source.jar!/" />
+      </SOURCES>
     </library>
     <library name="eigenbase-properties">
       <CLASSES>
@@ -374,8 +388,12 @@
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/../lib/junit.jar!/" />
       </CLASSES>
-      <JAVADOC />
-      <SOURCES />
+      <JAVADOC>
+        <root url="jar://$PROJECT_DIR$/../lib/junit-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/../lib/junit-source.jar!/" />
+      </SOURCES>
     </library>
     <library name="jdbcDrivers">
       <CLASSES>
@@ -386,20 +404,6 @@
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="dom4j">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../lib/dom4j.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="commons-io">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../lib/commons-io.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
     <library name="xmlunit">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/../lib/xmlunit.jar!/" />

diff --git a/intellij/mondrianTest.iml b/intellij/mondrianTest.iml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../testclasses" />
+    <output-test url="file://$MODULE_DIR$/../testclasses" />
     <exclude-output />
     <exclude-exploded />
-    <output-test url="file://$MODULE_DIR$/../testclasses" />
     <content url="file://$MODULE_DIR$/..">
       <sourceFolder url="file://$MODULE_DIR$/../testsrc/main" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/../doc/api" />
@@ -15,10 +14,9 @@
     <orderEntry type="library" name="all" level="project" />
     <orderEntry type="module" module-name="mondrian" />
     <orderEntry type="library" name="eigenbase-properties" level="project" />
-    <orderEntry type="library" name="commons-math" level="project" />
     <orderEntry type="library" name="junit" level="project" />
-    <orderEntry type="library" name="xmlunit1.0" level="project" />
-    <orderEntryProperties />
+    <orderEntry type="library" name="xmlunit" level="project" />
+    <orderEntry type="module" module-name="olap4j" />
   </component>
 </module>
 
diff --git a/ivy.xml b/ivy.xml
@@ -25,6 +25,7 @@
             XML/A APIs.
         </description>
     </info>
+
     <dependencies>
         <dependency org="commons-collections" name="commons-collections" rev="2.1"/>
         <dependency org="commons-dbcp" name="commons-dbcp" rev="1.2"/>
@@ -51,22 +52,18 @@
         <dependency org="javax.servlet" name="servlet-api" rev="2.4"/>
         <dependency org="log4j" name="log4j" rev="1.2.9"/>
         <dependency org="org.olap4j" name="olap4j" rev="0.9.6-svn098"/>
-        <!--try xalan 2.6.0?-->
+        <!-- REVIEW: try xalan 2.6.0? -->
         <dependency org="xalan" name="xalan" rev="2.4.1"/>
         <dependency org="xerces" name="xercesImpl" rev="2.5.0"/>
-<!--
-        <dependency org="xml-apis" name="xml-apis" rev="2.0.2"/>
--->
         <dependency org="xmlunit" name="xmlunit" rev="1.1"/>
         <dependency org="org.apache.derby" name="derby" rev="10.2.2.0"/>
-	    <!--
-         note, this is a build of jpivot's CVS trunk on 12-22-2008
-        -->
+
+	    <!-- Note that this is a build of jpivot's CVS trunk on 12-22-2008. -->
         <dependency org="com.tonbeller" name="jpivot" rev="1.8.0-081222">
             <artifact name="jpivot" type="war"/>
         </dependency>
 
-        <!--Exclusions-->
+        <!-- Exclusions -->
         <exclude org="avalon-framework" module="avalon-framework"/>
         <exclude org="commons-discovery" module="commons-discovery"/>
         <exclude org="commons-net" module="commons-net"/>