Skip to content

output folder and odc file generator #36

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
Sep 2, 2025
Merged

output folder and odc file generator #36

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
8231df0
add output folder to probe default zip setup
stbischof Sep 2, 2025
d4bc5ea
configure and use odc auto generator
stbischof Sep 2, 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
2 changes: 1 addition & 1 deletion application/probe/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion application/probe/daanse.probe.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)',\
Expand Down
8 changes: 8 additions & 0 deletions application/probe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@
<scope>compile</scope>
</dependency>

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

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
28 changes: 28 additions & 0 deletions application/probe/src/main/java/org/eclipse/daanse/server/application/probe/Probe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -73,6 +77,7 @@ public void activate() throws IOException {
initFileListener();
initContextGroup();
initDocumenter();
initODC();

logger.info("ProbeSetup activation completed");
}
Expand Down Expand Up @@ -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<String, Object> 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");
Expand All @@ -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");
}

Expand Down
7 changes: 7 additions & 0 deletions application/probe/zip_assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,12 @@
<include>**/*</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/output</directory>
<outputDirectory>output</outputDirectory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
</fileSets>
</assembly>
Loading