Load typologies from the same package as maintenance by default

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 4b69883961c01f7b12501d939bcedef8f94cd258..1c0e26dafd48c7df255ba5efec696e8f98ffc98b 100644 (file)
--- 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() {
        }
 
        protected String getTypologiesLoadBase() {

-               return "/sys/terms";
+               return "";

        }
 
        protected void loadTypologies(Node customBaseNode) throws RepositoryException, IOException {
        }
 
        protected void loadTypologies(Node customBaseNode) throws RepositoryException, IOException {


@@ -44,8 +44,10 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic
                try {
 //                     if (termsBase.hasNode(name))
 //                             return;
                try {
 //                     if (termsBase.hasNode(name))
 //                             return;

-
-                       String termsLoadPath = getTypologiesLoadBase() + '/' + name + ".xml";
+                       String typologiesLoadBase = getTypologiesLoadBase();
+                       if (typologiesLoadBase.contains("/") && !typologiesLoadBase.endsWith("/"))
+                               typologiesLoadBase = typologiesLoadBase + "/";
+                       String termsLoadPath = typologiesLoadBase + name + ".xml";

                        URL termsUrl = getClass().getClassLoader().getResource(termsLoadPath);
                        if (termsUrl == null)
                                throw new IllegalArgumentException("Terms '" + name + "' not found.");
                        URL termsUrl = getClass().getClassLoader().getResource(termsLoadPath);
                        if (termsUrl == null)
                                throw new IllegalArgumentException("Terms '" + name + "' not found.");