Skip to content

Commit

Permalink
MONDRIAN: Integrate @13291 (ivy upgrade and new method OlapConnection…
Browse files Browse the repository at this point in the history
….getAvailableRoleNames) from main.

[git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 13292]
  • Loading branch information
julianhyde committed Jan 7, 2010
1 parent 0544592 commit bc61cca
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ivy.xml
Expand Up @@ -5,7 +5,7 @@
== This software is subject to the terms of the Eclipse Public License v1.0
== Agreement, available at the following URL:
== http://www.eclipse.org/legal/epl-v10.html.
== Copyright (C) 2008-2009 Julian Hyde
== Copyright (C) 2008-2010 Julian Hyde
== All Rights Reserved.
== You must accept the terms of that agreement to use this software.
-->
Expand Down Expand Up @@ -55,7 +55,7 @@
<dependency org="javax.servlet" name="jsp-api" rev="2.0"/>
<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.7.277"
<dependency org="org.olap4j" name="olap4j" rev="0.9.7.296"
conf="default->default" changing="true">
<artifact name="olap4j"/>
<artifact name="olap4j" type="source" ext="jar"
Expand Down
8 changes: 7 additions & 1 deletion src/main/mondrian/olap4j/MondrianOlap4jConnection.java
Expand Up @@ -3,7 +3,7 @@
// This software is subject to the terms of the Eclipse Public License v1.0
// Agreement, available at the following URL:
// http://www.eclipse.org/legal/epl-v10.html.
// Copyright (C) 2007-2009 Julian Hyde
// Copyright (C) 2007-2010 Julian Hyde
// All Rights Reserved.
// You must accept the terms of that agreement to use this software.
*/
Expand All @@ -17,6 +17,7 @@
import org.olap4j.Cell;
import org.olap4j.*;
import org.olap4j.impl.Olap4jUtil;
import org.olap4j.impl.UnmodifiableArrayList;
import org.olap4j.mdx.*;
import org.olap4j.mdx.parser.*;
import org.olap4j.mdx.parser.impl.DefaultMdxParserImpl;
Expand Down Expand Up @@ -548,6 +549,11 @@ public String getRoleName() {
return roleName;
}

public List<String> getAvailableRoleNames() {
return UnmodifiableArrayList.of(
((RolapSchema) connection.getSchema()).roleNames());
}

// inner classes

/**
Expand Down

0 comments on commit bc61cca

Please sign in to comment.