Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MONDRIAN: Integrate from //open/mondrian-release/3.1 changes 13189-13…
…226.
Viz:
Change 13226 on 2009/12/11 by jhyde@jhyde.mackerel2
MONDRIAN/3.1: Change rules for generating captions and descriptions of
hierarchies in shared dimensions that are used multiple times within the
same cube. If the <DimensionUsage> has a name and that name is different
from the name of the shared dimension, prefix the caption and description of
the hierarchy with the caption of the dimension usage (which can be
specified directly, or defaults to the name of the dimension usage).
Change 13225 on 2009/12/10 by jhyde@jhyde.mackerel2
MONDRIAN/3.1: Two changes to enable mondrian to be accessed via olap4j in the
Pentaho platform.
1. Add method Util.convertOlap4jConnectStringToNativeMondrian to allow legacy
apps like JPivot to take olap4j connect strings and continue to use Mondrian
connections under the covers.
2. Add plugin mondrian.spi.DataSourceResolver, controlled by property
mondrian.spi.dataSourceResolverClass, to allow container to control how
Mondrian converts a data source string like "jdbc/MondrianFoodMart" into
a javax.sql.DataSource object. The default is to use JNDI. The Pentaho
platform uses its own variant of JNDI.
Change 13224 on 2009/12/10 by jhyde@jhyde.mackerel2
MONDRIAN/3.1: Add DISPLAY_FOLDER as a member property. Use it if you
want a UI such as Analyzer to group your measures into folders.
Change 13223 on 2009/12/10 by jhyde@jhyde.mackerel2
MONDRIAN/3.1: Oops!
Change 13222 on 2009/12/10 by jhyde@jhyde.mackerel2
MONDRIAN/3.1: Add annotations (user-defined properties against metadata
elements; MONDRIAN-652).
Change 13220 on 2009/12/09 by jhyde@jhyde.mackerel2
MONDRIAN/3.1: Add caption and description to major schema elements (schema,
cube, virtual cube, dimension, dimension usage, hierarchy, level,
measure, calculated member, named set) and make sure that they come out
correctly in getCaption() and getDescription() methods. (MONDRIAN-632.)
Change 13209 on 2009/12/06 by jhyde@jhyde.atc-hp
MONDRIAN: Implement dialect for HP Neoview. All tests pass bar one.
Change JdbcDialectImpl method supportsOrderByNullsLast to more
powerful generateOrderByNullsLast.
Change 13201 on 2009/11/30 by jhyde@jhyde.marmalade
MONDRIAN: Change license of CacheMap to EPL (with permission of author Luis Canals, Tasecurity).
Change 13197 on 2009/11/27 by jhyde@jhyde.marmalade
MONDRIAN: Oops!
Change 13196 on 2009/11/27 by jhyde@jhyde.marmalade
MONDRIAN: Integrate @13195 to mondrian-3.1 branch: comply with latest checkFile.
Change 13189 on 2009/11/25 by jhyde@jhyde.marmalade
MONDRIAN: Implement RolapCubeLevel.getCaption (bug MONDRIAN-655).
[git-p4: depot-paths = "//open/mondrian/": change = 13227]- Loading branch information
1 parent
84ac1c1
commit db75e4e
Showing
58 changed files
with
1,448 additions
and
211 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| // $Id$ | ||
| // 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) 2009-2009 Julian Hyde and others | ||
| // All Rights Reserved. | ||
| // You must accept the terms of that agreement to use this software. | ||
| */ | ||
|
|
||
| package mondrian.olap; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * An element that has annotations. | ||
| * | ||
| * @version $Id$ | ||
| * @author jhyde | ||
| */ | ||
| public interface Annotated { | ||
| /** | ||
| * Returns a list of annotations. | ||
| * | ||
| * <p>The map may be empty, never null. | ||
| * | ||
| * @return Map from annotation name to annotations. | ||
| */ | ||
| Map<String, Annotation> getAnnotationMap(); | ||
| } | ||
|
|
||
| // End Annotated.java |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| // $Id$ | ||
| // 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) 2009-2009 Julian Hyde and others | ||
| // All Rights Reserved. | ||
| // You must accept the terms of that agreement to use this software. | ||
| */ | ||
|
|
||
| package mondrian.olap; | ||
|
|
||
| /** | ||
| * User-defined property on a metadata element. | ||
| * | ||
| * @see mondrian.olap.Annotated | ||
| * | ||
| * @version $Id$ | ||
| * @author jhyde | ||
| */ | ||
| public interface Annotation { | ||
| /** | ||
| * Returns the name of this annotation. Must be unique within its element. | ||
| * | ||
| * @return Annotation name | ||
| */ | ||
| String getName(); | ||
|
|
||
| /** | ||
| * Returns the value of this annotation. Usually a string. | ||
| * | ||
| * @return Annotation value | ||
| */ | ||
| Object getValue(); | ||
| } | ||
|
|
||
| // End Annotation.java |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.