Upgrades to latest olap4j.

olap4j · Dec 17, 2012 · ffd4216 · ffd4216
1 parent 38d065a
commit ffd4216
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <!-- The basics. -->
   <groupId>org.olap4j</groupId>
   <artifactId>olap4j-xmlaserver</artifactId>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <!-- More project information. -->
@@ -67,7 +67,17 @@
     <dependency>
       <groupId>org.olap4j</groupId>
       <artifactId>olap4j</artifactId>
-      <version>1.0.1.500</version>
+      <version>1.0.1-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>rt-java6</artifactId>
+          <groupId>net.java.openjdk</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>rt-jdk1.5</artifactId>
+          <groupId>com.sun</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

diff --git a/src/main/java/mondrian/xmla/RowsetDefinition.java b/src/main/java/mondrian/xmla/RowsetDefinition.java
@@ -20,10 +20,6 @@
 import org.olap4j.mdx.IdentifierNode;
 import org.olap4j.mdx.IdentifierSegment;
 import org.olap4j.metadata.*;
-import org.olap4j.metadata.Cube;
-import org.olap4j.metadata.Dimension;
-import org.olap4j.metadata.Hierarchy;
-import org.olap4j.metadata.Level;
 import org.olap4j.metadata.Member;
 import org.olap4j.metadata.Member.TreeOp;
 import org.olap4j.metadata.NamedSet;
@@ -6406,9 +6402,9 @@ public NamedList<Dimension> getDimensions() {
         public NamedList<Hierarchy> getHierarchies() {
             final NamedList<Hierarchy> hierarchyList =
                 new ArrayNamedListImpl<Hierarchy>() {
-                    protected String getName(Hierarchy hierarchy) {
-                        return hierarchy.getName();
-                    }
+                public String getName(Object o) {
+                    return ((Hierarchy) o).getName();
+                }
                 };
             for (Dimension dimension : getDimensions()) {
                 hierarchyList.addAll(dimension.getHierarchies());

diff --git a/src/main/java/mondrian/xmla/XmlaUtil.java b/src/main/java/mondrian/xmla/XmlaUtil.java
@@ -10,6 +10,7 @@
 */
 package mondrian.xmla;
 
+import mondrian.xmla.XmlaHandler.XmlaExtra;
 import mondrian.xmla.impl.DefaultXmlaResponse;
 
 import org.olap4j.xmla.server.impl.Util;
@@ -337,7 +338,11 @@ public void endRequest(XmlaHandler.Request request) {
                 }
 
                 public XmlaHandler.XmlaExtra getExtra() {
-                    return new XmlaHandler.XmlaExtraImpl();
+                    try {
+                        return connection.unwrap(XmlaHandler.XmlaExtra.class);
+                    } catch (SQLException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
             };
         final XmlaRequest request = new XmlaRequest() {