Merge remote-tracking branch 'origin/unstable' into testing

[gpl/argeo-suite.git] / org.argeo.entity.core / src / org / argeo / entity / core / JcrEntityDefinition.java

diff --git a/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java b/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java
index f76eb63fa96491b4df5874f246ff896de56cdfa1..6eb086da2f40d6bfb1e2e60824674d50b4b661d9 100644 (file)
--- a/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java
+++ b/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java
@@ -10,10 +10,7 @@ import javax.jcr.Session;
 import org.argeo.api.NodeUtils;
 import org.argeo.entity.EntityConstants;
 import org.argeo.entity.EntityDefinition;
-import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityTypes;
 import org.argeo.jcr.Jcr;
-import org.argeo.jcr.JcrUtils;
 import org.osgi.framework.BundleContext;
 
 /** An entity definition based on a JCR data structure. */
@@ -21,7 +18,7 @@ public class JcrEntityDefinition implements EntityDefinition {
        private Repository repository;
 
        private String type;
-       private String defaultEditoryId;
+       private String defaultEditorId;
 
        public void init(BundleContext bundleContext, Map<String, String> properties) throws RepositoryException {
                Session adminSession = NodeUtils.openDataAdminSession(repository, null);
@@ -29,13 +26,13 @@ public class JcrEntityDefinition implements EntityDefinition {
                        type = properties.get(EntityConstants.TYPE);
                        if (type == null)
                                throw new IllegalArgumentException("Entity type property " + EntityConstants.TYPE + " must be set.");
-                       defaultEditoryId = properties.get(EntityConstants.DEFAULT_EDITORY_ID);
-                       String definitionPath = EntityNames.ENTITY_DEFINITIONS_PATH + '/' + type;
-                       if (!adminSession.itemExists(definitionPath)) {
-                               Node entityDefinition = JcrUtils.mkdirs(adminSession, definitionPath, EntityTypes.ENTITY_DEFINITION);
-//                             entityDefinition.addMixin(EntityTypes.ENTITY_DEFINITION);
-                               adminSession.save();
-                       }
+                       defaultEditorId = properties.get(EntityConstants.DEFAULT_EDITOR_ID);
+//                     String definitionPath = EntityNames.ENTITY_DEFINITIONS_PATH + '/' + type;
+//                     if (!adminSession.itemExists(definitionPath)) {
+//                             Node entityDefinition = JcrUtils.mkdirs(adminSession, definitionPath, EntityTypes.ENTITY_DEFINITION);
+////                           entityDefinition.addMixin(EntityTypes.ENTITY_DEFINITION);
+//                             adminSession.save();
+//                     }
                        initJcr(adminSession);
                } finally {
                        Jcr.logout(adminSession);
@@ -53,7 +50,7 @@ public class JcrEntityDefinition implements EntityDefinition {
 
        @Override
        public String getEditorId(Node entity) {
-               return defaultEditoryId;
+               return defaultEditorId;
        }
 
        @Override