Skip to content

Commit 69d55f1

Browse files
dbulahovstbischof
authored andcommitted
move olap xmla to olap repository
Signed-off-by: dbulahov <[email protected]>
1 parent b345924 commit 69d55f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+13
-11534
lines changed

mondrian/src/main/java/mondrian/rolap/RolapBaseCubeMeasure.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@
2525

2626
package mondrian.rolap;
2727

28-
import java.text.MessageFormat;
29-
3028
import org.eclipse.daanse.jdbc.db.dialect.api.Datatype;
3129
import org.eclipse.daanse.olap.api.Context;
30+
import org.eclipse.daanse.olap.api.PhisicalCubeMeasure;
3231
import org.eclipse.daanse.olap.api.aggregator.Aggregator;
3332
import org.eclipse.daanse.olap.api.element.MetaData;
34-
import org.eclipse.daanse.olap.api.exception.OlapRuntimeException;
3533
import org.eclipse.daanse.olap.api.formatter.CellFormatter;
3634
import org.eclipse.daanse.olap.common.StandardProperty;
3735
import org.eclipse.daanse.olap.exceptions.CastInvalidTypeException;
@@ -51,7 +49,7 @@
5149
*/
5250
public class RolapBaseCubeMeasure
5351
extends RolapMemberBase
54-
implements RolapStoredMeasure
52+
implements PhisicalCubeMeasure, RolapStoredMeasure
5553
{
5654

5755
private final static String unknownAggregator = "Unknown aggregator ''{0}''";

mondrian/src/main/java/mondrian/rolap/RolapCubeLevel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
package mondrian.rolap;
2929

30+
import org.eclipse.daanse.olap.api.CubeLevel;
3031
import org.eclipse.daanse.olap.api.SqlExpression;
3132
import org.eclipse.daanse.olap.api.element.LevelType;
3233
import org.eclipse.daanse.olap.api.formatter.MemberFormatter;
@@ -50,7 +51,7 @@
5051
*
5152
* @author Will Gorman, 19 October 2007
5253
*/
53-
public class RolapCubeLevel extends RolapLevel {
54+
public class RolapCubeLevel extends RolapLevel implements CubeLevel {
5455

5556
private final RolapLevel rolapLevel;
5657
private RolapStar.Column starKeyColumn = null;

mondrian/src/main/java/mondrian/rolap/RolapCubeMember.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
package mondrian.rolap;
2727

2828
import org.eclipse.daanse.olap.api.CatalogReader;
29+
import org.eclipse.daanse.olap.api.CubeMember;
2930
import org.eclipse.daanse.olap.api.MatchType;
3031
import org.eclipse.daanse.olap.api.Segment;
3132
import org.eclipse.daanse.olap.api.element.Level;
@@ -49,7 +50,7 @@
4950
*/
5051
public class RolapCubeMember
5152
extends DelegatingRolapMember
52-
implements RolapMemberInCube
53+
implements RolapMemberInCube, CubeMember
5354
{
5455
protected RolapCubeLevel cubeLevel;
5556
protected final RolapCubeMember parentCubeMember;
@@ -281,4 +282,9 @@ public OlapElement lookupChild(
281282
schemaReader.lookupMemberChildByName(this, childName, matchType);
282283
}
283284

285+
@Override
286+
public String getMemberUniqueName() {
287+
return member.getUniqueName();
288+
}
289+
284290
}

mondrian/src/main/java/mondrian/rolap/RolapProperty.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import org.eclipse.daanse.olap.api.MatchType;
3535
import org.eclipse.daanse.olap.api.CatalogReader;
36+
import org.eclipse.daanse.olap.api.LevelProperty;
3637
import org.eclipse.daanse.olap.api.Segment;
3738
import org.eclipse.daanse.olap.api.SqlExpression;
3839
import org.eclipse.daanse.olap.api.element.Dimension;
@@ -48,7 +49,7 @@
4849
*
4950
* @author jhyde
5051
*/
51-
public class RolapProperty extends AbstractProperty implements OlapElement {
52+
public class RolapProperty extends AbstractProperty implements LevelProperty, OlapElement {
5253

5354
private static final Logger LOGGER = LoggerFactory.getLogger(RolapProperty.class);
5455
private final static String mdxPropertyName = "property ''{0}''";

olap/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<artifactId>org.eclipse.daanse.olap</artifactId>
2121
<packaging>pom</packaging>
2222
<modules>
23-
<module>xmla</module>
2423
<module>documentation</module>
2524
</modules>
2625
</project>

olap/xmla/bridge/pom.xml

Lines changed: 0 additions & 39 deletions
This file was deleted.

olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/AbstractAction.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/AbstractActionConfig.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/ActionService.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)