From: Richard Millet Date: Thu, 19 Aug 2010 03:08:51 +0000 (+0000) Subject: CSPACE-1432: Apply "List - pagination (return total items, current page, total pages... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7a2c2be3fc6443985fe309c5476a655d2d18e34e;p=tmp%2Fjakarta-migration.git CSPACE-1432: Apply "List - pagination (return total items, current page, total pages) " functionality to Account --- diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 82fa944e0..7dba4845d 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -39,6 +39,11 @@ org.jvnet.hyperjaxb3 hyperjaxb3-ejb-runtime + + org.collectionspace.services + org.collectionspace.services.hyperjaxb + ${project.version} + diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd index 4fbc5d548..27ed6de85 100644 --- a/services/account/jaxb/src/main/resources/accounts_common.xsd +++ b/services/account/jaxb/src/main/resources/accounts_common.xsd @@ -8,12 +8,13 @@ Used for: JAXB binding between XML and Java objects $LastChangedRevision: 916 $ - $LastChangedDate: 2009-11-05 16:59:20 -0800 (Thu, 05 Nov 2009) $ + $LastChangedDate: 2009-11-05 16:59:20 -0800 (Fri, 06 Nov 2009) $ --> + + + + + + + + + @@ -181,26 +191,30 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java index ee8937cd3..03e6abc00 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java @@ -239,13 +239,15 @@ public class AccountResource @Context UriInfo ui) { AccountsCommonList accountList = new AccountsCommonList(); try { - ServiceContext ctx = createServiceContext((AccountsCommon) null, AccountsCommon.class); - DocumentHandler handler = createDocumentHandler(ctx); MultivaluedMap queryParams = ui.getQueryParameters(); - DocumentFilter myFilter = handler.createDocumentFilter(); - myFilter.setPagination(queryParams); - myFilter.setQueryParams(queryParams); - handler.setDocumentFilter(myFilter); + ServiceContext ctx = createServiceContext((AccountsCommon) null, + queryParams, AccountsCommon.class); + DocumentHandler handler = createDocumentHandler(ctx); + handler.getDocumentFilter().setQueryParams(queryParams); +// DocumentFilter myFilter = handler.createDocumentFilter(); +// myFilter.setPagination(queryParams); +// myFilter.setQueryParams(queryParams); +// handler.setDocumentFilter(myFilter); getStorageClient(ctx).getFiltered(ctx, handler); accountList = (AccountsCommonList) handler.getCommonPartList(); } catch (UnauthorizedException ue) { diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java index 454f19c49..03c192217 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java @@ -27,17 +27,20 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; + import org.collectionspace.services.account.AccountTenant; import org.collectionspace.services.account.AccountsCommon; import org.collectionspace.services.account.AccountsCommonList; import org.collectionspace.services.account.AccountsCommonList.AccountListItem; import org.collectionspace.services.account.Status; + +import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler; import org.collectionspace.services.common.context.ServiceContext; -import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.JaxbUtils; import org.collectionspace.services.common.security.SecurityUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +49,7 @@ import org.slf4j.LoggerFactory; * @author */ public class AccountDocumentHandler - extends AbstractDocumentHandlerImpl { + extends JpaDocumentHandler { private final Logger logger = LoggerFactory.getLogger(AccountDocumentHandler.class); private AccountsCommon account; @@ -144,7 +147,8 @@ public class AccountDocumentHandler DocumentWrapper wrapDoc) throws Exception { - AccountsCommonList accList = new AccountsCommonList(); + AccountsCommonList accList = this.extractPagingInfo(new AccountsCommonList(), wrapDoc); +// AccountsCommonList accList = new AccountsCommonList(); List list = accList.getAccountListItem(); for (Object obj : wrapDoc.getWrappedObject()) { diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountRoleDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountRoleDocumentHandler.java index 34edb72b7..9233d9f10 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountRoleDocumentHandler.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountRoleDocumentHandler.java @@ -33,11 +33,13 @@ import org.collectionspace.services.authorization.PermissionsRolesList; import org.collectionspace.services.authorization.RoleValue; import org.collectionspace.services.authorization.SubjectType; import org.collectionspace.services.common.context.ServiceContext; +import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler; import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.context.ServiceContextProperties; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +48,7 @@ import org.slf4j.LoggerFactory; * @author */ public class AccountRoleDocumentHandler - extends AbstractDocumentHandlerImpl, List> { + extends JpaDocumentHandler, List> { private final Logger logger = LoggerFactory.getLogger(AccountRoleDocumentHandler.class); private AccountRole accountRole; diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java index 025294873..94d9e03a6 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java @@ -27,9 +27,12 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.collectionspace.services.authorization.AccountRole; +import org.collectionspace.services.authorization.AccountRoleRel; import org.collectionspace.services.authorization.Permission; import org.collectionspace.services.authorization.PermissionAction; import org.collectionspace.services.authorization.PermissionsList; +import org.collectionspace.services.authorization.PermissionsRolesList; import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.BadRequestException; @@ -37,6 +40,7 @@ import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.JaxbUtils; import org.collectionspace.services.common.security.SecurityUtils; +import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +49,7 @@ import org.slf4j.LoggerFactory; * @author */ public class PermissionDocumentHandler - extends AbstractDocumentHandlerImpl { + extends JpaDocumentHandler { private final Logger logger = LoggerFactory.getLogger(PermissionDocumentHandler.class); private Permission permission; diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java index 9c8b1c86d..124d3c19a 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java @@ -26,9 +26,11 @@ package org.collectionspace.services.authorization.storage; import java.util.ArrayList; import java.util.List; +import org.collectionspace.services.authorization.Permission; import org.collectionspace.services.authorization.PermissionRole; import org.collectionspace.services.authorization.PermissionRoleRel; import org.collectionspace.services.authorization.PermissionValue; +import org.collectionspace.services.authorization.PermissionsList; import org.collectionspace.services.authorization.PermissionsRolesList; import org.collectionspace.services.authorization.RoleValue; import org.collectionspace.services.authorization.SubjectType; @@ -36,6 +38,7 @@ import org.collectionspace.services.authorization.SubjectType; import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; +import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +47,7 @@ import org.slf4j.LoggerFactory; * @author */ public class PermissionRoleDocumentHandler - extends AbstractDocumentHandlerImpl, List> { + extends JpaDocumentHandler, List> { private final Logger logger = LoggerFactory.getLogger(PermissionRoleDocumentHandler.class); private PermissionRole permissionRole; diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java index 7be60a26c..5fd3bf257 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java @@ -30,12 +30,13 @@ import java.util.UUID; import org.collectionspace.services.authorization.Role; import org.collectionspace.services.authorization.RolesList; -import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.BadRequestException; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.JaxbUtils; import org.collectionspace.services.common.security.SecurityUtils; +import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,8 +45,7 @@ import org.slf4j.LoggerFactory; * @author */ public class RoleDocumentHandler - extends AbstractDocumentHandlerImpl { - + extends JpaDocumentHandler { private final Logger logger = LoggerFactory.getLogger(RoleDocumentHandler.class); private Role role; private RolesList rolesList; diff --git a/services/common/pom.xml b/services/common/pom.xml index ff3e35e95..1fc068672 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -20,6 +20,11 @@ org.collectionspace.services.jaxb ${project.version} + + org.collectionspace.services + org.collectionspace.services.hyperjaxb + ${project.version} + org.collectionspace.services org.collectionspace.services.client diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java index 322c40bbe..e34b6dc28 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java @@ -25,6 +25,7 @@ package org.collectionspace.services.common.document; +import org.nuxeo.ecm.core.api.DocumentModelList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,6 +83,10 @@ public abstract class AbstractMultipartDocumentHandlerImpl @Override public abstract TL extractCommonPartList(DocumentWrapper wrapDoc) throws Exception; + + @Override + public abstract TL extractPagingInfo(TL theCommonList, DocumentWrapper wrapDoc) + throws Exception; @Override public abstract T getCommonPart(); diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java index c6f88aeeb..b869e9f75 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java @@ -221,6 +221,16 @@ public interface DocumentHandler { * @throws Exception */ public TL extractCommonPartList(DocumentWrapper docWrap) throws Exception; + + /** + * Extract paging info. + * + * @param theCommonList the the common list + * @param wrapDoc the wrap doc + * @return the tL + * @throws Exception the exception + */ + public TL extractPagingInfo(TL theCommonList, DocumentWrapper wrapDoc) throws Exception; /** * fillCommonPartList sets list common part of CS object into given document diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java index a85e810f2..db943c72d 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java @@ -19,10 +19,11 @@ package org.collectionspace.services.common.storage.jpa; import java.util.Date; import java.util.List; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Query; -import org.collectionspace.services.common.context.ServiceContext; + import org.collectionspace.services.common.document.BadRequestException; import org.collectionspace.services.common.document.DocumentException; import org.collectionspace.services.common.document.DocumentFilter; @@ -32,8 +33,12 @@ import org.collectionspace.services.common.document.DocumentHandler.Action; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.DocumentWrapperImpl; import org.collectionspace.services.common.document.JaxbUtils; + import org.collectionspace.services.common.storage.StorageClient; import org.collectionspace.services.common.context.ServiceContextProperties; +import org.collectionspace.services.common.context.ServiceContext; +import org.collectionspace.services.common.query.QueryContext; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -212,15 +217,8 @@ public class JpaStorageClientImpl implements StorageClient { @Override public void getFiltered(ServiceContext ctx, DocumentHandler handler) throws DocumentNotFoundException, DocumentException { - if (ctx == null) { - throw new IllegalArgumentException( - "getFiltered: ctx is missing"); - } - if (handler == null) { - throw new IllegalArgumentException( - "getFiltered: handler is missing"); - } - + QueryContext queryContext = new QueryContext(ctx, handler); + DocumentFilter docFilter = handler.getDocumentFilter(); if (docFilter == null) { docFilter = handler.createDocumentFilter(); @@ -229,10 +227,10 @@ public class JpaStorageClientImpl implements StorageClient { EntityManager em = null; try { handler.prepare(Action.GET_ALL); - StringBuilder queryStrBldr = new StringBuilder("SELECT a FROM "); queryStrBldr.append(getEntityName(ctx)); queryStrBldr.append(" a"); + List params = docFilter.buildWhereForSearch(queryStrBldr); emf = JpaStorageUtils.getEntityManagerFactory(); em = emf.createEntityManager(); 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 b5d5947a3..6fa7c68bd 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 @@ -133,7 +133,7 @@ public abstract class RemoteDocumentModelHandlerImpl * @return the tL * @throws Exception the exception */ - protected TL extractPagingInfo(TL theCommonList, DocumentWrapper wrapDoc) + public TL extractPagingInfo(TL theCommonList, DocumentWrapper wrapDoc) throws Exception { AbstractCommonList commonList = (AbstractCommonList) theCommonList; diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java index b0f0238d2..664a5f77d 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java @@ -22,6 +22,11 @@ import java.util.UUID; import java.util.List; import org.collectionspace.services.common.context.ServiceContext; +import org.collectionspace.services.common.query.IQueryManager; +import org.collectionspace.services.common.query.QueryContext; +import org.collectionspace.services.common.repository.RepositoryClient; +import org.collectionspace.services.common.profile.Profiler; +import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.common.document.BadRequestException; import org.collectionspace.services.common.document.DocumentException; @@ -32,13 +37,9 @@ import org.collectionspace.services.common.document.DocumentHandler.Action; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.DocumentWrapperImpl; -import org.collectionspace.services.nuxeo.util.NuxeoUtils; -import org.collectionspace.services.common.query.IQueryManager; -import org.collectionspace.services.common.repository.RepositoryClient; -import org.collectionspace.services.common.profile.Profiler; - import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; + import org.nuxeo.common.utils.IdUtils; import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; @@ -62,87 +63,6 @@ import org.slf4j.LoggerFactory; */ public class RepositoryJavaClientImpl implements RepositoryClient { - /** - * The Class QueryContext. - */ - private class QueryContext { - - /** The doc type. */ - String docType; - /** The doc filter. */ - DocumentFilter docFilter; - /** The where clause. */ - String whereClause; - /** The order by clause. */ - String orderByClause; - /** The domain. */ - String domain; - /** The tenant id. */ - String tenantId; - - /** - * Instantiates a new query context. - * - * @param ctx the ctx - * @throws DocumentNotFoundException the document not found exception - * @throws DocumentException the document exception - */ - QueryContext(ServiceContext ctx) throws DocumentNotFoundException, DocumentException { - docType = ctx.getDocumentType(); - if (docType == null) { - throw new DocumentNotFoundException( - "Unable to find DocumentType for service " + ctx.getServiceName()); - } - domain = ctx.getRepositoryDomainName(); - if (domain == null) { - throw new DocumentNotFoundException( - "Unable to find Domain for service " + ctx.getServiceName()); - } - tenantId = ctx.getTenantId(); - if (tenantId == null) { - throw new IllegalArgumentException( - "Service context has no Tenant ID specified."); - } - } - - /** - * Instantiates a new query context. - * - * @param ctx the ctx - * @param theWhereClause the where clause - * @throws DocumentNotFoundException the document not found exception - * @throws DocumentException the document exception - */ - QueryContext(ServiceContext ctx, - String theWhereClause) throws DocumentNotFoundException, DocumentException { - this(ctx); - whereClause = theWhereClause; - } - - /** - * Instantiates a new query context. - * - * @param ctx the ctx - * @param handler the handler - * @throws DocumentNotFoundException the document not found exception - * @throws DocumentException the document exception - */ - QueryContext(ServiceContext ctx, - DocumentHandler handler) throws DocumentNotFoundException, DocumentException { - this(ctx); - if (handler == null) { - throw new IllegalArgumentException( - "Document handler is missing."); - } - docFilter = handler.getDocumentFilter(); - if (docFilter == null) { - throw new IllegalArgumentException( - "Document handler has no Filter specified."); - } - whereClause = docFilter.getWhereClause(); - orderByClause = docFilter.getOrderByClause(); - } - } /** The logger. */ private final Logger logger = LoggerFactory.getLogger(RepositoryJavaClientImpl.class); // private final Logger profilerLogger = LoggerFactory.getLogger("remperf"); @@ -627,7 +547,6 @@ public class RepositoryJavaClientImpl implements RepositoryClient { @Override public void getFiltered(ServiceContext ctx, DocumentHandler handler) throws DocumentNotFoundException, DocumentException { - QueryContext queryContext = new QueryContext(ctx, handler); RepositoryInstance repoSession = null; @@ -646,9 +565,9 @@ public class RepositoryJavaClientImpl implements RepositoryClient { Profiler profiler = new Profiler(this, 2); profiler.log("Executing NXQL query: " + query.toString()); profiler.start(); - if ((queryContext.docFilter.getOffset() > 0) || (queryContext.docFilter.getPageSize() > 0)) { + if ((queryContext.getDocFilter().getOffset() > 0) || (queryContext.getDocFilter().getPageSize() > 0)) { docList = repoSession.query(query, null, - queryContext.docFilter.getPageSize(), queryContext.docFilter.getOffset(), true); + queryContext.getDocFilter().getPageSize(), queryContext.getDocFilter().getOffset(), true); } else { docList = repoSession.query(query); } @@ -928,11 +847,11 @@ public class RepositoryJavaClientImpl implements RepositoryClient { // query.append(/*IQueryManager.SEARCH_QUALIFIER_AND +*/ " WHERE " + DocumentModelHandler.COLLECTIONSPACE_CORE_SCHEMA + ":" + DocumentModelHandler.COLLECTIONSPACE_CORE_TENANTID - + " = " + queryContext.tenantId); + + " = " + queryContext.getTenantId()); // // Finally, append the incoming where clause // - String whereClause = queryContext.whereClause; + String whereClause = queryContext.getWhereClause(); if (whereClause != null && ! whereClause.trim().isEmpty()) { // Due to an apparent bug/issue in how Nuxeo translates the NXQL query string // into SQL, we need to parenthesize our 'where' clause @@ -952,7 +871,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient { */ private final void appendNXQLOrderBy(StringBuilder query, QueryContext queryContext) { // Append the incoming ORDER BY clause - String orderByClause = queryContext.orderByClause; + String orderByClause = queryContext.getOrderByClause(); if (orderByClause != null && ! orderByClause.trim().isEmpty()) { // FIXME Verify whether enclosing parentheses may be required, and add // them if so, as is being done in appendNXQLWhere. @@ -977,7 +896,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient { */ private final String buildNXQLQuery(QueryContext queryContext) { StringBuilder query = new StringBuilder("SELECT * FROM "); - query.append(queryContext.docType); + query.append(queryContext.getDocType()); appendNXQLWhere(query, queryContext); appendNXQLOrderBy(query, queryContext); return query.toString(); diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index 2b7c9a0a3..07cbbd9fd 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -35,32 +35,42 @@ services.hyperjaxb - - com.sun.xml.bind - jaxb-impl - - - - org.jvnet.jaxb2-commons - property-listener-injector - - - - org.jvnet.jaxb2_commons - runtime - - + + com.sun.xml.bind + jaxb-impl + + + org.jvnet.jaxb2-commons + property-listener-injector + + + org.jvnet.jaxb2_commons + runtime + + + + javax.persistence + persistence-api + + + org.hibernate + hibernate-entitymanager + + + org.jvnet.hyperjaxb3 + hyperjaxb3-ejb-runtime + - collectionspace-services-jaxb + collectionspace-services-hyperjaxb install + - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - + + org.jvnet.hyperjaxb3 + maven-hyperjaxb3-plugin + diff --git a/services/pom.xml b/services/pom.xml index 388c87c1a..26a3b906d 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,6 +24,7 @@ authorization client jaxb + hyperjaxb common authorization-mgt common-test