diff --git a/application/probe/README.md b/application/probe/README.md index c2373f1..5d18e33 100644 --- a/application/probe/README.md +++ b/application/probe/README.md @@ -342,7 +342,7 @@ To create your own catalog: 4. **Verify Documentation** - verify the docs in `output/documentation` folder -5. **Test changes immediately** - no restart needed +5. **Test changes immediately** - no restart needed, connect via odc file in `output/odc` ### Best Practices diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index 7f8d028..ef0ac01 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -52,7 +52,8 @@ bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.cors',\ bnd.identity;id='org.eclipse.daanse.lcid.basic',\ bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.role',\ - bnd.identity;id='org.eclipse.daanse.rolap.documentation.common' + bnd.identity;id='org.eclipse.daanse.rolap.documentation.common',\ + bnd.identity;id='org.eclipse.daanse.olap.odc' # This will help us keep -runbundles sorted @@ -97,9 +98,12 @@ 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.odc.model.simple;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.odc.writer.simple;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.format;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.olap.odc;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.olap.spi;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.rolap.core;version='[0.0.1,0.0.2)',\ diff --git a/application/probe/pom.xml b/application/probe/pom.xml index da7bd0a..4249dac 100644 --- a/application/probe/pom.xml +++ b/application/probe/pom.xml @@ -122,6 +122,14 @@ compile + + org.eclipse.daanse + + org.eclipse.daanse.olap.odc + 0.0.1-SNAPSHOT + compile + + org.slf4j slf4j-api diff --git a/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/Probe.java b/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/Probe.java index d5a326c..fbda2bb 100644 --- a/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/Probe.java +++ b/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/Probe.java @@ -62,6 +62,10 @@ public class Probe { private Configuration configCorsFilter; + private Configuration configOdcWriter; + + private Configuration configAutoODC; + @Activate public void activate() throws IOException { logger.info("Activating ProbeSetup"); @@ -73,6 +77,7 @@ public void activate() throws IOException { initFileListener(); initContextGroup(); initDocumenter(); + initODC(); logger.info("ProbeSetup activation completed"); } @@ -159,6 +164,21 @@ private void initDocumenter() throws IOException { } + private void initODC() throws IOException { + configOdcWriter = ca.getFactoryConfiguration(org.eclipse.daanse.olap.odc.simple.api.Constants.CREATOR_PID, + CONFIG_IDENT, "?"); + Dictionary dict = new Hashtable<>(); + dict.put(org.eclipse.daanse.olap.odc.simple.api.Constants.CREATOR_PROPERTY_DATASOURCE, + "http://localhost:8080/xmla"); + configOdcWriter.update(dict); + + configAutoODC = ca.getFactoryConfiguration(org.eclipse.daanse.olap.odc.simple.api.Constants.AUTO_ODC_PID, + CONFIG_IDENT, "?"); + dict = new Hashtable<>(); + configAutoODC.update(dict); + + } + @Deactivate public void deactivate() throws IOException { logger.info("Deactivating ProbeSetup"); @@ -184,6 +204,14 @@ public void deactivate() throws IOException { configAutoDocumenter.delete(); } + if (configAutoODC != null) { + configAutoODC.delete(); + } + + if (configOdcWriter != null) { + configOdcWriter.delete(); + } + logger.info("ProbeSetup deactivation completed"); } diff --git a/application/probe/zip_assembly.xml b/application/probe/zip_assembly.xml index e62e13a..fca8862 100644 --- a/application/probe/zip_assembly.xml +++ b/application/probe/zip_assembly.xml @@ -56,5 +56,12 @@ **/* + + ${project.basedir}/output + output + + **/* + + \ No newline at end of file