Skip to content

Refactor catalog supplier references and add new dependencies. #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stbischof merged 2 commits into from
Jul 17, 2025
Merged

Refactor catalog supplier references and add new dependencies. #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76be60b
Refactor catalog supplier references and add new dependencies.
stbischof Jul 17, 2025
71eb6f1
Remove `@ServiceConsumer` annotation from `ServiceDiscovery` class.
stbischof Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions demo/server/play/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<bndruns>
<bndrun>xmla.demo.server.jetty.bndrun</bndrun>
<bndrun>xmla.demo.server.jdkhttp.bndrun</bndrun>
<bndrun>xmla.demo.server.jdkhttp.fileinstall.bndrun</bndrun>

</bndruns>
<exporter>bnd.executablejar</exporter>
Expand All @@ -44,6 +45,13 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<version>3.7.4</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.xmla.api</artifactId>
Expand Down Expand Up @@ -133,6 +141,32 @@
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.jdbc.db.dialect.db.oracle</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.jdbc.datasource.metatype.oracle</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.jdbc.db.dialect.db.postgresql</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.jdbc.datasource.metatype.postgresql</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>


<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.jdbc.db.importer.csv</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demo/server/play/src/main/java/org/eclipse/daanse/demo/server/play/CatalogsFileListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private void createContext(Path path, String matcherKey) throws IOException {
props.put(BasicContext.REF_NAME_DATA_SOURCE + TARGET_EXT, filterOfMatcherKey(matcherKey));
props.put(BasicContext.REF_NAME_EXPRESSION_COMPILER_FACTORY + TARGET_EXT,
"(component.name=" + PID_EXP_COMP_FAC + ")");
props.put(BasicContext.REF_NAME_DB_MAPPING_CATALOG_SUPPLIER + TARGET_EXT, filterOfMatcherKey(matcherKey));
props.put(BasicContext.REF_NAME_CATALOG_MAPPING_SUPPLIER + TARGET_EXT, filterOfMatcherKey(matcherKey));
props.put(BasicContext.REF_NAME_MDX_PARSER_PROVIDER + TARGET_EXT, "(component.name=" + PID_PARSER + ")");

String catalog_path = path.toString();
Expand Down
131 changes: 131 additions & 0 deletions demo/server/play/xmla.demo.server.jdkhttp.fileinstall.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
-runtrace: true


-runproperties: \
org.slf4j.simpleLogger.defaultLogLevel=error,\
org.osgi.service.http.port=8090,\
osgi.console=,\
osgi.console.enable.builtin=true,\
logback.configurationFile=${.}/logback.xml

-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
slf4j.api


-runsystempackages: \
oracle.jdbc.datasource.impl,\
oracle.jdbc.pool,\
oracle.jdbc.xa.client





-runee: JavaSE-21
-runfw: org.apache.felix.framework


-runrequires: \
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
bnd.identity;id='org.apache.aries.spifly.dynamic.framework.extension',\
bnd.identity;id='org.apache.felix.metatype',\
bnd.identity;id='org.eclipse.daanse.emondrian',\
bnd.identity;id='org.eclipse.daanse.olap.xmla.bridge',\
bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.resolver.basic',\
bnd.identity;id='ch.qos.logback.classic',\
bnd.identity;id='org.eclipse.daanse.jdbc.db.core',\
bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\
bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\
bnd.identity;id='org.eclipse.daanse.rolap.mapping.api',\
bnd.identity;id='org.eclipse.daanse.rolap.mapping.emf',\
bnd.identity;id='org.gecko.emf.osgi.component',\
bnd.identity;id='org.eclipse.daanse.olap.documentation.common',\
bnd.identity;id='org.eclipse.daanse.rolap.mapping.verifyer.api',\
bnd.identity;id='org.eclipse.daanse.rolap.mapping.verifyer.basic',\
bnd.identity;id='org.eclipse.daanse.sql.guard.api',\
bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\
bnd.identity;id='org.eclipse.daanse.xmla.server.jdk.httpserver',\
bnd.identity;id='org.eclipse.daanse.jdbc.datasource.metatype.oracle',\
bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.oracle',\
bnd.identity;id='org.eclipse.daanse.jdbc.datasource.metatype.postgresql',\
bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.postgresql',\
bnd.identity;id='org.postgresql.jdbc',\
bnd.identity;id='org.apache.felix.fileinstall',\
bnd.identity;id='biz.aQute.gogo.commands.provider',\
bnd.identity;id='org.apache.felix.gogo.runtime',\
bnd.identity;id='org.apache.felix.gogo.shell'


# This will help us keep -runbundles sorted
-runstartlevel: \
order=sortbynameversion,\
begin=-1


-runbundles: \
ai.starlake.transpiler;version='[0.7.0,0.7.1)',\
biz.aQute.gogo.commands.provider;version='[1.10.0,1.10.1)',\
ch.qos.logback.classic;version='[1.5.12,1.5.13)',\
com.github.ben-manes.caffeine;version='[3.1.2,3.1.3)',\
com.github.jsqlparser;version='[5.3.0,5.3.1)',\
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
jakarta.activation-api;version='[2.1.2,2.1.3)',\
jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\
json;version='[20250107.0.0,20250107.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\
org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
org.eclipse.daanse.emondrian;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.metatype.common;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.metatype.oracle;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.metatype.postgresql;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.core;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.dialect.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.dialect.db.common;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.dialect.db.oracle;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.dialect.db.postgresql;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.dialect.resolver.basic;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.db.record;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.mdx.model.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.mdx.model.record;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.mdx.parser.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.mdx.parser.ccc;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.action.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.common;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.documentation.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.documentation.common;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.mapping.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.mapping.emf;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.mapping.pojo;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.mapping.verifyer.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.mapping.verifyer.basic;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.sql.guard.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.sql.guard.jsqltranspiler;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.server.adapter.soapmessage;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.server.jdk.httpserver;version='[0.0.1,0.0.2)',\
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
org.eclipse.emf.ecore.xmi;version='[2.37.0,2.37.1)',\
org.gecko.emf.osgi.component;version='[6.2.0,6.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
org.osgi.service.log;version='[1.5.0,1.5.1)',\
org.osgi.util.converter;version='[1.0.9,1.0.10)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
org.postgresql.jdbc;version='[42.7.3,42.7.4)'

3 changes: 0 additions & 3 deletions mondrian/src/main/java/mondrian/util/ServiceDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import aQute.bnd.annotation.spi.ServiceConsumer;

/**
* Utility functions to discover Java services.
*
Expand All @@ -34,7 +32,6 @@
* @deprecated use ServiceLoader
*/
@Deprecated()
@ServiceConsumer(org.eclipse.daanse.jdbc.db.dialect.api.DialectFactory.class)
public class ServiceDiscovery<T> {

private static final Logger logger = LoggerFactory.getLogger(ServiceDiscovery.class);
Expand Down
4 changes: 2 additions & 2 deletions mondrian/src/main/java/org/eclipse/daanse/rolap/core/BasicContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public class BasicContext extends AbstractRolapContext implements RolapContext {

public static final String REF_NAME_DIALECT_RESOLVER = "dialectResolver";
public static final String REF_NAME_DATA_SOURCE = "dataSource";
public static final String REF_NAME_DB_MAPPING_CATALOG_SUPPLIER = "databaseMappingCatalogSuppier";
public static final String REF_NAME_CATALOG_MAPPING_SUPPLIER = "catalogMappingSuppier";
public static final String REF_NAME_ROLAP_CONTEXT_MAPPING_SUPPLIER = "rolapContextMappingSuppliers";
public static final String REF_NAME_MDX_PARSER_PROVIDER = "mdxParserProvider";
public static final String REF_NAME_EXPRESSION_COMPILER_FACTORY = "expressionCompilerFactory";
Expand All @@ -102,7 +102,7 @@ public class BasicContext extends AbstractRolapContext implements RolapContext {
@Reference(name = REF_NAME_DIALECT_RESOLVER)
private DialectResolver dialectResolver = null;

@Reference(name = REF_NAME_DB_MAPPING_CATALOG_SUPPLIER, target = UnresolvableNamespace.UNRESOLVABLE_FILTER, cardinality = ReferenceCardinality.MANDATORY)
@Reference(name = REF_NAME_CATALOG_MAPPING_SUPPLIER, target = UnresolvableNamespace.UNRESOLVABLE_FILTER, cardinality = ReferenceCardinality.MANDATORY)
private CatalogMappingSupplier catalogMappingSupplier;

@Reference(name = REF_NAME_EXPRESSION_COMPILER_FACTORY, target = UnresolvableNamespace.UNRESOLVABLE_FILTER)
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/test/java/org/eclipse/daanse/olap/rolap/core/ServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void serviceExists(
props.put(BasicContext.REF_NAME_DATA_SOURCE + TARGET_EXT, "(ds=1)");
props.put(BasicContext.REF_NAME_DIALECT_RESOLVER + TARGET_EXT, "(dr=2)");
props.put(BasicContext.REF_NAME_EXPRESSION_COMPILER_FACTORY + TARGET_EXT, "(ecf=1)");
props.put(BasicContext.REF_NAME_DB_MAPPING_CATALOG_SUPPLIER + TARGET_EXT, "(dbmsp=1)");
props.put(BasicContext.REF_NAME_CATALOG_MAPPING_SUPPLIER + TARGET_EXT, "(dbmsp=1)");
props.put(BasicContext.REF_NAME_MDX_PARSER_PROVIDER + TARGET_EXT, "(parser=1)");
// props.put(BasicContext.REF_NAME_QUERY_PROVIDER+ TARGET_EXT, "(qp=1)");

Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/test/java/org/eclipse/daanse/olap/tests/TestSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private TestSetup() {
+ ".target", value = "(test.exec=%s)", templateArguments = @TemplateArgument(source = ValueSource.TestUniqueId)),
@Property(key = BasicContext.REF_NAME_DATA_SOURCE
+ ".target", value = "(test.exec=%s)", templateArguments = @TemplateArgument(source = ValueSource.TestUniqueId)),
@Property(key = BasicContext.REF_NAME_DB_MAPPING_CATALOG_SUPPLIER
@Property(key = BasicContext.REF_NAME_CATALOG_MAPPING_SUPPLIER
+ ".target", value = "(test.exec=%s)", templateArguments = @TemplateArgument(source = ValueSource.TestUniqueId)),
@Property(key = BasicContext.REF_NAME_EXPRESSION_COMPILER_FACTORY
+ ".target", value = "(test.exec=%s)", templateArguments = @TemplateArgument(source = ValueSource.TestUniqueId)) })
Expand Down
Loading