Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 48 additions & 26 deletions application/playground/daanse.playground.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,19 @@
-runrequires: \
bnd.identity;id='${project.artifactId}',\
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
bnd.identity;id='org.apache.felix.metatype',\
bnd.identity;id='org.eclipse.daanse.olap.xmla.bridge',\
bnd.identity;id='org.eclipse.daanse.xmla.server.jakarta.saaj',\
bnd.identity;id='org.eclipse.daanse.olap.xmla.connector',\
bnd.identity;id='org.eclipse.daanse.xmla.server.whiteboard.servlet',\
bnd.identity;id='ch.qos.logback.classic',\
bnd.identity;id='org.eclipse.daanse.sql.jdbc.impl',\
bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\
bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\
bnd.identity;id='org.eclipse.daanse.dmv.parser.ccc',\
bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\
bnd.identity;id='org.eclipse.daanse.sql.guard.api',\
bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\
bnd.identity;id='org.eclipse.daanse.rolap.core',\
bnd.identity;id='org.eclipse.daanse.jdbc.datasource.pools.hikari',\
bnd.identity;id='org.eclipse.daanse.jdbc.datasource.postgresql',\
bnd.identity;id='org.apache.felix.webconsole',\
bnd.identity;id='org.owasp.encoder',\
Expand All @@ -55,7 +56,6 @@
bnd.identity;id='org.eclipse.daanse.sql.dialect.db.mysql',\
bnd.identity;id='org.apache.felix.fileinstall',\
bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.cors',\
bnd.identity;id='org.apache.commons.commons-fileupload',\
bnd.identity;id='org.apache.felix.configadmin.plugin.interpolation',\
bnd.identity;id='org.eclipse.daanse.lcid.basic',\
bnd.identity;id='org.eclipse.daanse.lcid.cfg',\
Expand All @@ -72,34 +72,40 @@
-runbundles: \
ai.starlake.transpiler;version='[1.8.0,1.8.1)',\
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\
com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\
com.h2database;version='[2.3.230,2.3.231)',\
com.mysql.cj;version='[9.0.0,9.0.1)',\
com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\
jakarta.activation-api;version='[2.1.3,2.1.4)',\
jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\
com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\
net.sf.jsqlparser;version='[5.3.167,5.3.168)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.apache.commons.commons-collections4;version='[4.5.0,4.5.1)',\
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.configadmin.plugin.interpolation;version='[1.2.8,1.2.9)',\
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
org.apache.felix.http.jetty12;version='[1.1.6,1.1.7)',\
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\
org.apache.felix.http.servlet-api;version='[6.1.0,6.1.1)',\
org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
org.apache.felix.webconsole;version='[5.0.12,5.0.13)',\
org.eclipse.daanse.cwm.model.cwm;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.util;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.model.cwm.foundation.datatypes;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.model.cwm.foundation.keysindexes;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.model.cwm.objectmodel.behavioral;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.model.cwm.objectmodel.core;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.model.cwm.objectmodel.instance;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.cwm.model.cwm.resource.relational;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.dmv.model.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.dmv.model.record;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.dmv.parser.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.dmv.parser.ccc;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.servlet.filter.cors;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.servlet.soap;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.common;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.h2;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.mysql;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.oracle;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.pools.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.pools.hikari;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jdbc.datasource.postgresql;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.lcid.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.lcid.basic;version='[0.0.1,0.0.2)',\
Expand All @@ -113,7 +119,7 @@
org.eclipse.daanse.olap.format;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.spi;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.util.format;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.olap.xmla.connector;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.core;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.rolap.mapping.model;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.server.application.playground;version='[0.0.1,0.0.2)',\
Expand All @@ -133,19 +139,35 @@
org.eclipse.daanse.sql.statement.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.sql.statement.impl;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.csdl.model.v2.an;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.csdl.model.v2.bi;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.csdl.model.v2.cg;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.csdl.model.v2.edm;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.jakarta.saaj;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.csdl.v2.an;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.csdl.v2.bi;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.csdl.v2.cg;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.csdl.v2.edm;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.empty;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.engine;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.engine200;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.engine300;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.engine300_300;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.exception;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.ext;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.io;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.mddataset;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.msxmla;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.multipleresults;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.rowset.core;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.rowset.mining;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.rowset.multidimensional;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.rowset.relational;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.rowset.server;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.soap;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.xmla;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.server.adapter.emf;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.server.whiteboard.servlet;version='[0.0.1,0.0.2)',\
org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.5.0,2.5.1)',\
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.objectweb.asm;version='[9.9.0,9.9.1)',\
org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\
org.objectweb.asm.tree;version='[9.9.0,9.9.1)',\
Expand All @@ -154,10 +176,10 @@
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.4.0,1.4.1)',\
org.osgi.service.servlet;version='[2.0.0,2.0.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.osgi.util.pushstream;version='[1.1.0,1.1.1)',\
org.owasp.encoder;version='[1.2.3,1.2.4)',\
org.postgresql.jdbc;version='[42.7.3,42.7.4)'
org.postgresql.jdbc;version='[42.7.3,42.7.4)',\
stax2-api;version='[4.2.2,4.2.3)'
19 changes: 7 additions & 12 deletions application/playground/start
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
#!/bin/bash
#!/bin/sh

# Path to Java-Binary
JAVA_EXEC="java"

# Logback-Konfiguration
JAVA_EXEC="${JAVA_HOME:+$JAVA_HOME/bin/}java"
LOGBACK_CONFIG="./logback.xml"

# Check if java -version returns output successfully
if ! "$JAVA_EXEC" -version >/dev/null 2>&1; then
echo "Java is installed but not working properly (java -version failed)."
# The bundles declare osgi.ee=JavaSE-25; on an older JVM nothing resolves.
JAVA_MAJOR="$("$JAVA_EXEC" -version 2>&1 | awk -F'"' '/version/ { split($2, v, /[._]/); print (v[1] == "1" ? v[2] : v[1]); exit }')"
if [ "${JAVA_MAJOR:-0}" -lt 25 ]; then
echo "Java 25 is required, but $JAVA_EXEC is Java ${JAVA_MAJOR:-unknown}. Point JAVA_HOME at a Java 25 installation."
exit 1
fi


if [[ ! -f "$LOGBACK_CONFIG" ]]; then
if [ ! -f "$LOGBACK_CONFIG" ]; then
echo "Logback-Configuration-File $LOGBACK_CONFIG not found."
exit 1
fi

# start Server
echo "start Server"
"$JAVA_EXEC" -Dlogback.configurationFile=file:"$LOGBACK_CONFIG" -jar daanse.playground.jar

29 changes: 24 additions & 5 deletions application/playground/start.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,46 @@
setlocal

REM Path to Java-Binary
set "JAVA_EXEC=java"
if defined JAVA_HOME (set "JAVA_EXEC=%JAVA_HOME%\bin\java") else (set "JAVA_EXEC=java")

REM The bundles declare osgi.ee=JavaSE-25. An older JVM starts the framework and
REM opens the HTTP port anyway, leaves most bundles unresolved, and then serves
REM nothing - so check here rather than debug that.
set "REQUIRED_JAVA=25"

REM Logback-Configuration-File
set "LOGBACK_CONFIG=.\logback.xml"


REM Check if java -version works
"%JAVA_EXEC%" -version >nul 2>&1
if errorlevel 1 (
echo Java is installed but not working properly (java -version failed).
echo "Java is installed but not working properly (java -version failed)."
exit /b 1
)

REM "25.0.4" -^> 25, and the old "1.8.0_402" -^> 8.
for /f tokens^=2^ delims^=^" %%v in ('"%JAVA_EXEC%" -version 2^>^&1 ^| findstr /i "version"') do (
for /f "tokens=1,2 delims=._" %%a in ("%%v") do (
if "%%a"=="1" (set "JAVA_MAJOR=%%b") else (set "JAVA_MAJOR=%%a")
)
goto :checked
)
:checked

