diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index 1a941ee..6818429 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -53,7 +53,8 @@ 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.olap.odc',\ - bnd.identity;id='org.apache.felix.http.servlet-api' + bnd.identity;id='org.apache.felix.http.servlet-api',\ + bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.noauth' # This will help us keep -runbundles sorted @@ -82,6 +83,7 @@ org.apache.felix.scr;version='[2.2.10,2.2.11)',\ org.eclipse.daanse.io.fs.watcher.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.io.fs.watcher.watchservice;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.noauth;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.role;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)',\ diff --git a/application/probe/pom.xml b/application/probe/pom.xml index 4249dac..b59f4dd 100644 --- a/application/probe/pom.xml +++ b/application/probe/pom.xml @@ -122,6 +122,14 @@ compile + + org.eclipse.daanse + + org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.noauth + 0.0.1-SNAPSHOT + compile + + org.eclipse.daanse 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 fbda2bb..6731fb9 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 @@ -18,6 +18,7 @@ import java.util.Hashtable; import org.eclipse.daanse.io.fs.watcher.api.FileSystemWatcherWhiteboardConstants; +import org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.noauth.NoAuthDummyFilter; import org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.role.BasicAuthPipeRoleFilter; import org.eclipse.daanse.olap.core.api.Constants; import org.osgi.service.cm.Configuration; @@ -55,7 +56,7 @@ public class Probe { private Configuration confContextGroupXmlaService; private Configuration confDataSource; private Configuration confContextGroup; - private Configuration configRoleAuthFilter; + private Configuration configAuthFilter; private Configuration configDocumenterMarkdown; private Configuration configAutoDocumenter; @@ -116,11 +117,13 @@ private void initXmlaService() throws IOException { private void initRoleAuthFilter() throws IOException { - configRoleAuthFilter = ca.getFactoryConfiguration(BasicAuthPipeRoleFilter.PID, CONFIG_IDENT, "?"); + configAuthFilter = ca.getFactoryConfiguration(NoAuthDummyFilter.PID, CONFIG_IDENT, "?"); + +// configAuthFilter = ca.getFactoryConfiguration(BasicAuthPipeRoleFilter.PID, CONFIG_IDENT, "?"); Dictionary dict = new Hashtable<>(); dict.put("osgi.http.whiteboard.filter.pattern", "/*"); - configRoleAuthFilter.update(dict); + configAuthFilter.update(dict); } @@ -186,8 +189,8 @@ public void deactivate() throws IOException { if (configXmlaEndpoint != null) { configXmlaEndpoint.delete(); } - if (configRoleAuthFilter != null) { - configRoleAuthFilter.delete(); + if (configAuthFilter != null) { + configAuthFilter.delete(); } if (configCorsFilter != null) { configCorsFilter.delete();