X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.core%2Fsrc%2Forg%2Fargeo%2Fapp%2Fcore%2FCustomMaintenanceService.java;h=a4b1fff691520c09ad165b9792e0ed21125888c7;hb=618968cf9d259ccded45a9455a26c516dbfe828f;hp=4b69883961c01f7b12501d939bcedef8f94cd258;hpb=942fd932e1f6ed3319575c4c1d944912dfca9fa5;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java b/org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java index 4b69883..a4b1fff 100644 --- a/org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java +++ b/org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java @@ -25,7 +25,7 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic } protected String getTypologiesLoadBase() { - return "/sys/terms"; + return ""; } protected void loadTypologies(Node customBaseNode) throws RepositoryException, IOException { @@ -44,9 +44,11 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic try { // if (termsBase.hasNode(name)) // return; - - String termsLoadPath = getTypologiesLoadBase() + '/' + name + ".xml"; - URL termsUrl = getClass().getClassLoader().getResource(termsLoadPath); + String typologiesLoadBase = getTypologiesLoadBase(); + if (typologiesLoadBase.contains("/") && !typologiesLoadBase.endsWith("/")) + typologiesLoadBase = typologiesLoadBase + "/"; + String termsLoadPath = typologiesLoadBase + name + ".xml"; + URL termsUrl = getClass().getResource(termsLoadPath); if (termsUrl == null) throw new IllegalArgumentException("Terms '" + name + "' not found."); try (InputStream in = termsUrl.openStream()) {