Clarify and refactor content namespaces

[gpl/argeo-suite.git] / org.argeo.app.core / src / org / argeo / app / core / SuiteMaintenanceService.java

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
index ce90a873b0f9ff20210bb613fefe983c810d3803..9cc47d7bbf189ef866f65340c6f357e2317d9d5b 100644 (file)
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
@@ -8,7 +8,6 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.Privilege;
 
-import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.app.api.EntityType;
 import org.argeo.jcr.JcrUtils;
@@ -16,16 +15,15 @@ import org.argeo.maintenance.AbstractMaintenanceService;
 
 /** Initialises an Argeo Suite backend. */
 public class SuiteMaintenanceService extends AbstractMaintenanceService {
-       private ProvidedRepository contentRepository;
-
        @Override
        public void init() {
                super.init();
 
-               for (SuiteContentTypes types : SuiteContentTypes.values()) {
-                       contentRepository.registerTypes(types.getDefaultPrefix(), types.getNamespace(),
-                                       types.getResource().toExternalForm());
-               }
+               getContentRepository().registerTypes(SuiteContentNamespace.values());
+//             for (SuiteContentTypes types : SuiteContentTypes.values()) {
+//                     getContentRepository().registerTypes(types.getDefaultPrefix(), types.getNamespace(),
+//                                     types.getResource() != null ? types.getResource().toExternalForm() : null);
+//             }
        }
 
        @Override
@@ -49,8 +47,4 @@ public class SuiteMaintenanceService extends AbstractMaintenanceService {
                // Privilege.JCR_READ);
        }
 
-       public void setContentRepository(ProvidedRepository contentRepository) {
-               this.contentRepository = contentRepository;
-       }
-
 }