projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d339543
)
Adapt after connect refactoring
author
bsinou <bsinou@argeo.org>
Mon, 27 Mar 2017 19:34:09 +0000
(21:34 +0200)
committer
bsinou <bsinou@argeo.org>
Mon, 27 Mar 2017 19:34:09 +0000
(21:34 +0200)
org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
patch
|
blob
|
history
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
patch
|
blob
|
history
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.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.argeo.connect.AppService;
import org.argeo.connect.SystemAppService;
import org.argeo.connect.AppService;
import org.argeo.connect.SystemAppService;
@@
-17,11
+18,11
@@
public class DefaultSuiteAppService implements SystemAppService {
private List<AppService> knownAppServices;
@Override
private List<AppService> knownAppServices;
@Override
- public Node
create
Entity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode)
+ public Node
publish
Entity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode)
throws RepositoryException {
for (AppService appService : knownAppServices) {
if (appService.isKnownType(nodeType))
throws RepositoryException {
for (AppService appService : knownAppServices) {
if (appService.isKnownType(nodeType))
- return appService.
create
Entity(parent, nodeType, srcNode, removeSrcNode);
+ return appService.
publish
Entity(parent, nodeType, srcNode, removeSrcNode);
}
return null;
}
}
return null;
}
@@
-51,10
+52,10
@@
public class DefaultSuiteAppService implements SystemAppService {
}
@Override
}
@Override
- public String getDefaultRelPath(String nodetype, String id) {
+ public String getDefaultRelPath(S
ession session, S
tring nodetype, String id) {
for (AppService appService : knownAppServices) {
if (appService.isKnownType(nodetype))
for (AppService appService : knownAppServices) {
if (appService.isKnownType(nodetype))
- return appService.getDefaultRelPath(nodetype, id);
+ return appService.getDefaultRelPath(
session,
nodetype, id);
}
return null;
}
}
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);
tmpPerson.setProperty(PEOPLE_FIRST_NAME, firstName);
if (EclipseUiUtils.notEmpty(lastName))
tmpPerson.setProperty(PEOPLE_LAST_NAME, lastName);
- Node newPersonNode = peopleService.
create
Entity(targetParent, PeopleTypes.PEOPLE_PERSON, tmpPerson);
+ Node newPersonNode = peopleService.
publish
Entity(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
// 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));
if (notEmpty(tagsStr))
tmpOrg.setProperty(ResourcesNames.CONNECT_TAGS, ConnectJcrUtils.parseAndClean(tagsStr, ",", true));
- Node newOrgNode = peopleService.
create
Entity(targetParent, PeopleTypes.PEOPLE_ORG, tmpOrg);
+ Node newOrgNode = peopleService.
publish
Entity(targetParent, PeopleTypes.PEOPLE_ORG, tmpOrg);
// Save the newly created entity without creating a base version
newOrgNode = peopleService.saveEntity(newOrgNode, false);
// Save the newly created entity without creating a base version
newOrgNode = peopleService.saveEntity(newOrgNode, false);