From abce5b8ec3251b46f85f62a3477aad45d3f817c2 Mon Sep 17 00:00:00 2001 From: Marvin Beym Date: Fri, 7 Aug 2026 14:25:25 +0200 Subject: [PATCH] Fix Lucene indexing for plugins --- .../object/ObjectDefinitionReader.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/components/ILIAS/WebServices/RPC/lib/src/main/java/de/ilias/services/object/ObjectDefinitionReader.java b/components/ILIAS/WebServices/RPC/lib/src/main/java/de/ilias/services/object/ObjectDefinitionReader.java index e15548299056..adcf9733c407 100755 --- a/components/ILIAS/WebServices/RPC/lib/src/main/java/de/ilias/services/object/ObjectDefinitionReader.java +++ b/components/ILIAS/WebServices/RPC/lib/src/main/java/de/ilias/services/object/ObjectDefinitionReader.java @@ -37,17 +37,17 @@ public class ObjectDefinitionReader { private static final Logger logger = LogManager.getLogger(ObjectDefinitionReader.class); private static final HashMap instances = new HashMap(); - + public static final String objectPropertyName = "LuceneObjectDefinition.xml"; - public static final String pluginPath = "Customizing/global/plugins"; + public static final String pluginPath = "public/Customizing/global/plugins"; public static final String componentPath = "components"; private final Vector objectPropertyFiles = new Vector(); - + File absolutePath; ClientSettings clientSettings; - + private ObjectDefinitionReader(ClientSettings settings) throws ConfigurationException { this.clientSettings = settings; this.absolutePath = settings.getAbsolutePath(); @@ -77,11 +77,11 @@ public Vector getObjectPropertyFiles() { } /** - * + * * @throws ConfigurationException */ private void read() throws ConfigurationException { - + logger.debug("Start reading search index definitions..."); if(!absolutePath.isDirectory()) { throw new ConfigurationException("Absolute path required. Path: " + absolutePath.getAbsolutePath()); @@ -116,14 +116,19 @@ private void traverseByVersion8() { } private void traverseByVersion10() { - // Traverse through Plugins - File plugin = new File(absolutePath.getAbsoluteFile() + System.getProperty("file.separator") + ObjectDefinitionReader.componentPath); - logger.debug("Start path is : " + plugin.getAbsoluteFile()); - traverse(plugin); + // Traverse through Components + File component = new File(absolutePath.getAbsoluteFile() + System.getProperty("file.separator") + ObjectDefinitionReader.componentPath); + logger.debug("Start path is : " + component.getAbsoluteFile()); + traverse(component); + + // Traverse through Plugins + File plugin = new File(absolutePath.getAbsoluteFile() + System.getProperty("file.separator") + ObjectDefinitionReader.pluginPath); + logger.debug("Start path is : " + plugin.getAbsoluteFile()); + traverse(plugin); } - + private void traverse(File dir) { - + if(dir == null) { return; } @@ -133,7 +138,7 @@ private void traverse(File dir) { new FileFilter() { public boolean accept(File path) { - + if(path.isDirectory()) { //logger.debug("Found new directory: " + path.getAbsolutePath()); return !path.getName().equals(".svn");