From 4186dac38affdaff2550aef65fbc37fe3463c3ff Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 27 Aug 2017 13:40:42 +0200 Subject: [PATCH] Remove core module --- .../META-INF/spring/backend-services.xml | 2 +- .../META-INF/spring/maintenance-services.xml | 2 +- .../META-INF/spring/workbench-services.xml | 2 +- org.argeo.suite.core/.classpath | 7 -- org.argeo.suite.core/.gitignore | 3 - org.argeo.suite.core/.project | 25 ---- org.argeo.suite.core/META-INF/.gitignore | 1 - org.argeo.suite.core/bnd.bnd | 11 -- org.argeo.suite.core/build.properties | 3 - org.argeo.suite.core/pom.xml | 31 ----- .../src/org/argeo/suite/ArgeoSuiteRole.java | 14 --- .../src/org/argeo/suite/SuiteConstants.java | 9 -- .../src/org/argeo/suite/SuiteException.java | 14 --- .../suite/core/DefaultSuiteAppService.java | 107 ------------------ .../core/DefaultSuiteMaintenanceService.java | 106 ----------------- org.argeo.suite.web/pom.xml | 5 - org.argeo.suite.workbench.rap/pom.xml | 14 ++- .../DefaultSuiteWorkbenchService.java | 85 -------------- .../workbench/SuiteWorkbenchException.java | 17 +++ .../workbench/commands/ImportEntities.java | 10 +- .../parts/DefaultDashboardEditor.java | 4 +- .../workbench/parts/QuickSearchView.java | 4 +- pom.xml | 1 - 23 files changed, 39 insertions(+), 438 deletions(-) delete mode 100644 org.argeo.suite.core/.classpath delete mode 100644 org.argeo.suite.core/.gitignore delete mode 100644 org.argeo.suite.core/.project delete mode 100644 org.argeo.suite.core/META-INF/.gitignore delete mode 100644 org.argeo.suite.core/bnd.bnd delete mode 100644 org.argeo.suite.core/build.properties delete mode 100644 org.argeo.suite.core/pom.xml delete mode 100644 org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java delete mode 100644 org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java delete mode 100644 org.argeo.suite.core/src/org/argeo/suite/SuiteException.java delete mode 100644 org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java delete mode 100644 org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java delete mode 100644 org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java create mode 100644 org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchException.java diff --git a/org.argeo.suite.apps/META-INF/spring/backend-services.xml b/org.argeo.suite.apps/META-INF/spring/backend-services.xml index 3a6aad6..d8b2e4e 100644 --- a/org.argeo.suite.apps/META-INF/spring/backend-services.xml +++ b/org.argeo.suite.apps/META-INF/spring/backend-services.xml @@ -37,7 +37,7 @@ - + diff --git a/org.argeo.suite.apps/META-INF/spring/maintenance-services.xml b/org.argeo.suite.apps/META-INF/spring/maintenance-services.xml index 2c0e515..d4678f1 100644 --- a/org.argeo.suite.apps/META-INF/spring/maintenance-services.xml +++ b/org.argeo.suite.apps/META-INF/spring/maintenance-services.xml @@ -24,7 +24,7 @@ - diff --git a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml index d1fcfcd..9b0b6e2 100644 --- a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml +++ b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml @@ -34,7 +34,7 @@ - + diff --git a/org.argeo.suite.core/.classpath b/org.argeo.suite.core/.classpath deleted file mode 100644 index 191b71a..0000000 --- a/org.argeo.suite.core/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.argeo.suite.core/.gitignore b/org.argeo.suite.core/.gitignore deleted file mode 100644 index 016bb39..0000000 --- a/org.argeo.suite.core/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -/*.target -/bin/ diff --git a/org.argeo.suite.core/.project b/org.argeo.suite.core/.project deleted file mode 100644 index e3b8ec5..0000000 --- a/org.argeo.suite.core/.project +++ /dev/null @@ -1,25 +0,0 @@ - - - org.argeo.suite.core - - - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.pde.ManifestBuilder - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.suite.core/META-INF/.gitignore b/org.argeo.suite.core/META-INF/.gitignore deleted file mode 100644 index 4854a41..0000000 --- a/org.argeo.suite.core/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/org.argeo.suite.core/bnd.bnd b/org.argeo.suite.core/bnd.bnd deleted file mode 100644 index f18e99f..0000000 --- a/org.argeo.suite.core/bnd.bnd +++ /dev/null @@ -1,11 +0,0 @@ -Require-Capability: cms.datamodel; filter:="(name=people)",\ -cms.datamodel; filter:="(name=documents)",\ -cms.datamodel; filter:="(name=tracker)" -Import-Package:\ -javax.jcr.nodetype,\ -org.argeo.connect.resources,\ -org.argeo.node,\ -org.argeo.util,\ -javax.jcr.security,\ -* - diff --git a/org.argeo.suite.core/build.properties b/org.argeo.suite.core/build.properties deleted file mode 100644 index 3166058..0000000 --- a/org.argeo.suite.core/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -source.. = src/ -output.. = bin/ - diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml deleted file mode 100644 index aacf2e7..0000000 --- a/org.argeo.suite.core/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - org.argeo.suite - argeo-suite - 0.1.12-SNAPSHOT - .. - - org.argeo.suite.core - Argeo Suite Core - jar - - - - org.argeo.connect - org.argeo.tracker - ${version.argeo-connect} - - - org.argeo.connect - org.argeo.people.core - ${version.argeo-connect} - - - org.argeo.connect - org.argeo.documents - ${version.argeo-connect} - - - diff --git a/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java b/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java deleted file mode 100644 index 31ddca3..0000000 --- a/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.argeo.suite; - -import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; - -/** Argeo Office specific roles used in the code */ -public enum ArgeoSuiteRole { - coworker, manager; - - public String dn() { - return new StringBuilder(LdapAttrs.cn.name()).append("=").append(SuiteConstants.SUITE_APP_PREFIX).append(".") - .append(name()).append(",").append(NodeConstants.ROLES_BASEDN).toString(); - } -} diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java deleted file mode 100644 index 06c28e4..0000000 --- a/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.argeo.suite; - -/** Argeo Suite constants */ -public interface SuiteConstants { - - String SUITE_APP_PREFIX = "org.argeo.suite"; - String SUITE_APP_BASE_NAME = "suite"; - -} diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteException.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteException.java deleted file mode 100644 index 6351804..0000000 --- a/org.argeo.suite.core/src/org/argeo/suite/SuiteException.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.argeo.suite; - -/** Argeo Suite specific exception. Wraps a usual RuntimeException */ -public class SuiteException extends RuntimeException { - private static final long serialVersionUID = 9048360857209165816L; - - public SuiteException(String message) { - super(message); - } - - public SuiteException(String message, Throwable e) { - super(message, e); - } -} 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 deleted file mode 100644 index b87527a..0000000 --- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.argeo.suite.core; - -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; -import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.suite.SuiteConstants; -import org.argeo.suite.SuiteException; - -public class DefaultSuiteAppService implements SystemAppService { - - // Injected known AppWorkbenchServices: order is important, first found - // result will be returned by the various methods. - private List knownAppServices; - - @Override - public Node publishEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode) - throws RepositoryException { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(nodeType)) - return appService.publishEntity(parent, nodeType, srcNode, removeSrcNode); - } - return null; - } - - @Override - public String getAppBaseName() { - return SuiteConstants.SUITE_APP_BASE_NAME; - } - - @Override - public String getBaseRelPath(String nodeType) { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(nodeType)) - return appService.getBaseRelPath(nodeType); - } - return null; - // return getAppBaseName(); - } - - @Override - public String getDefaultRelPath(Node entity) throws RepositoryException { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(entity)) - return appService.getDefaultRelPath(entity); - } - return null; - } - - @Override - public String getMainNodeType(Node node) { - for (AppService appService : knownAppServices) { - String foundType = appService.getMainNodeType(node); - if (EclipseUiUtils.notEmpty(foundType)) - return foundType; - } - return null; - } - - @Override - public String getDefaultRelPath(Session session, String nodetype, String id) { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(nodetype)) - return appService.getDefaultRelPath(session, nodetype, id); - } - return null; - } - - /** Insures the correct service is called on save */ - @Override - public Node saveEntity(Node entity, boolean publish) { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(entity)) - return appService.saveEntity(entity, publish); - } - throw new SuiteException("Unknown NodeType for " + entity + ". Cannot save"); - // return AppService.super.saveEntity(entity, publish); - } - - @Override - public boolean isKnownType(Node entity) { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(entity)) - return true; - } - return false; - } - - @Override - public boolean isKnownType(String nodeType) { - for (AppService appService : knownAppServices) { - if (appService.isKnownType(nodeType)) - return true; - } - return false; - } - - public void setKnownAppServices(List knownAppServices) { - this.knownAppServices = knownAppServices; - } - -} diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java deleted file mode 100644 index 1c9feb2..0000000 --- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.argeo.suite.core; - -import java.util.List; - -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; -import javax.jcr.security.Privilege; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.connect.AppMaintenanceService; -import org.argeo.connect.SystemMaintenanceService; -import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.suite.ArgeoSuiteRole; -import org.argeo.suite.SuiteException; - -/** Make the DJay-ing to provide a full running Suite platform */ -public class DefaultSuiteMaintenanceService implements SystemMaintenanceService { - private final static Log log = LogFactory.getLog(DefaultSuiteMaintenanceService.class); - - /* DEPENDENCY INJECTION */ - private Repository repository; - private String workspaceName; - private List maintenanceServices; - - public void init() { - Session adminSession = null; - try { - adminSession = repository.login(workspaceName); - if (prepareJcrTree(adminSession)) { - configurePrivileges(adminSession); - } - } catch (Exception e) { - throw new SuiteException("Cannot initialise model", e); - } finally { - JcrUtils.logoutQuietly(adminSession); - } - } - - // To be cleaned once first init and config mechanisms have been implemented - // private final static String publicPath = "/public"; - // FIXME Users must have read access on the jcr:system/jcr:versionStorage - // node under JackRabbit to be able to manage versions - private final static String jackRabbitVersionSystemPath = "/jcr:system"; - - @Override - public boolean prepareJcrTree(Session session) { - boolean hasCHanged = false; - try { - // JcrUtils.mkdirs(session, publicPath, NodeType.NT_UNSTRUCTURED); - if (session.hasPendingChanges()) { - session.save(); - hasCHanged = true; - } - } catch (RepositoryException e) { - throw new SuiteException("Cannot build model", e); - } - for (AppMaintenanceService service : maintenanceServices) - hasCHanged |= service.prepareJcrTree(session); - if (hasCHanged) - log.info("Repository has been initialised with Argeo Suite model"); - return hasCHanged; - } - - @Override - public void configurePrivileges(Session session) { - try { - // Remove unused default JCR rights - JcrUtils.clearAccessControList(session, "/", "everyone"); - - JcrUtils.addPrivilege(session, jackRabbitVersionSystemPath, ArgeoSuiteRole.coworker.dn(), - Privilege.JCR_READ); - // Default configuration of the workspace - JcrUtils.addPrivilege(session, "/", NodeConstants.ROLE_ADMIN, Privilege.JCR_ALL); - // JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_USER, Privilege.JCR_READ); - // JcrUtils.addPrivilege(session, publicPath, "anonymous", Privilege.JCR_READ); - // JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_ANONYMOUS, Privilege.JCR_READ); - - session.save(); - } catch (RepositoryException e) { - throw new SuiteException("Cannot build model", e); - } - for (AppMaintenanceService service : maintenanceServices) - service.configurePrivileges(session); - log.info("Access control configured"); - } - - public void destroy() { - } - - /* DEPENDENCY INJECTION */ - public void setRepository(Repository repository) { - this.repository = repository; - } - - public void setWorkspaceName(String workspaceName) { - this.workspaceName = workspaceName; - } - - public void setMaintenanceServices(List maintenanceServices) { - this.maintenanceServices = maintenanceServices; - } -} diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml index 25494aa..31e64e4 100644 --- a/org.argeo.suite.web/pom.xml +++ b/org.argeo.suite.web/pom.xml @@ -11,11 +11,6 @@ Argeo Suite Web UI jar - - org.argeo.suite - org.argeo.suite.core - 0.1.12-SNAPSHOT - org.argeo.connect org.argeo.people.web diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml index 7f3cffb..9314021 100644 --- a/org.argeo.suite.workbench.rap/pom.xml +++ b/org.argeo.suite.workbench.rap/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo.suite @@ -12,9 +13,14 @@ jar - org.argeo.suite - org.argeo.suite.core - 0.1.12-SNAPSHOT + org.argeo.connect + org.argeo.documents + ${version.argeo-connect} + + + org.argeo.connect + org.argeo.tracker + ${version.argeo-connect} org.argeo.connect diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java deleted file mode 100644 index ea909bf..0000000 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.argeo.suite.workbench; - -import java.util.List; - -import javax.jcr.Node; - -import org.argeo.connect.workbench.AppWorkbenchService; -import org.argeo.connect.workbench.SystemWorkbenchService; -import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.suite.workbench.parts.DefaultDashboardEditor; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.swt.graphics.Image; - -/** Centralise workbench services from the various base apps */ -public class DefaultSuiteWorkbenchService implements SystemWorkbenchService { - - // Injected known AppWorkbenchServices: order is important, first found - // result will be returned by the various methods. - private List knownAppWbServices; - private String defaultEditorId = DefaultDashboardEditor.ID; - - @Override - public String getDefaultEditorId() { - String result = null; - for (AppWorkbenchService appWbService : knownAppWbServices) { - result = appWbService.getDefaultEditorId(); - if (EclipseUiUtils.notEmpty(result)) - return result; - } - return defaultEditorId; - } - - @Override - public String getEntityEditorId(Node entity) { - String result = null; - for (AppWorkbenchService appWbService : knownAppWbServices) { - result = appWbService.getEntityEditorId(entity); - if (EclipseUiUtils.notEmpty(result)) - return result; - } - return null; - } - - @Override - public String getSearchEntityEditorId(String nodeType) { - String result = null; - for (AppWorkbenchService appWbService : knownAppWbServices) { - result = appWbService.getSearchEntityEditorId(nodeType); - if (EclipseUiUtils.notEmpty(result)) - return result; - } - return null; - } - - @Override - public Image getIconForType(Node entity) { - Image result = null; - for (AppWorkbenchService appWbService : knownAppWbServices) { - result = appWbService.getIconForType(entity); - if (result != null) - return result; - } - return null; - } - - @Override - public Wizard getCreationWizard(Node node) { - Wizard result = null; - for (AppWorkbenchService appWbService : knownAppWbServices) { - result = appWbService.getCreationWizard(node); - if (result != null) - return result; - } - return null; - } - - /* DEPENDENCY INJECTION */ - public void setKnownAppWbServices(List knownAppWbServices) { - this.knownAppWbServices = knownAppWbServices; - } - - public void setDefaultEditorId(String defaultEditorId) { - this.defaultEditorId = defaultEditorId; - } -} diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchException.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchException.java new file mode 100644 index 0000000..dbc3333 --- /dev/null +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchException.java @@ -0,0 +1,17 @@ +package org.argeo.suite.workbench; + +public class SuiteWorkbenchException extends RuntimeException { + private static final long serialVersionUID = 5276857785523513563L; + + public SuiteWorkbenchException(String message) { + super(message); + } + + public SuiteWorkbenchException(Throwable cause) { + super(cause); + } + + public SuiteWorkbenchException(String message, Throwable cause) { + super(message, cause); + } +} 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 3965506..1771486 100644 --- 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 @@ -41,7 +41,7 @@ import org.argeo.people.PeopleService; import org.argeo.people.PeopleTypes; import org.argeo.people.util.PeopleJcrUtils; import org.argeo.people.util.PersonJcrUtils; -import org.argeo.suite.SuiteException; +import org.argeo.suite.workbench.SuiteWorkbenchException; import org.argeo.suite.workbench.AsUiPlugin; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -130,7 +130,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames { userInputPage = new UserInputPage("User input page"); addPage(userInputPage); } catch (Exception e) { - throw new SuiteException("Cannot add page to wizard", e); + throw new SuiteWorkbenchException("Cannot add page to wizard", e); } } @@ -147,7 +147,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames { else if (PeopleTypes.PEOPLE_PERSON.equals(type)) importDefaultPersonFile(in); } catch (IOException e) { - throw new SuiteException("Cannot import mapping file", e); + throw new SuiteWorkbenchException("Cannot import mapping file", e); } finally { IOUtils.closeQuietly(in); } @@ -400,7 +400,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames { resourcesService.refreshKnownTags(mlParent); } catch (PeopleException | RepositoryException e) { - throw new SuiteException("Cannot import mapping file, error at line: " + (i + 1), e); + throw new SuiteWorkbenchException("Cannot import mapping file, error at line: " + (i + 1), e); } finally { JcrUtils.logoutQuietly(session); } @@ -570,7 +570,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames { String message = "Cannot import mapping file, error at line: " + (i + 1); // TODO Check why the error is swallowed. log.error(message, e); - throw new SuiteException(message, e); + throw new SuiteWorkbenchException(message, e); } finally { JcrUtils.logoutQuietly(session); } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java index 82591e5..535dc7c 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java @@ -26,7 +26,7 @@ import org.argeo.connect.workbench.commands.OpenEntityEditor; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.node.NodeUtils; -import org.argeo.suite.SuiteException; +import org.argeo.suite.workbench.SuiteWorkbenchException; import org.argeo.suite.workbench.AsUiPlugin; import org.argeo.tracker.TrackerNames; import org.argeo.tracker.TrackerService; @@ -168,7 +168,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re Calendar now = GregorianCalendar.getInstance(); return node.hasProperty(propName) && node.getProperty(propName).getDate().before(now); } catch (RepositoryException e) { - throw new SuiteException("Cannot check overdue status with property " + propName + " on " + node, e); + throw new SuiteWorkbenchException("Cannot check overdue status with property " + propName + " on " + node, e); } } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java index c9e9bf1..950b7c5 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java @@ -26,7 +26,7 @@ import org.argeo.connect.workbench.util.JcrViewerDClickListener; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.people.PeopleService; -import org.argeo.suite.SuiteException; +import org.argeo.suite.workbench.SuiteWorkbenchException; import org.argeo.suite.workbench.AsUiPlugin; import org.argeo.suite.workbench.internal.EntitySingleColumnLabelProvider; import org.eclipse.jface.layout.TableColumnLayout; @@ -202,7 +202,7 @@ public class QuickSearchView extends ViewPart implements Refreshable { + " ms by executing XPath query (" + xpathQueryStr + ")."); } } catch (RepositoryException e) { - throw new SuiteException("Unable to list entities", e); + throw new SuiteWorkbenchException("Unable to list entities", e); } } diff --git a/pom.xml b/pom.xml index 9ce0c5f..c6f09cd 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,6 @@ 0.1.12-SNAPSHOT - org.argeo.suite.core org.argeo.suite.web org.argeo.suite.workbench.rap org.argeo.suite.apps -- 2.30.2