if %JAVA_MAJOR% LSS %REQUIRED_JAVA% (
echo "Java %REQUIRED_JAVA% is required, but %JAVA_EXEC% is Java %JAVA_MAJOR%."
echo "Point JAVA_HOME at a Java %REQUIRED_JAVA% installation."
exit /b 1
)

REM Check Logback configuration file exists
if not exist "%LOGBACK_CONFIG%" (
echo Logback configuration file "%LOGBACK_CONFIG%" not found.
echo "Logback configuration file "%LOGBACK_CONFIG%" not found."
exit /b 1
)

REM Start Server
echo Starting server...
echo "Starting server..."
"%JAVA_EXEC%" -Dlogback.configurationFile=file:"%LOGBACK_CONFIG%" -jar daanse.playground.jar

endlocal
25 changes: 25 additions & 0 deletions application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,31 @@
<scope>compile</scope>
</dependency>

<!-- The rowset providers, split out of the connector by family. The
connector above is only the dispatch: without these three the server
starts, accepts a Discover, and refuses every request type as
unknown - which is exactly what it did until 2026-08-15. -->
<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.olap.xmla.connector.relational</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.olap.xmla.connector.relational.oledb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.olap.xmla.connector.multidimensional</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.xmla.server.jdk.httpserver</artifactId>
Expand Down
Loading
Loading