wrapDoc, Action action)
String msg = "Unable to follow workflow transition to state = "
+ transitionToFollow;
logger.error(msg, e);
- ClientException ce = new ClientException("Unable to follow workflow transition: " + transitionToFollow);
- throw ce;
+ throw new NuxeoException("Unable to follow workflow transition: " + transitionToFollow);
}
}
diff --git a/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java b/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java
index d415f0acc8..bb8edf7b17 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java
@@ -28,7 +28,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.lang.NotImplementedException;
-import org.apache.commons.lang3.StringUtils;
/**
*
@@ -77,7 +76,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
chain.doFilter(requestWrapper, responseWrapper);
- if (StringUtils.equals(responseWrapper.getContentType(), MediaType.APPLICATION_XML)) {
+ final var contentType = response.getContentType();
+ if (contentType != null && contentType.startsWith(MediaType.APPLICATION_XML)) {
// Got an XML response. Translate it to JSON.
response.setContentType(MediaType.APPLICATION_JSON);
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java
index 65e18063cd..c6bbc4ee51 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java
@@ -3,9 +3,9 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.collectionspace.services.client.PoxPayloadOut;
import org.collectionspace.services.jaxb.AbstractCommonList;
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java
index b096964a91..db034c0eba 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java
@@ -37,10 +37,10 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
/**
* This class allows us to generically represent and marshall a set of list
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java
index 1c45a4805a..c3243ff5b2 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java
@@ -3,13 +3,13 @@
import java.security.Principal;
import org.collectionspace.services.common.document.DocumentException;
-import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
import org.nuxeo.ecm.core.api.DocumentRef;
import org.nuxeo.ecm.core.api.Filter;
import org.nuxeo.ecm.core.api.IterableQueryResult;
+import org.nuxeo.ecm.core.api.NuxeoException;
import org.nuxeo.ecm.core.api.event.DocumentEventTypes;
import org.nuxeo.ecm.core.api.impl.LifeCycleFilter;
@@ -25,10 +25,10 @@ public interface CoreSessionInterface {
* Gets the root document of this repository.
*
* @return the root document. cannot be null
- * @throws ClientException
+ * @throws NuxeoException
* @throws SecurityException
*/
- public DocumentModel getRootDocument() throws ClientException;
+ public DocumentModel getRootDocument() throws NuxeoException;
/**
* Gets the current session id.
@@ -60,12 +60,12 @@ public interface CoreSessionInterface {
public Principal getPrincipal();
public IterableQueryResult queryAndFetch(String query, String queryType,
- Object... params) throws ClientException, DocumentException;
+ Object... params) throws NuxeoException, DocumentException;
public DocumentModelList query(String query, Filter filter, long limit,
- long offset, boolean countTotal) throws ClientException, DocumentException;
+ long offset, boolean countTotal) throws NuxeoException, DocumentException;
- public DocumentModelList query(String query) throws ClientException, DocumentException;
+ public DocumentModelList query(String query) throws NuxeoException, DocumentException;
/**
* Executes the given NXQL query an returns the result.
@@ -73,10 +73,10 @@ public DocumentModelList query(String query, Filter filter, long limit,
* @param query the query to execute
* @param max number of document to retrieve
* @return the query result
- * @throws ClientException
+ * @throws NuxeoException
* @throws DocumentException
*/
- public DocumentModelList query(String query, int max) throws ClientException, DocumentException;
+ public DocumentModelList query(String query, int max) throws NuxeoException, DocumentException;
/**
* Executes the given NXQL query and returns the result that matches the
@@ -86,7 +86,7 @@ public DocumentModelList query(String query, Filter filter, long limit,
* @param filter the filter to apply to result
* @return the query result
* @throws DocumentException
- * @throws ClientException
+ * @throws NuxeoException
*/
public DocumentModelList query(String query, LifeCycleFilter workflowStateFilter) throws DocumentException;
@@ -101,30 +101,30 @@ public DocumentModelList query(String query, Filter filter, long limit,
*
* @param docRef the document reference
* @return the document
- * @throws ClientException
+ * @throws NuxeoException
* @throws SecurityException
*/
- public DocumentModel getDocument(DocumentRef docRef) throws ClientException;
+ public DocumentModel getDocument(DocumentRef docRef) throws NuxeoException;
- public DocumentModel saveDocument(DocumentModel docModel) throws ClientException;
+ public DocumentModel saveDocument(DocumentModel docModel) throws NuxeoException;
- public void save() throws ClientException;
+ public void save() throws NuxeoException;
/**
* Bulk document saving.
*
* @param docModels the document models that needs to be saved
- * @throws ClientException
+ * @throws NuxeoException
*/
- public void saveDocuments(DocumentModel[] docModels) throws ClientException;
+ public void saveDocuments(DocumentModel[] docModels) throws NuxeoException;
/**
* Removes this document and all its children, if any.
*
* @param docRef the reference to the document to remove
- * @throws ClientException
+ * @throws NuxeoException
*/
- public void removeDocument(DocumentRef docRef) throws ClientException;
+ public void removeDocument(DocumentRef docRef) throws NuxeoException;
/**
* Creates a document model using required information.
@@ -139,10 +139,10 @@ public DocumentModelList query(String query, Filter filter, long limit,
* @param id
* @param typeName
* @return the initial document model
- * @throws ClientException
+ * @throws NuxeoException
*/
public DocumentModel createDocumentModel(String parentPath, String id,
- String typeName) throws ClientException;
+ String typeName) throws NuxeoException;
/**
* Creates a document using given document model for initialization.
@@ -153,9 +153,9 @@ public DocumentModel createDocumentModel(String parentPath, String id,
*
* @param model the document model to use for initialization
* @return the created document
- * @throws ClientException
+ * @throws NuxeoException
*/
- public DocumentModel createDocument(DocumentModel model) throws ClientException;
+ public DocumentModel createDocument(DocumentModel model) throws NuxeoException;
/**
* Gets the children of the given parent.
@@ -163,9 +163,9 @@ public DocumentModel createDocumentModel(String parentPath, String id,
* @param parent the parent reference
* @return the children if any, an empty list if no children or null if the
* specified parent document is not a folder
- * @throws ClientException
+ * @throws NuxeoException
*/
- public DocumentModelList getChildren(DocumentRef parent) throws ClientException;
+ public DocumentModelList getChildren(DocumentRef parent) throws NuxeoException;
}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java
index 14459dfdf0..953e9ed5ca 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java
@@ -14,12 +14,12 @@
import java.util.regex.Pattern;
import org.collectionspace.services.common.document.DocumentException;
-import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
import org.nuxeo.ecm.core.api.DocumentRef;
import org.nuxeo.ecm.core.api.Filter;
import org.nuxeo.ecm.core.api.IterableQueryResult;
+import org.nuxeo.ecm.core.api.NuxeoException;
import org.nuxeo.ecm.core.api.event.DocumentEventTypes;
import org.nuxeo.ecm.core.api.impl.LifeCycleFilter;
import org.nuxeo.ecm.core.api.CoreSession;
@@ -96,11 +96,11 @@ public void close() throws Exception {
* Gets the root document of this repository.
*
* @return the root document. cannot be null
- * @throws ClientException
+ * @throws NuxeoException
* @throws SecurityException
*/
@Override
- public DocumentModel getRootDocument() throws ClientException {
+ public DocumentModel getRootDocument() throws NuxeoException {
return repoSession.getRootDocument();
}
@@ -171,7 +171,7 @@ private String localizeTimestamps(String query) throws DocumentException {
@Override
public IterableQueryResult queryAndFetch(String query, String queryType,
- Object... params) throws ClientException, DocumentException {
+ Object... params) throws NuxeoException, DocumentException {
query = localizeTimestamps(query);
logQuery(query, queryType);
return repoSession.queryAndFetch(query, queryType, params);
@@ -179,21 +179,21 @@ public IterableQueryResult queryAndFetch(String query, String queryType,
@Override
public DocumentModelList query(String query, Filter filter, long limit,
- long offset, boolean countTotal) throws ClientException, DocumentException {
+ long offset, boolean countTotal) throws NuxeoException, DocumentException {
query = localizeTimestamps(query);
logQuery(query, filter, limit, offset, countTotal);
return repoSession.query(query, filter, limit, offset, countTotal);
}
@Override
- public DocumentModelList query(String query, int max) throws ClientException, DocumentException {
+ public DocumentModelList query(String query, int max) throws NuxeoException, DocumentException {
query = localizeTimestamps(query);
logQuery(query);
return repoSession.query(query, max);
}
@Override
- public DocumentModelList query(String query) throws ClientException, DocumentException {
+ public DocumentModelList query(String query) throws NuxeoException, DocumentException {
query = localizeTimestamps(query);
logQuery(query);
return repoSession.query(query);
@@ -216,16 +216,16 @@ public DocumentModelList query(String query, LifeCycleFilter workflowStateFilter
*
* @param docRef the document reference
* @return the document
- * @throws ClientException
+ * @throws NuxeoException
* @throws SecurityException
*/
@Override
- public DocumentModel getDocument(DocumentRef docRef) throws ClientException {
+ public DocumentModel getDocument(DocumentRef docRef) throws NuxeoException {
return repoSession.getDocument(docRef);
}
@Override
- public DocumentModel saveDocument(DocumentModel docModel) throws ClientException {
+ public DocumentModel saveDocument(DocumentModel docModel) throws NuxeoException {
DocumentModel result = null;
try {
@@ -244,7 +244,7 @@ public DocumentModel saveDocument(DocumentModel docModel) throws ClientException
}
@Override
- public void save() throws ClientException {
+ public void save() throws NuxeoException {
try {
if (isTransactionMarkedForRollbackOnly() == false) {
repoSession.save();
@@ -262,10 +262,10 @@ public void save() throws ClientException {
* Bulk document saving.
*
* @param docModels the document models that needs to be saved
- * @throws ClientException
+ * @throws NuxeoException
*/
@Override
- public void saveDocuments(DocumentModel[] docModels) throws ClientException {
+ public void saveDocuments(DocumentModel[] docModels) throws NuxeoException {
try {
if (isTransactionMarkedForRollbackOnly() == false) {
repoSession.saveDocuments(docModels);
@@ -283,10 +283,10 @@ public void saveDocuments(DocumentModel[] docModels) throws ClientException {
* Removes this document and all its children, if any.
*
* @param docRef the reference to the document to remove
- * @throws ClientException
+ * @throws NuxeoException
*/
@Override
- public void removeDocument(DocumentRef docRef) throws ClientException {
+ public void removeDocument(DocumentRef docRef) throws NuxeoException {
repoSession.removeDocument(docRef);
}
@@ -303,11 +303,11 @@ public void removeDocument(DocumentRef docRef) throws ClientException {
* @param id
* @param typeName
* @return the initial document model
- * @throws ClientException
+ * @throws NuxeoException
*/
@Override
public DocumentModel createDocumentModel(String parentPath, String id,
- String typeName) throws ClientException {
+ String typeName) throws NuxeoException {
return repoSession.createDocumentModel(parentPath, id, typeName);
}
@@ -320,10 +320,10 @@ public DocumentModel createDocumentModel(String parentPath, String id,
*
* @param model the document model to use for initialization
* @return the created document
- * @throws ClientException
+ * @throws NuxeoException
*/
@Override
- public DocumentModel createDocument(DocumentModel model) throws ClientException {
+ public DocumentModel createDocument(DocumentModel model) throws NuxeoException {
return repoSession.createDocument(model);
}
@@ -333,10 +333,10 @@ public DocumentModel createDocument(DocumentModel model) throws ClientException
* @param parent the parent reference
* @return the children if any, an empty list if no children or null if the
* specified parent document is not a folder
- * @throws ClientException
+ * @throws NuxeoException
*/
@Override
- public DocumentModelList getChildren(DocumentRef parent) throws ClientException {
+ public DocumentModelList getChildren(DocumentRef parent) throws NuxeoException {
return repoSession.getChildren(parent);
}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
index 828260d44a..083a28250a 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
@@ -54,10 +54,10 @@
import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthRefConfigInfo;
import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier;
import org.collectionspace.services.lifecycle.Lifecycle;
-import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
-import org.nuxeo.ecm.core.api.model.PropertyException;
+import org.nuxeo.ecm.core.api.NuxeoException;
+import org.nuxeo.ecm.core.api.PropertyException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -264,7 +264,7 @@ protected RefName.RefNameInterface getRefName(DocumentWrapper doc
}
private void handleCoreValues(DocumentWrapper docWrapper,
- Action action) throws ClientException {
+ Action action) throws NuxeoException {
DocumentModel documentModel = docWrapper.getWrappedObject();
String now = GregorianCalendarDateTimeUtils.timestampUTC();
ServiceContext ctx = getServiceContext();
@@ -352,7 +352,7 @@ protected boolean hasRefNameUpdate() {
return result;
}
- protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws ClientException {
+ protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws NuxeoException {
// First get the old refName
this.oldRefNameOnUpdate = (String)docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,
CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME);
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java
index 559e3ccf49..38b05736c6 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java
@@ -23,24 +23,20 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
-import java.security.Principal;
+import javax.transaction.TransactionManager;
import org.collectionspace.services.common.context.ServiceContext;
import org.collectionspace.services.common.repository.RepositoryInstanceWrapperAdvice;
import org.collectionspace.services.config.tenant.RepositoryDomainType;
-import org.nuxeo.ecm.core.api.repository.Repository;
import org.nuxeo.ecm.core.api.CoreInstance;
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.api.NuxeoPrincipal;
import org.nuxeo.ecm.core.api.SystemPrincipal;
+import org.nuxeo.ecm.core.api.repository.Repository;
import org.nuxeo.ecm.core.api.repository.RepositoryManager;
import org.nuxeo.runtime.api.Framework;
import org.nuxeo.runtime.jtajca.NuxeoContainer;
import org.nuxeo.runtime.transaction.TransactionHelper;
-
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.ProxyFactory;
@@ -278,9 +274,8 @@ private CoreSessionInterface getAOPProxy(CoreSession repositoryInstance) {
return result;
}
- private Principal getSystemPrincipal() {
- NuxeoPrincipal principal = new SystemPrincipal(null);
- return principal;
+ private NuxeoPrincipal getSystemPrincipal() {
+ return new SystemPrincipal(null);
}
/*
@@ -291,31 +286,30 @@ private Principal getSystemPrincipal() {
*/
private CoreSessionInterface getCoreSessionWrapper(Repository repository) {
CoreSessionInterface result = null;
-
+
CoreSession coreSession = null;
try {
- coreSession = CoreInstance.openCoreSession(repository.getName(), getSystemPrincipal()); // A Nuxeo repo instance handler proxy
+ // A Nuxeo repo instance handler proxy
+ coreSession = CoreInstance.getCoreSession(repository.getName(), getSystemPrincipal());
} catch (Exception e) {
- logger.warn(String.format("Could not open a session to the '%s' repository. The current request to the CollectionSpace services API will fail.",
- repository != null ? repository.getName() : "not specified"), e);
+ logger.warn(
+ "Could not open a session to the '{}' repository. The current request to the CollectionSpace services API will fail.",
+ repository != null ? repository.getName() : "not specified", e);
}
-
+
if (coreSession != null) {
result = this.getAOPProxy(coreSession); // This is our AOP proxy
if (result != null) {
String key = result.getSessionId();
repositoryInstances.put(key, result);
} else {
- //
- // Since we couldn't get an AOP proxy, we need to close the core session.
- //
- CoreInstance.closeCoreSession(coreSession);
- String errMsg = String.format("Could not instantiate a Spring AOP proxy for class '%s'.",
- CoreSessionWrapper.class.getName());
- logger.error(errMsg);
+ // This is now a no-op and probably isn't necessary
+ coreSession.close();
+ logger.error("Could not instantiate a Spring AOP proxy for class '{}'.",
+ CoreSessionWrapper.class.getName());
}
}
-
+
return result;
}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
index 0fca95e1c8..61f41379ef 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
@@ -139,13 +139,13 @@ private void startNuxeoEP(String serverRootPath) throws Exception {
try {
Repository defaultRepo = Framework.getService(RepositoryManager.class).getDefaultRepository();
- coreSession = CoreInstance.openCoreSession(defaultRepo.getName(), new SystemPrincipal(null));
+ coreSession = CoreInstance.getCoreSession(defaultRepo.getName(), new SystemPrincipal(null));
} catch (Throwable t) {
logger.error(t.getMessage());
throw new RuntimeException("Could not start the Nuxeo EP Framework", t);
} finally {
if (coreSession != null) {
- CoreInstance.closeCoreSession(coreSession);
+ coreSession.close();
}
if (transactionStarted) {
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java
index 1ed3cfe00d..b96b95ce51 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java
@@ -5,7 +5,6 @@
import org.apache.http.HttpStatus;
import org.nuxeo.ecm.core.api.ConcurrentUpdateException;
-import org.nuxeo.ecm.core.api.WrappedException;
public class NuxeoDocumentException extends DocumentException {
@@ -50,11 +49,8 @@ private static String getExceptionClassName(Throwable exception) {
if (exception != null) {
result = exception.getClass().getCanonicalName();
- if (exception instanceof WrappedException) {
- result = ((WrappedException)exception).getClassName(); // Nuxeo wraps the original exception, so we need to get the name of it.
- }
}
-
+
return result;
}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java
index 537cba57ae..a9cf5d8233 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java
@@ -28,17 +28,13 @@
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-
import javax.sql.rowset.CachedRowSet;
import javax.ws.rs.core.MultivaluedMap;
-//
-// CSPACE-5036 - How to make CMISQL queries from Nuxeo
-//
import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
import org.apache.chemistry.opencmis.commons.server.CallContext;
import org.apache.chemistry.opencmis.server.impl.CallContextImpl;
-import org.apache.chemistry.opencmis.server.shared.ThresholdOutputStreamFactory;
+import org.apache.chemistry.opencmis.server.shared.TempStoreOutputStreamFactory;
import org.collectionspace.services.client.CollectionSpaceClient;
import org.collectionspace.services.client.IQueryManager;
import org.collectionspace.services.client.PoxPayloadIn;
@@ -75,12 +71,12 @@
import org.collectionspace.services.nuxeo.util.CSReindexFulltextRoot;
import org.collectionspace.services.nuxeo.util.NuxeoUtils;
import org.nuxeo.common.utils.IdUtils;
-import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
import org.nuxeo.ecm.core.api.DocumentRef;
import org.nuxeo.ecm.core.api.IdRef;
import org.nuxeo.ecm.core.api.IterableQueryResult;
+import org.nuxeo.ecm.core.api.NuxeoException;
import org.nuxeo.ecm.core.api.PathRef;
import org.nuxeo.ecm.core.api.VersioningOption;
import org.nuxeo.ecm.core.api.impl.DocumentModelListImpl;
@@ -104,12 +100,8 @@
*/
public class NuxeoRepositoryClientImpl implements RepositoryClient {
- /**
- * The logger.
- */
private final Logger logger = LoggerFactory.getLogger(NuxeoRepositoryClientImpl.class);
-// private final Logger profilerLogger = LoggerFactory.getLogger("remperf");
-// private String foo = Profiler.createLogger();
+
public static final String NUXEO_CORE_TYPE_DOMAIN = "Domain";
public static final String NUXEO_CORE_TYPE_WORKSPACEROOT = "WorkspaceRoot";
// FIXME: Get this value from an existing constant, if available
@@ -129,7 +121,8 @@ public NuxeoRepositoryClientImpl() {
//Empty constructor
}
- public void assertWorkflowState(ServiceContext ctx, DocumentModel docModel) throws DocumentNotFoundException, ClientException {
+ public void assertWorkflowState(ServiceContext ctx, DocumentModel docModel) throws DocumentNotFoundException,
+ NuxeoException {
MultivaluedMap queryParams = ctx.getQueryParams();
if (queryParams != null) {
//
@@ -389,7 +382,7 @@ private boolean reindexElasticsearch(DocumentHandler handler, String csid, Strin
@Override
public boolean synchronize(ServiceContext ctx, Object specifier, DocumentHandler handler)
- throws DocumentNotFoundException, TransactionException, DocumentException {
+ throws DocumentNotFoundException, DocumentException {
boolean result = false;
if (handler == null) {
@@ -592,7 +585,7 @@ public void get(ServiceContext ctx, DocumentHandler handler)
public DocumentWrapper getDoc(
CoreSessionInterface repoSession,
ServiceContext ctx,
- String csid) throws DocumentNotFoundException, DocumentException {
+ String csid) throws DocumentNotFoundException {
DocumentWrapper wrapDoc = null;
try {
@@ -600,15 +593,15 @@ public DocumentWrapper getDoc(
DocumentModel doc = null;
try {
doc = repoSession.getDocument(docRef);
- } catch (ClientException ce) {
+ } catch (NuxeoException ce) {
String msg = logException(ce, "Could not find document with CSID=" + csid);
throw new DocumentNotFoundException(msg, ce);
}
wrapDoc = new DocumentWrapperImpl(doc);
} catch (IllegalArgumentException iae) {
throw iae;
- } catch (DocumentException de) {
- throw de;
+ } catch (NuxeoException ne) {
+ throw ne;
}
return wrapDoc;
@@ -1185,11 +1178,11 @@ public DocumentWrapper getDocFromCsid(ServiceContext wrappedDoc) throws ClientException {
+ public String getDocURI(DocumentWrapper wrappedDoc) throws NuxeoException {
DocumentModel docModel = wrappedDoc.getWrappedObject();
String uri = (String) docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,
CollectionSpaceClient.COLLECTIONSPACE_CORE_URI);
@@ -1208,7 +1201,7 @@ private IterableQueryResult makeCMISQLQuery(CoreSessionInterface repoSession, St
logger.debug(String.format("Performing a CMIS query on Nuxeo repository named %s",
repoSession.getRepositoryName()));
- ThresholdOutputStreamFactory streamFactory = ThresholdOutputStreamFactory.newInstance(
+ TempStoreOutputStreamFactory streamFactory = TempStoreOutputStreamFactory.newInstance(
null, THRESHOLD, -1, false);
CallContextImpl callContext = new CallContextImpl(
CallContext.BINDING_LOCAL,
@@ -1223,7 +1216,7 @@ private IterableQueryResult makeCMISQLQuery(CoreSessionInterface repoSession, St
NuxeoCmisService cmisService = new NuxeoCmisService(repoSession.getCoreSession());
result = repoSession.queryAndFetch(query, "CMISQL", cmisService);
- } catch (ClientException e) {
+ } catch (NuxeoException e) {
// TODO Auto-generated catch block
logger.error("Encounter trouble making the following CMIS query: " + query, e);
throw new NuxeoDocumentException(e);
@@ -1300,7 +1293,7 @@ public void getFiltered(ServiceContext ctx, DocumentHandler handler)
throw de;
} catch (Exception e) {
if (logger.isDebugEnabled()) {
- logger.debug("Caught exception ", e); // REM - 1/17/2014: Check for org.nuxeo.ecm.core.api.ClientException and re-attempt
+ logger.debug("Caught exception ", e); // REM - 1/17/2014: Check for org.nuxeo.ecm.core.api.NuxeoException and re-attempt
}
throw new NuxeoDocumentException(e);
} finally {
@@ -1791,7 +1784,7 @@ public void update(ServiceContext ctx, String csid, DocumentHandler handler)
* @param docModel the document to save
* @param fSaveSession if TRUE, will call CoreSessionInterface.save() to save
* accumulated changes.
- * @throws ClientException
+ * @throws NuxeoException
* @throws DocumentException
*/
@Deprecated
@@ -1800,14 +1793,14 @@ public void saveDocWithoutHandlerProcessing(
CoreSessionInterface repoSession,
DocumentModel docModel,
boolean fSaveSession)
- throws ClientException, DocumentException {
+ throws NuxeoException, DocumentException {
try {
repoSession.saveDocument(docModel);
if (fSaveSession) {
repoSession.save();
}
- } catch (ClientException ce) {
+ } catch (NuxeoException ce) {
throw ce;
} catch (Exception e) {
if (logger.isDebugEnabled()) {
@@ -1825,7 +1818,7 @@ public void saveDocWithoutHandlerProcessing(
* @param docModelList a list of document models
* @param fSaveSession if TRUE, will call CoreSessionInterface.save() to save
* accumulated changes.
- * @throws ClientException
+ * @throws NuxeoException
* @throws DocumentException
*/
public void saveDocListWithoutHandlerProcessing(
@@ -1833,14 +1826,14 @@ public void saveDocListWithoutHandlerProcessing(
CoreSessionInterface repoSession,
DocumentModelList docList,
boolean fSaveSession)
- throws ClientException, DocumentException {
+ throws NuxeoException, DocumentException {
try {
DocumentModel[] docModelArray = new DocumentModel[docList.size()];
repoSession.saveDocuments(docList.toArray(docModelArray));
if (fSaveSession) {
repoSession.save();
}
- } catch (ClientException ce) {
+ } catch (NuxeoException ce) {
throw ce;
} catch (Exception e) {
logger.error("Caught exception ", e);
@@ -2084,7 +2077,7 @@ private DocumentModel getWorkspacesRoot(CoreSessionInterface repoSession,
}
if (result == null) {
- throw new ClientException("Could not find workspace root directory in: "
+ throw new NuxeoException("Could not find workspace root directory in: "
+ domainPath);
}
@@ -2283,9 +2276,7 @@ public void releaseRepositorySession(ServiceContext
@Override
public void doWorkflowTransition(ServiceContext ctx, String id,
- DocumentHandler handler, TransitionDef transitionDef)
- throws BadRequestException, DocumentNotFoundException,
- DocumentException {
+ DocumentHandler handler, TransitionDef transitionDef) {
// This is a placeholder for when we change the StorageClient interface to treat workflow transitions as 1st class operations like 'get', 'create', 'update, 'delete', etc
}
@@ -2399,7 +2390,7 @@ private void rollbackTransaction(CoreSessionInterface repoSession) {
*/
@Override
public boolean delete(ServiceContext ctx, Object entityFound, DocumentHandler handler)
- throws DocumentNotFoundException, DocumentException {
+ throws DocumentException {
throw new UnsupportedOperationException();
}
}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java
index ec1d553bae..3d35a61674 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java
@@ -23,7 +23,7 @@
*/
package org.collectionspace.services.nuxeo.client.java;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
/**
* ObjectFactory for CommonList
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index eb6b0158ca..b1f961c8c7 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -37,7 +37,7 @@
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import org.collectionspace.authentication.AuthN;
import org.collectionspace.services.authorization.AccountPermission;
@@ -91,7 +91,7 @@
import org.nuxeo.ecm.core.api.impl.DataModelImpl;
import org.nuxeo.ecm.core.api.model.DocumentPart;
import org.nuxeo.ecm.core.api.model.Property;
-import org.nuxeo.ecm.core.api.model.PropertyException;
+import org.nuxeo.ecm.core.api.PropertyException;
import org.nuxeo.ecm.core.api.model.impl.ScalarProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -251,7 +251,7 @@ public boolean handleDelete(DocumentWrapper wrapDoc) throws Excep
public void completeUpdate(DocumentWrapper wrapDoc) throws Exception {
DocumentModel docModel = wrapDoc.getWrappedObject();
- String[] schemas = docModel.getDeclaredSchemas();
+ String[] schemas = docModel.getSchemas();
Map partsMetaMap = getServiceContext().getPartsMetadata();
for (String schema : schemas) {
ObjectPartType partMeta = partsMetaMap.get(schema);
@@ -353,7 +353,7 @@ public void extractAllParts(DocumentWrapper wrapDoc)
throws Exception {
DocumentModel docModel = wrapDoc.getWrappedObject();
- String[] schemas = docModel.getDeclaredSchemas();
+ String[] schemas = docModel.getSchemas();
Map partsMetaMap = getServiceContext().getPartsMetadata();
for (String schema : schemas) {
ObjectPartType partMeta = partsMetaMap.get(schema);
@@ -404,7 +404,7 @@ private void addExtraCoreValues(DocumentModel docModel, Map unQO
private void addAccountPermissionsPart() throws Exception {
Profiler profiler = new Profiler("addAccountPermissionsPart():", 1);
profiler.start();
-
+
MultipartServiceContext ctx = (MultipartServiceContext) getServiceContext();
String currentServiceName = ctx.getServiceName();
String workflowSubResource = "/";
@@ -417,12 +417,9 @@ private void addAccountPermissionsPart() throws Exception {
}
AccountPermission accountPermission = JpaStorageUtils.getAccountPermissions(JpaStorageUtils.CS_CURRENT_USER,
currentServiceName, workflowSubResource);
- org.collectionspace.services.authorization.ObjectFactory objectFactory =
- new org.collectionspace.services.authorization.ObjectFactory();
- JAXBElement ap = objectFactory.createAccountPermission(accountPermission);
- PayloadOutputPart accountPermissionPart = new PayloadOutputPart("account_permission", ap); // REM - "account_permission" should be using a constant and not a literal
+ PayloadOutputPart accountPermissionPart = new PayloadOutputPart("account_permission", accountPermission);
ctx.addOutputPart(accountPermissionPart);
-
+
profiler.stop();
}
@@ -768,9 +765,8 @@ public AuthorityRefList getAuthorityRefs(
return authRefList;
}
- private boolean appendToAuthRefsList(RefNameServiceUtils.AuthRefInfo ari,
- List list)
- throws Exception {
+ private boolean appendToAuthRefsList(RefNameServiceUtils.AuthRefInfo ari,
+ List list) {
String fieldName = ari.getQualifiedDisplayName();
try {
String refNameValue = (String)ari.getProperty().getValue();
@@ -780,12 +776,7 @@ private boolean appendToAuthRefsList(RefNameServiceUtils.AuthRefInfo ari,
return true;
}
} catch(PropertyException pe) {
- String msg = "PropertyException on: "+ari.getProperty().getPath()+pe.getLocalizedMessage();
- if (logger.isDebugEnabled()) {
- logger.debug(msg, pe);
- } else {
- logger.error(msg);
- }
+ logger.error("PropertyException on: {} {}", ari.getProperty().getXPath(), pe.getLocalizedMessage(), pe);
}
return false;
}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java
index 648de4f715..5b29334bd0 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java
@@ -1,3 +1,3 @@
// We make the CommonList act like an AbstractCommonList, by setting its namespace
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/jaxb")
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/jaxb")
package org.collectionspace.services.nuxeo.client.java;
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java
index 3d7ad65e30..0d326769ab 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java
@@ -14,8 +14,6 @@
import org.collectionspace.services.config.tenant.Param;
import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface;
import org.collectionspace.services.nuxeo.util.NuxeoUtils;
-import org.nuxeo.common.collections.ScopeType;
-import org.nuxeo.common.collections.ScopedMap;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
import org.nuxeo.ecm.core.event.Event;
@@ -23,9 +21,9 @@
import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
public abstract class AbstractCSEventListenerImpl implements CSEventListener {
- private static Map> mapOfrepositoryNames = new HashMap>(); //
- private static Map>> eventListenerParamsMap = new HashMap>>(); // >>
- private static Map nameMap = new HashMap();
+ private static Map> mapOfrepositoryNames = new HashMap<>(); //
+ private static Map>> eventListenerParamsMap = new HashMap<>(); // >>
+ private static Map nameMap = new HashMap<>();
// SQL clauses
private final static String NONVERSIONED_NONPROXY_DOCUMENT_WHERE_CLAUSE_FRAGMENT =
@@ -34,7 +32,7 @@ public abstract class AbstractCSEventListenerImpl implements CSEventListener {
protected final static String ACTIVE_DOCUMENT_WHERE_CLAUSE_FRAGMENT =
"AND (ecm:currentLifeCycleState <> 'deleted') "
+ NONVERSIONED_NONPROXY_DOCUMENT_WHERE_CLAUSE_FRAGMENT;
- static final String DOCMODEL_CONTEXT_PROPERTY_PREFIX = ScopeType.DEFAULT.getScopePrefix();
+ private static final String DOCMODEL_CONTEXT_PROPERTY_PREFIX = "default/";
private String currentRepositoryName;
public AbstractCSEventListenerImpl() {
@@ -228,8 +226,8 @@ protected Serializable getContextPropertyValue(DocumentEventContext docEventCont
//
@Override
public void setDocModelContextProperty(DocumentModel collectionObjectDocModel, String key, Serializable value) {
- ScopedMap contextData = collectionObjectDocModel.getContextData();
- contextData.putIfAbsent(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key, value);
+ Map contextData = collectionObjectDocModel.getContextData();
+ contextData.putIfAbsent(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key, value);
}
//
@@ -237,8 +235,8 @@ public void setDocModelContextProperty(DocumentModel collectionObjectDocModel, S
//
@Override
public void clearDocModelContextProperty(DocumentModel docModel, String key) {
- ScopedMap contextData = docModel.getContextData();
- contextData.remove(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key);
+ Map contextData = docModel.getContextData();
+ contextData.remove(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key);
}
//
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index e036d7f41f..727160e060 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -50,7 +50,6 @@
import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthorityItemSpecifier;
import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier;
import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.SpecifierForm;
-import org.collectionspace.services.config.tenant.RepositoryDomainType;
import org.collectionspace.services.lifecycle.Lifecycle;
import org.collectionspace.services.lifecycle.State;
import org.collectionspace.services.lifecycle.StateList;
@@ -66,7 +65,6 @@
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
import org.nuxeo.ecm.core.api.Blob;
-import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.api.DocumentRef;
import org.nuxeo.ecm.core.api.IdRef;
@@ -493,7 +491,7 @@ public static Document getDocument(CoreSessionInterface repoSession, String csid
*
* @throws DocumentException the document exception
* @throws IOException Signals that an I/O exception has occurred.
- * @throws ClientException the client exception
+ * @throws NuxeoException the client exception
*/
public static DocumentModel getWorkspaceModel(
CoreSessionInterface repoSession, String workspaceName)
@@ -955,7 +953,7 @@ public static String prepareStringLiteral(String s) {
}
public static boolean documentExists(CoreSessionInterface repoSession,
- String csid) throws ClientException, DocumentException {
+ String csid) throws NuxeoException, DocumentException {
boolean result = false;
String statement = String.format(
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java
index 2458da6089..eb86ceae9c 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java
@@ -44,15 +44,15 @@
import org.nuxeo.ecm.core.api.IterableQueryResult;
import org.nuxeo.ecm.core.api.NuxeoException;
import org.nuxeo.ecm.core.api.NuxeoPrincipal;
+import org.nuxeo.ecm.core.api.repository.FulltextConfiguration;
import org.nuxeo.ecm.core.event.EventService;
import org.nuxeo.ecm.core.query.QueryFilter;
import org.nuxeo.ecm.core.query.sql.NXQL;
-import org.nuxeo.ecm.core.storage.FulltextConfiguration;
+import org.nuxeo.ecm.core.storage.FulltextExtractorWork;
import org.nuxeo.ecm.core.storage.sql.Model;
import org.nuxeo.ecm.core.storage.sql.Node;
import org.nuxeo.ecm.core.storage.sql.Session;
import org.nuxeo.ecm.core.storage.sql.SimpleProperty;
-import org.nuxeo.ecm.core.storage.sql.coremodel.SQLFulltextExtractorWork;
import org.nuxeo.ecm.core.storage.sql.coremodel.SQLSession;
import org.nuxeo.ecm.core.work.api.Work;
import org.nuxeo.ecm.core.work.api.WorkManager;
@@ -263,7 +263,7 @@ protected void doBatch(List infos) throws NuxeoException {
runAsyncBatch(asyncIds);
// wait for async completion after transaction commit
- Framework.getLocalService(EventService.class).waitForAsyncCompletion();
+ Framework.getService(EventService.class).waitForAsyncCompletion();
}
/*
@@ -312,9 +312,9 @@ protected void runAsyncBatch(Set asyncIds) {
return;
}
String repositoryName = coreSession.getRepositoryName();
- WorkManager workManager = Framework.getLocalService(WorkManager.class);
+ WorkManager workManager = Framework.getService(WorkManager.class);
for (String id : asyncIds) {
- Work work = new SQLFulltextExtractorWork(repositoryName, id);
+ Work work = new FulltextExtractorWork(repositoryName, id, false, true, false);
// schedule immediately, we're outside a transaction
workManager.schedule(work, Scheduling.IF_NOT_SCHEDULED, false);
}
diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java b/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java
index 2fdd5da6ed..2ec195f5a9 100644
--- a/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java
+++ b/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java
@@ -2,7 +2,7 @@
import java.io.ByteArrayInputStream;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.collectionspace.services.common.config.ServicesConfigReaderImpl;
diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java b/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java
index 22b6fc62b7..debac3a76e 100644
--- a/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java
+++ b/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java
@@ -2,7 +2,7 @@
import java.util.Set;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
import org.collectionspace.services.common.security.SecurityUtils;
import org.collectionspace.services.config.AssertionProbesType;
diff --git a/services/concept/client/pom.xml b/services/concept/client/pom.xml
index 9525e09204..9f9d250518 100644
--- a/services/concept/client/pom.xml
+++ b/services/concept/client/pom.xml
@@ -51,11 +51,7 @@