From: Richard Millet Date: Tue, 29 Jan 2013 21:38:37 +0000 (-0800) Subject: CSPACE-5564: More changes related to name change from 'articles' to 'publicitems' X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a6b2d6c04ada3fc869f3bc4926a64d6b7d69b341;p=tmp%2Fjakarta-migration.git CSPACE-5564: More changes related to name change from 'articles' to 'publicitems' --- diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index c5bdd1591..d3bd9887c 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -201,7 +201,7 @@ org.collectionspace.services - org.collectionspace.services.article.service + org.collectionspace.services.publicitem.service ${project.version} diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java index cfee42fc2..ccea44fb7 100644 --- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java +++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java @@ -65,7 +65,7 @@ import org.collectionspace.services.common.ResourceBase; import org.collectionspace.services.common.ResourceMap; import org.collectionspace.services.common.ResourceMapHolder; import org.collectionspace.services.common.ResourceMapImpl; -import org.collectionspace.services.common.article.ArticleResource; +import org.collectionspace.services.common.publicitem.PublicItemResource; import org.collectionspace.services.common.relation.RelationResource; import org.collectionspace.services.common.security.SecurityInterceptor; @@ -121,7 +121,7 @@ public class CollectionSpaceJaxRsApplication extends Application addResourceToMapAndSingletons(new BlobResource()); addResourceToMapAndSingletons(new MovementResource()); addResourceToMapAndSingletons(new ReportResource()); - addResourceToMapAndSingletons(new ArticleResource()); + addResourceToMapAndSingletons(new PublicItemResource()); singletons.add(new IDResource()); diff --git a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/applicationContext-security.xml b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/applicationContext-security.xml index 2e6b6f69a..a6750477b 100644 --- a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -27,7 +27,7 @@ class="org.springframework.security.web.FilterChainProxy"> - diff --git a/services/article/jaxb/src/main/java/org/collectionspace/services/PublicitemsCommonJAXBSchema.java b/services/article/jaxb/src/main/java/org/collectionspace/services/PublicitemsCommonJAXBSchema.java deleted file mode 100644 index 70516cbdd..000000000 --- a/services/article/jaxb/src/main/java/org/collectionspace/services/PublicitemsCommonJAXBSchema.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * String constants to access XML element names of the ArticlesCommon class. - */ -package org.collectionspace.services; - -/* - - - - - - - - - - - - - - - - */ - -public interface PublicitemsCommonJAXBSchema { - final static String ITEM_NUMBER = "itemNumber"; - final static String ITEM_CONTENT_NAME = "itemContentName"; - final static String ITEM_CONTENT_REPO_ID = "itemContentId"; - final static String ITEM_CONTENT_URI = "itemContentUri"; - final static String ITEM_JOB_ID = "itemJobId"; - final static String ITEM_SOURCE = "itemSource"; - final static String ITEM_ACCESS_EXPIRATION_DATE = "itemExpirationDate"; - final static String ITEM_ACCESSED_COUNT = "itemCount"; - final static String ITEM_ACCESSED_COUNT_LIMIT = "itemCountLimit"; -} \ No newline at end of file diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml index a660fc6a2..a1f122f51 100644 --- a/services/blob/service/pom.xml +++ b/services/blob/service/pom.xml @@ -35,7 +35,7 @@ org.collectionspace.services - org.collectionspace.services.article.client + org.collectionspace.services.publicitem.client ${project.version} @@ -93,7 +93,6 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} jboss-remoting diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java index d64214814..407515ca6 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java @@ -23,7 +23,7 @@ */ package org.collectionspace.services.blob; -import org.collectionspace.services.article.PublicitemsCommon; +import org.collectionspace.services.publicitem.PublicitemsCommon; import org.collectionspace.services.client.BlobClient; import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PayloadPart; @@ -33,10 +33,10 @@ import org.collectionspace.services.common.FileUtils; import org.collectionspace.services.common.ResourceBase; import org.collectionspace.services.common.ResourceMap; import org.collectionspace.services.common.ServiceMessages; -import org.collectionspace.services.common.article.ArticleUtil; import org.collectionspace.services.common.blob.BlobInput; import org.collectionspace.services.common.blob.BlobUtil; import org.collectionspace.services.common.context.ServiceContext; +import org.collectionspace.services.common.publicitem.PublicItemUtil; import org.collectionspace.services.nuxeo.client.java.CommonList; import org.jboss.resteasy.plugins.providers.multipart.InputPart; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; @@ -294,7 +294,7 @@ public class BlobResource extends ResourceBase { BlobsCommon blobsCommon = getBlobsCommon(csid); StringBuffer mimeType = new StringBuffer(); InputStream contentStream = getBlobContent(ctx, csid, null /*derivative term*/, mimeType /*will get set*/); - result = ArticleUtil.publishToRepository((PublicitemsCommon)null, resourceMap, uriInfo, + result = PublicItemUtil.publishToRepository((PublicitemsCommon)null, resourceMap, uriInfo, getRepositoryClient(ctx), ctx, contentStream, blobsCommon.getName()); } catch (Exception e) { throw bigReThrow(e, ServiceMessages.PUT_FAILED); @@ -318,7 +318,7 @@ public class BlobResource extends ResourceBase { BlobsCommon blobsCommon = getBlobsCommon(csid); StringBuffer mimeType = new StringBuffer(); InputStream contentStream = getBlobContent(ctx, csid, derivativeTerm, mimeType); - result = ArticleUtil.publishToRepository((PublicitemsCommon)null, resourceMap, uriInfo, + result = PublicItemUtil.publishToRepository((PublicitemsCommon)null, resourceMap, uriInfo, getRepositoryClient(ctx), ctx, contentStream, blobsCommon.getName()); } catch (Exception e) { throw bigReThrow(e, ServiceMessages.CREATE_FAILED); diff --git a/services/build.xml b/services/build.xml index 12678eadc..d6a1f0853 100644 --- a/services/build.xml +++ b/services/build.xml @@ -183,7 +183,7 @@ - + @@ -194,7 +194,7 @@ - + diff --git a/services/common/pom.xml b/services/common/pom.xml index 284753867..091a6ad30 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -40,12 +40,12 @@ org.collectionspace.services - org.collectionspace.services.article.client + org.collectionspace.services.publicitem.client ${project.version} org.collectionspace.services - org.collectionspace.services.article.jaxb + org.collectionspace.services.publicitem.jaxb ${project.version} - - + + default-domain - org.collectionspace.services.article.nuxeo.ArticleDocumentModelHandler + org.collectionspace.services.publicitem.nuxeo.PublicItemDocumentModelHandler - articleNumber - articleNumber + itemNumber + itemNumber - articleSource - articleSource + contentSource + contentSource - articleContentUrl - articleContentUrl - + contentUri + contentUri + - org.collectionspace.services.article.nuxeo.ArticleValidatorHandler + org.collectionspace.services.publicitem.nuxeo.PublicItemValidatorHandler objectNameProperty - articleContentCsid + contentName objectNumberProperty - articleNumber + itemNumber - - + + - + - + @@ -2969,7 +2969,7 @@ - + diff --git a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java index 5e34217e1..c8bec4b50 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java +++ b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java @@ -90,10 +90,10 @@ public interface CollectionSpaceResource { * Returns true if this resource allow anonymous access. It addition to returning 'true', this * resources base URL path needs to be declared in the Spring Security config file's 'springSecurityFilterChain' bean. * There needs to be a 'filter-chain' element something like the following: - * See the "applicationContext-security.xml" file for details. */ +// public boolean allowAnonymousAccess(HttpRequest request, ResourceMethod method); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java b/services/common/src/main/java/org/collectionspace/services/common/publicitem/PublicItemResource.java similarity index 87% rename from services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java rename to services/common/src/main/java/org/collectionspace/services/common/publicitem/PublicItemResource.java index 7f14e40c3..e0d80e197 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java +++ b/services/common/src/main/java/org/collectionspace/services/common/publicitem/PublicItemResource.java @@ -21,12 +21,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.collectionspace.services.common.article; +package org.collectionspace.services.common.publicitem; import java.io.InputStream; import org.collectionspace.authentication.spi.AuthNContext; -import org.collectionspace.services.article.PublicitemsCommon; +import org.collectionspace.services.publicitem.PublicitemsCommon; import org.collectionspace.services.client.PublicItemClient; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; @@ -54,9 +54,9 @@ import javax.ws.rs.core.UriInfo; @Path(PublicItemClient.SERVICE_PATH) @Consumes("application/xml") @Produces("application/xml") -public class ArticleResource extends ResourceBase { +public class PublicItemResource extends ResourceBase { - final Logger logger = LoggerFactory.getLogger(ArticleResource.class); + final Logger logger = LoggerFactory.getLogger(PublicItemResource.class); @Override protected String getVersionString() { @@ -91,15 +91,15 @@ public class ArticleResource extends ResourceBase { try { // - // First, extract the ArticlesCommon instance. + // First, extract the PublicitemsCommon instance. // RemoteServiceContext ctx = (RemoteServiceContext) createServiceContext(uriInfo); PoxPayloadOut poxPayloadOut = get(csid, ctx); - PublicitemsCommon articlesCommon = (PublicitemsCommon)poxPayloadOut.getPart(PublicItemClient.SERVICE_COMMON_PART_NAME).getBody(); + PublicitemsCommon publicitemsCommon = (PublicitemsCommon)poxPayloadOut.getPart(PublicItemClient.SERVICE_COMMON_PART_NAME).getBody(); // // Get the repository blob ID and retrieve the content as a stream // - String blobContentCsid = articlesCommon.getArticleContentRepositoryId(); + String blobContentCsid = publicitemsCommon.getContentId(); StringBuffer outMimeType = new StringBuffer(); BlobOutput blobOutput = NuxeoBlobUtils.getBlobOutput(ctx, getRepositoryClient(ctx), blobContentCsid, outMimeType); InputStream contentStream = blobOutput.getBlobInputStream(); @@ -108,7 +108,7 @@ public class ArticleResource extends ResourceBase { // Response.ResponseBuilder responseBuilder = Response.ok(contentStream, outMimeType.toString()); responseBuilder = responseBuilder.header("Content-Disposition","inline;filename=\"" - + articlesCommon.getArticleContentName() +"\""); + + publicitemsCommon.getContentName() +"\""); result = responseBuilder.build(); } catch (Exception e) { throw bigReThrow(e, ServiceMessages.READ_FAILED, csid); diff --git a/services/common/src/main/java/org/collectionspace/services/common/article/ArticleUtil.java b/services/common/src/main/java/org/collectionspace/services/common/publicitem/PublicItemUtil.java similarity index 61% rename from services/common/src/main/java/org/collectionspace/services/common/article/ArticleUtil.java rename to services/common/src/main/java/org/collectionspace/services/common/publicitem/PublicItemUtil.java index 6c63ba1eb..0a3fc18d7 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/article/ArticleUtil.java +++ b/services/common/src/main/java/org/collectionspace/services/common/publicitem/PublicItemUtil.java @@ -1,11 +1,11 @@ -package org.collectionspace.services.common.article; +package org.collectionspace.services.common.publicitem; import java.io.InputStream; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.collectionspace.services.article.PublicitemsCommon; +import org.collectionspace.services.publicitem.PublicitemsCommon; import org.collectionspace.services.blob.BlobsCommon; import org.collectionspace.services.client.PublicItemClient; import org.collectionspace.services.client.PoxPayloadIn; @@ -14,36 +14,39 @@ import org.collectionspace.services.common.ResourceMap; import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.TransactionException; import org.collectionspace.services.common.imaging.nuxeo.NuxeoBlobUtils; +import org.collectionspace.services.common.publicitem.PublicItemResource; import org.collectionspace.services.common.repository.RepositoryClient; -public class ArticleUtil { +public class PublicItemUtil { /* - * Sets common fields for an ArticlesCommon instance + * Sets common fields for an PublicitemsCommon instance */ - private static PublicitemsCommon setArticlesCommonMetadata( - PublicitemsCommon articlesCommon, + private static PublicitemsCommon setCommonMetadata( + PublicitemsCommon publicitemsCommon, UriInfo uriInfo, ServiceContext parentCtx) { - PublicitemsCommon result = articlesCommon; + PublicitemsCommon result = publicitemsCommon; if (result == null) { result = new PublicitemsCommon(); // If they passed in null, we'll create a new instance } - String itemSource = result.getItemSource(); + String itemSource = result.getContentSource(); if (itemSource == null || itemSource.trim().isEmpty()) { String publishingService = parentCtx.getServiceName(); // Overrides any existing value - result.setItemSource(publishingService); + result.setContentSource(publishingService); } - String publicUri = String.format("%s/%s/%s/%s", // e.g., publicitems/{csid}/{tenant ID}/content -// uriInfo.getBaseUri().toString(), // the base part of the URL - PublicItemClient.SERVICE_NAME, // the base service path to the Article service - PublicItemClient.CSID_PATH_PARAM_VAR, // the {csid} param part that will be filled in later in ArticleDocumentModelHandler.fillAllParts() method + // + // Store just a partial URL -just the CollectionSpace specific URI without the base URL. + // + String publicUri = String.format("%s/%s/%s/%s", // e.g., publicitems/{tenant ID}/{csid}/content + PublicItemClient.SERVICE_NAME, // the base service path to the PublicItem service + PublicItemClient.CSID_PATH_PARAM_VAR, // the {csid} param part that will be filled in later in PublicItemDocumentModelHandler.fillAllParts() method parentCtx.getTenantId(), // the tenant ID part PublicItemClient.PUBLICITEMS_CONTENT_SUFFIX); // the final "content" suffix - result.setItemContentUri(publicUri); + result.setContentUri(publicUri); return result; } @@ -52,19 +55,19 @@ public class ArticleUtil { * Publishes a PoxPayloadOut instance for public access */ public static Response publishToRepository( - PublicitemsCommon articlesCommon, + PublicitemsCommon publicitemsCommon, ResourceMap resourceMap, UriInfo uriInfo, ServiceContext parentCtx, PoxPayloadOut poxPayloadOut) { Response result = null; - articlesCommon = setArticlesCommonMetadata(articlesCommon, uriInfo, parentCtx); - PoxPayloadIn input = new PoxPayloadIn(PublicItemClient.SERVICE_PAYLOAD_NAME, articlesCommon, + publicitemsCommon = setCommonMetadata(publicitemsCommon, uriInfo, parentCtx); + PoxPayloadIn input = new PoxPayloadIn(PublicItemClient.SERVICE_PAYLOAD_NAME, publicitemsCommon, PublicItemClient.SERVICE_COMMON_PART_NAME); - ArticleResource articleResource = new ArticleResource(); - result = articleResource.create(parentCtx, resourceMap, uriInfo, input.getXmlPayload()); + PublicItemResource publicItemResource = new PublicItemResource(); + result = publicItemResource.create(parentCtx, resourceMap, uriInfo, input.getXmlPayload()); return result; } @@ -73,7 +76,7 @@ public class ArticleUtil { * Publishes a a byte stream for public access */ public static Response publishToRepository( - PublicitemsCommon articlesCommon, + PublicitemsCommon publicitemsCommon, ResourceMap resourceMap, UriInfo uriInfo, RepositoryClient repositoryClient, @@ -85,15 +88,15 @@ public class ArticleUtil { BlobsCommon blobsCommon = NuxeoBlobUtils.createBlobInRepository(parentCtx, repositoryClient, inputStream, streamName, false); - articlesCommon = setArticlesCommonMetadata(articlesCommon, uriInfo, parentCtx); - articlesCommon.setItemContentId(blobsCommon.getRepositoryId()); - articlesCommon.setItemContentName(streamName); + publicitemsCommon = setCommonMetadata(publicitemsCommon, uriInfo, parentCtx); + publicitemsCommon.setContentId(blobsCommon.getRepositoryId()); + publicitemsCommon.setContentName(streamName); PoxPayloadOut poxPayloadOut = new PoxPayloadOut(PublicItemClient.SERVICE_PAYLOAD_NAME); - poxPayloadOut.addPart(PublicItemClient.SERVICE_COMMON_PART_NAME, articlesCommon); + poxPayloadOut.addPart(PublicItemClient.SERVICE_COMMON_PART_NAME, publicitemsCommon); - ArticleResource articleResource = new ArticleResource(); - result = articleResource.create(parentCtx, resourceMap, uriInfo, poxPayloadOut.toXML()); + PublicItemResource publicItemResource = new PublicItemResource(); + result = publicItemResource.create(parentCtx, resourceMap, uriInfo, poxPayloadOut.toXML()); return result; } diff --git a/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java index 6b1f83a07..54c9a1f34 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java @@ -76,6 +76,13 @@ public class WorkflowDocumentModelHandler super.handleUpdate(wrapDoc); } + @Override + protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws ClientException { + // + // We are intentionally overriding this method to do nothing since the Workflow resource is a meta-resource without a refname + // + } + /* * Handle read (GET) */ 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 6e7a945de..f7a4a4aac 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 @@ -80,8 +80,8 @@ public abstract class DocumentModelHandler private final Logger logger = LoggerFactory.getLogger(DocumentModelHandler.class); private RepositoryInstance repositorySession; - protected String oldRefNameOnUpdate = null; - protected String newRefNameOnUpdate = null; + protected String oldRefNameOnUpdate = null; // FIXME: REM - We should have setters and getters for these + protected String newRefNameOnUpdate = null; // FIXME: two fields. /* * Map Nuxeo's life cycle object to our JAX-B based life cycle object @@ -398,7 +398,7 @@ public abstract class DocumentModelHandler return result; } - private void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws ClientException { + protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws ClientException { // First get the old refName this.oldRefNameOnUpdate = (String)docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA, CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME); @@ -407,7 +407,7 @@ public abstract class DocumentModelHandler if (refName != null) { this.newRefNameOnUpdate = refName.toString(); } else { - logger.error(String.format("refName for document is missing. Document CSID=%s", docModel.getName())); + logger.error(String.format("The refName for document is missing. Document CSID=%s", docModel.getName())); // FIXME: REM - We should probably be throwing an exception here? } // // Set the refName if it is an update or if the old refName was empty or null 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 884b61476..057778031 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 @@ -197,7 +197,7 @@ public abstract class RemoteDocumentModelHandlerImpl @Override public void handleWorkflowTransition(DocumentWrapper wrapDoc, TransitionDef transitionDef) throws Exception { - // Do nothing by default, but children can override if they want. The really workflow transition happens in the WorkflowDocumemtModelHandler class + // Do nothing by default, but children can override if they want. The real workflow transition happens in the WorkflowDocumemtModelHandler class } @Override diff --git a/services/pom.xml b/services/pom.xml index 59966d278..e9c1c405b 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -71,7 +71,7 @@ contact workflow media - article + publicitem IntegrationTests PerformanceTests diff --git a/services/article/3rdparty/build.xml b/services/publicitem/3rdparty/build.xml similarity index 100% rename from services/article/3rdparty/build.xml rename to services/publicitem/3rdparty/build.xml diff --git a/services/article/3rdparty/nuxeo-platform-cs-publicitem/build.xml b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/build.xml similarity index 100% rename from services/article/3rdparty/nuxeo-platform-cs-publicitem/build.xml rename to services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/build.xml diff --git a/services/article/3rdparty/nuxeo-platform-cs-publicitem/pom.xml b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml similarity index 100% rename from services/article/3rdparty/nuxeo-platform-cs-publicitem/pom.xml rename to services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml diff --git a/services/article/3rdparty/nuxeo-platform-cs-publicitem/src/main/resources/schemas/publicitems_common.xsd b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/src/main/resources/schemas/publicitems_common.xsd similarity index 100% rename from services/article/3rdparty/nuxeo-platform-cs-publicitem/src/main/resources/schemas/publicitems_common.xsd rename to services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/src/main/resources/schemas/publicitems_common.xsd diff --git a/services/article/3rdparty/pom.xml b/services/publicitem/3rdparty/pom.xml similarity index 100% rename from services/article/3rdparty/pom.xml rename to services/publicitem/3rdparty/pom.xml diff --git a/services/article/build.xml b/services/publicitem/build.xml similarity index 100% rename from services/article/build.xml rename to services/publicitem/build.xml diff --git a/services/article/client/pom.xml b/services/publicitem/client/pom.xml similarity index 100% rename from services/article/client/pom.xml rename to services/publicitem/client/pom.xml diff --git a/services/article/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java similarity index 95% rename from services/article/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java rename to services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java index c77dde6aa..5d96dea61 100644 --- a/services/article/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java +++ b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java @@ -17,7 +17,7 @@ package org.collectionspace.services.client; /** - * ArticleClient.java + * PublicItemClient.java * * $LastChangedRevision$ * $LastChangedDate$ @@ -25,7 +25,7 @@ package org.collectionspace.services.client; */ public class PublicItemClient extends AbstractCommonListPoxServiceClientImpl { - public static final String SERVICE_NAME = "articles"; + public static final String SERVICE_NAME = "publicitems"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT; public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/"; diff --git a/services/article/client/src/main/java/org/collectionspace/services/client/PublicItemProxy.java b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemProxy.java similarity index 97% rename from services/article/client/src/main/java/org/collectionspace/services/client/PublicItemProxy.java rename to services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemProxy.java index c51fff4e0..31d52c9a9 100644 --- a/services/article/client/src/main/java/org/collectionspace/services/client/PublicItemProxy.java +++ b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemProxy.java @@ -21,7 +21,7 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; /** - * ArticleProxy.java + * PublicItemProxy.java * * $LastChangedRevision$ * $LastChangedDate$ diff --git a/services/article/client/src/test/java/org/collectionspace/services/client/test/PublicItemServiceTest.java b/services/publicitem/client/src/test/java/org/collectionspace/services/client/test/PublicItemServiceTest.java similarity index 100% rename from services/article/client/src/test/java/org/collectionspace/services/client/test/PublicItemServiceTest.java rename to services/publicitem/client/src/test/java/org/collectionspace/services/client/test/PublicItemServiceTest.java diff --git a/services/article/jaxb/pom.xml b/services/publicitem/jaxb/pom.xml similarity index 100% rename from services/article/jaxb/pom.xml rename to services/publicitem/jaxb/pom.xml diff --git a/services/publicitem/jaxb/src/main/java/org/collectionspace/services/PublicitemsCommonJAXBSchema.java b/services/publicitem/jaxb/src/main/java/org/collectionspace/services/PublicitemsCommonJAXBSchema.java new file mode 100644 index 000000000..e07a8f76c --- /dev/null +++ b/services/publicitem/jaxb/src/main/java/org/collectionspace/services/PublicitemsCommonJAXBSchema.java @@ -0,0 +1,34 @@ +/** + * String constants to access XML element names of the PublicitemsCommon class. + */ +package org.collectionspace.services; + +/* + + + + + + + + + + + + + + + + */ + +public interface PublicitemsCommonJAXBSchema { + final static String ITEM_NUMBER = "itemNumber"; + final static String ITEM_CONTENT_NAME = "contentName"; + final static String ITEM_CONTENT_REPO_ID = "contentId"; + final static String ITEM_CONTENT_URI = "contentUri"; + final static String ITEM_JOB_ID = "contentCreationJobId"; + final static String ITEM_SOURCE = "contentSource"; + final static String ITEM_ACCESS_EXPIRATION_DATE = "contentExpirationDate"; + final static String ITEM_ACCESSED_COUNT = "contentAccessedCount"; + final static String ITEM_ACCESSED_COUNT_LIMIT = "contentAccessCountLimit"; +} \ No newline at end of file diff --git a/services/article/jaxb/src/main/resources/publicitems-common.xsd b/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd similarity index 100% rename from services/article/jaxb/src/main/resources/publicitems-common.xsd rename to services/publicitem/jaxb/src/main/resources/publicitems-common.xsd diff --git a/services/article/pom.xml b/services/publicitem/pom.xml similarity index 100% rename from services/article/pom.xml rename to services/publicitem/pom.xml diff --git a/services/article/service/pom.xml b/services/publicitem/service/pom.xml similarity index 100% rename from services/article/service/pom.xml rename to services/publicitem/service/pom.xml diff --git a/services/article/service/profiles.xml b/services/publicitem/service/profiles.xml similarity index 100% rename from services/article/service/profiles.xml rename to services/publicitem/service/profiles.xml diff --git a/services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemConstants.java b/services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemConstants.java similarity index 83% rename from services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemConstants.java rename to services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemConstants.java index 0a45c67b9..cb7197c1c 100644 --- a/services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemConstants.java +++ b/services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemConstants.java @@ -24,11 +24,11 @@ package org.collectionspace.services.publicitem.nuxeo; /** - * ArticleConstants specifies constants for the Articles In service + * PublicItemConstants specifies constants for the PubicItem service * */ public class PublicItemConstants { - public final static String NUXEO_DOCTYPE = "Article"; - public final static String NUXEO_SCHEMA_NAME = "article"; - public final static String NUXEO_DC_TITLE = "CollectionSpace-Article"; + public final static String NUXEO_DOCTYPE = "PublicItem"; + public final static String NUXEO_SCHEMA_NAME = "publicitem"; + public final static String NUXEO_DC_TITLE = "CollectionSpace-PublicItem"; } diff --git a/services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemDocumentModelHandler.java b/services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemDocumentModelHandler.java similarity index 89% rename from services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemDocumentModelHandler.java rename to services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemDocumentModelHandler.java index a90f709f7..ea889b92e 100644 --- a/services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemDocumentModelHandler.java +++ b/services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemDocumentModelHandler.java @@ -26,13 +26,13 @@ package org.collectionspace.services.publicitem.nuxeo; import javax.ws.rs.core.UriInfo; import org.collectionspace.services.PublicitemsCommonJAXBSchema; -import org.collectionspace.services.article.PublicitemsCommon; +import org.collectionspace.services.publicitem.PublicitemsCommon; import org.collectionspace.services.client.PublicItemClient; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; import org.nuxeo.ecm.core.api.DocumentModel; -/** ArticleDocumentModelHandler +/** PublicItemDocumentModelHandler * $LastChangedRevision$ * $LastChangedDate$ */ @@ -62,7 +62,7 @@ public class PublicItemDocumentModelHandler public void extractAllParts(DocumentWrapper wrapDoc) throws Exception { // - // Replace the URI with a fully qualified URL + // Replace the URI in the Nuxeo documentModel with a fully qualified URL // DocumentModel documentModel = wrapDoc.getWrappedObject(); String itemContentUri = (String) documentModel.getProperty(PublicItemClient.SERVICE_COMMON_PART_NAME, @@ -72,6 +72,12 @@ public class PublicItemDocumentModelHandler String url = String.format("%s%s", baseUrl, itemContentUri); documentModel.setProperty(PublicItemClient.SERVICE_COMMON_PART_NAME, PublicitemsCommonJAXBSchema.ITEM_CONTENT_URI, url); + + // + // Hand control back to the parent to extract the data from the Nuxeo document model + // and turn it into an XML response payload. + // + super.extractAllParts(wrapDoc); } } diff --git a/services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemValidatorHandler.java b/services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemValidatorHandler.java similarity index 100% rename from services/article/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemValidatorHandler.java rename to services/publicitem/service/src/main/java/org/collectionspace/services/publicitem/nuxeo/PublicItemValidatorHandler.java diff --git a/services/article/service/src/test/java/org/collectionspace/services/test/PublicItemServiceTest.java b/services/publicitem/service/src/test/java/org/collectionspace/services/test/PublicItemServiceTest.java similarity index 65% rename from services/article/service/src/test/java/org/collectionspace/services/test/PublicItemServiceTest.java rename to services/publicitem/service/src/test/java/org/collectionspace/services/test/PublicItemServiceTest.java index b33974f83..1c2905859 100644 --- a/services/article/service/src/test/java/org/collectionspace/services/test/PublicItemServiceTest.java +++ b/services/publicitem/service/src/test/java/org/collectionspace/services/test/PublicItemServiceTest.java @@ -1,7 +1,7 @@ package org.collectionspace.services.test; /** - * Placeholder for server-side testing of Articles service code. + * Placeholder for server-side testing of PublicItem service code. * * @version $Revision$ */ diff --git a/services/article/service/src/test/resources/log4j.xml b/services/publicitem/service/src/test/resources/log4j.xml similarity index 100% rename from services/article/service/src/test/resources/log4j.xml rename to services/publicitem/service/src/test/resources/log4j.xml diff --git a/services/report/client/src/test/java/org/collectionspace/services/client/test/ReportServiceTest.java b/services/report/client/src/test/java/org/collectionspace/services/client/test/ReportServiceTest.java index b893e68d4..ad6852558 100644 --- a/services/report/client/src/test/java/org/collectionspace/services/client/test/ReportServiceTest.java +++ b/services/report/client/src/test/java/org/collectionspace/services/client/test/ReportServiceTest.java @@ -141,8 +141,8 @@ public class ReportServiceTest extends AbstractPoxServiceTestImpl ctx = createServiceContext(); InputStream reportInputStream = invokeReport(ctx, csid, invContext, outMimeType, outReportFileName); - response = ArticleUtil.publishToRepository((PublicitemsCommon)null, resourceMap, uriInfo, getRepositoryClient(ctx), ctx, - reportInputStream, outReportFileName.toString()); + response = PublicItemUtil.publishToRepository( + (PublicitemsCommon)null, + resourceMap, + uriInfo, + getRepositoryClient(ctx), + ctx, + reportInputStream, + outReportFileName.toString()); } catch (Exception e) { throw bigReThrow(e, ServiceMessages.POST_FAILED); }