Adapt after connect refactoring

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
index ea5dc23e53996bda065ea034a876320630825387..24cf37dff2e4087c3d00fddd6ac1206a57c08e24 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 
 import org.argeo.connect.AppService;
 import org.argeo.connect.SystemAppService;
@@ -17,11 +18,11 @@ public class DefaultSuiteAppService implements SystemAppService {
        private List<AppService> knownAppServices;
 
        @Override
-       public Node createEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode)
+       public Node publishEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode)
                        throws RepositoryException {
                for (AppService appService : knownAppServices) {
                        if (appService.isKnownType(nodeType))
-                               return appService.createEntity(parent, nodeType, srcNode, removeSrcNode);
+                               return appService.publishEntity(parent, nodeType, srcNode, removeSrcNode);
                }
                return null;
        }
@@ -51,10 +52,10 @@ public class DefaultSuiteAppService implements SystemAppService {
        }
 
        @Override
-       public String getDefaultRelPath(String nodetype, String id) {
+       public String getDefaultRelPath(Session session, String nodetype, String id) {
                for (AppService appService : knownAppServices) {
                        if (appService.isKnownType(nodetype))
-                               return appService.getDefaultRelPath(nodetype, id);
+                               return appService.getDefaultRelPath(session, nodetype, id);
                }
                return null;
        }

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
index 640e90e79723c04732dcd9e22f49f9ae9d173ed0..769e807075b16b5e963fa2e1b2bee13fda338ba4 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
@@ -345,7 +345,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
                        tmpPerson.setProperty(PEOPLE_FIRST_NAME, firstName);
                        if (EclipseUiUtils.notEmpty(lastName))
                                tmpPerson.setProperty(PEOPLE_LAST_NAME, lastName);
-                       Node newPersonNode = peopleService.createEntity(targetParent, PeopleTypes.PEOPLE_PERSON, tmpPerson);
+                       Node newPersonNode = peopleService.publishEntity(targetParent, PeopleTypes.PEOPLE_PERSON, tmpPerson);
                        // if (EclipseUiUtils.notEmpty(position))
                        PersonJcrUtils.addJob(resourcesService, peopleService, newPersonNode, newOrgNode, position, true);
                        // Save the newly created entity without creating a base version
@@ -458,7 +458,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
                                if (notEmpty(tagsStr))
                                        tmpOrg.setProperty(ResourcesNames.CONNECT_TAGS, ConnectJcrUtils.parseAndClean(tagsStr, ",", true));
 
-                               Node newOrgNode = peopleService.createEntity(targetParent, PeopleTypes.PEOPLE_ORG, tmpOrg);
+                               Node newOrgNode = peopleService.publishEntity(targetParent, PeopleTypes.PEOPLE_ORG, tmpOrg);
                                // Save the newly created entity without creating a base version
                                newOrgNode = peopleService.saveEntity(newOrgNode, false);