@PathParam("csid") String parentspecifier,
@PathParam("itemcsid") String itemspecifier) {
PoxPayloadOut result = null;
- try {
+ try {
JaxRsContext jaxRsContext = new JaxRsContext(request, ui);
+ MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
Specifier parentSpec = getSpecifier(parentspecifier, "getAuthorityItem(parent)", "GET_ITEM");
Specifier itemSpec = getSpecifier(itemspecifier, "getAuthorityItem(item)", "GET_ITEM");
parentcsid = parentSpec.value;
} else {
String whereClause = buildWhereForAuthByName(parentSpec.value);
- ctx = (RemoteServiceContext)createServiceContext(getServiceName());
- parentcsid = getRepositoryClient(ctx).findDocCSID(ctx, whereClause);
+ ctx = (RemoteServiceContext)createServiceContext(getServiceName(), queryParams);
+ parentcsid = getRepositoryClient(ctx).findDocCSID(ctx, whereClause); //FIXME: REM - If the parent has been soft-deleted, should we be looking for the item?
}
- ctx = (RemoteServiceContext)createServiceContext(getItemServiceName());
+ ctx = (RemoteServiceContext)createServiceContext(getItemServiceName(), queryParams);
ctx.setJaxRsContext(jaxRsContext);
DocumentHandler handler = createItemDocumentHandler(ctx, parentcsid);
if(itemSpec.form==SpecifierForm.CSID) {
parentcsid = spec.value;
} else {
String whereClause = buildWhereForAuthByName(spec.value);
- ctx = createServiceContext(getServiceName());
+ ctx = createServiceContext(getServiceName(), queryParams);
parentcsid = getRepositoryClient(ctx).findDocCSID(ctx, whereClause);
}
ctx = createServiceContext(getItemServiceName(), queryParams);
DocumentHandler handler = createItemDocumentHandler(ctx, parentcsid);
DocumentFilter myFilter = handler.getDocumentFilter();
- myFilter.setWhereClause(
- authorityItemCommonSchemaName + ":"
- + AuthorityItemJAXBSchema.IN_AUTHORITY + "="
- + "'" + parentcsid + "'");
+ myFilter.appendWhereClause(authorityItemCommonSchemaName + ":" +
+ AuthorityItemJAXBSchema.IN_AUTHORITY + "=" +
+ "'" + parentcsid + "'",
+ IQueryManager.SEARCH_QUALIFIER_AND);
// AND vocabularyitems_common:displayName LIKE '%partialTerm%'
if (partialTerm != null && !partialTerm.isEmpty()) {
parentcsid = parentSpec.value;
} else {
String whereClause = buildWhereForAuthByName(parentSpec.value);
- ctx = createServiceContext(getServiceName());
- parentcsid = getRepositoryClient(ctx).findDocCSID(ctx, whereClause);
+ ctx = createServiceContext(getServiceName(), queryParams);
+ parentcsid = getRepositoryClient(ctx).findDocCSID(ctx, whereClause); //FIXME: REM - If the parent is soft-deleted should we still try to find the item?
}
ctx = createServiceContext(getItemServiceName(), queryParams);
String itemcsid;
} else {
String itemWhereClause =
buildWhereForAuthItemByName(itemSpec.value, parentcsid);
- itemcsid = getRepositoryClient(ctx).findDocCSID(ctx, itemWhereClause);
+ itemcsid = getRepositoryClient(ctx).findDocCSID(ctx, itemWhereClause); //FIXME: REM - Should we be looking for the 'wf_deleted' query param and filtering on it?
}
// Note that we have to create the service context for the Items, not the main service
DocumentHandler handler = createItemDocumentHandler(ctx, parentcsid);
* Basic CRUD operations\r
*/\r
\r
+ String getItemCommonPartName();\r
+ \r
//(C)reate Item\r
ClientResponse<Response> createItem(String vcsid, PoxPayloadOut poxPayloadOut);\r
\r
//(R)ead Item\r
ClientResponse<String> readItem(String vcsid, String csid);\r
+ \r
+ //(R)ead Item\r
+ ClientResponse<String> readItem(String vcsid, String csid, Boolean includeDeleted); \r
\r
//(U)pdate Item\r
ClientResponse<String> updateItem(String vcsid, String csid, PoxPayloadOut poxPayloadOut);\r
\r
ClientResponse<String> readByName(String name);\r
\r
+ ClientResponse<String> readByName(String name, Boolean includeDeleted);\r
+ \r
/*\r
* Item subresource methods\r
*/\r
*/\r
public ClientResponse<String> readNamedItem(String vcsid, String shortId);\r
\r
+ public ClientResponse<String> readNamedItem(String vcsid, String shortId, Boolean includeDeleted);\r
+\r
/**\r
* Read item in Named Authority.\r
*\r
*/\r
public ClientResponse<String> readItemInNamedAuthority(String authShortId, String csid);\r
\r
+ public ClientResponse<String> readItemInNamedAuthority(String authShortId, String csid, Boolean includeDeleted);\r
+\r
/**\r
* Read named item in Named Authority.\r
*\r
*/\r
public ClientResponse<String> readNamedItemInNamedAuthority(String authShortId, String itemShortId);\r
\r
+ public ClientResponse<String> readNamedItemInNamedAuthority(String authShortId, String itemShortId, Boolean includeDeleted);\r
+ \r
/**\r
* Read item list, filtering by partial term match, or keywords. Only one of\r
* partialTerm or keywords should be specified. If both are specified, keywords\r
*/\r
public ClientResponse<ILT> readItemList(String inAuthority, String partialTerm, String keywords);\r
\r
+ public ClientResponse<ILT> readItemList(String inAuthority, String partialTerm, String keywords, Boolean includeDeleted);\r
+ \r
/**\r
* Read item list for named vocabulary, filtering by partial term match, or keywords. Only one of\r
* partialTerm or keywords should be specified. If both are specified, keywords\r
public ClientResponse<ILT> readItemListForNamedAuthority(String specifier, \r
String partialTerm, String keywords);\r
\r
+ public ClientResponse<ILT> readItemListForNamedAuthority(String specifier, \r
+ String partialTerm, \r
+ String keywords,\r
+ Boolean includeDeleted);\r
+ \r
+ /*\r
+ * Workflow related methods\r
+ */\r
+ \r
+ public ClientResponse<String> readItemWorkflow(String vcsid, String csid);\r
+ \r
+ public ClientResponse<String> updateItemWorkflow(String vcsid, String csid, PoxPayloadOut workflowPayload);\r
}\r
extends AbstractPoxServiceClientImpl<LT, P>\r
implements AuthorityClient<LT, ILT, P> {\r
\r
+ private static final String INCLUDE_DELETE_TRUE = Boolean.TRUE.toString();\r
/*\r
* Basic CRUD proxied methods\r
*/\r
//(R)ead Item\r
@Override\r
public ClientResponse<String> readItem(String vcsid, String csid) {\r
- return getProxy().readItem(vcsid, csid);\r
+ return getProxy().readItem(vcsid, csid, INCLUDE_DELETE_TRUE);\r
+ }\r
+ \r
+ @Override\r
+ public ClientResponse<String> readItem(String vcsid, String csid, Boolean includeDeleted) {\r
+ return getProxy().readItem(vcsid, csid, includeDeleted.toString());\r
}\r
\r
//(U)pdate Item\r
public ClientResponse<AuthorityRefDocList> getReferencingObjects(\r
String parentcsid,\r
String itemcsid) {\r
- return getProxy().getReferencingObjects(parentcsid, itemcsid);\r
+ return getProxy().getReferencingObjects(parentcsid, itemcsid, Boolean.TRUE.toString());\r
}\r
\r
/**\r
\r
@Override\r
public ClientResponse<String> readByName(String name) {\r
- return getProxy().readByName(name);\r
+ return getProxy().readByName(name, INCLUDE_DELETE_TRUE);\r
+ }\r
+ \r
+ @Override\r
+ public ClientResponse<String> readByName(String name, Boolean includeDeleted) {\r
+ return getProxy().readByName(name, includeDeleted.toString());\r
}\r
\r
/*\r
*/\r
@Override\r
public ClientResponse<String> readNamedItem(String vcsid, String shortId) {\r
- return getProxy().readNamedItem(vcsid, shortId);\r
+ return getProxy().readNamedItem(vcsid, shortId, INCLUDE_DELETE_TRUE);\r
+ }\r
+\r
+ @Override\r
+ public ClientResponse<String> readNamedItem(String vcsid, String shortId, Boolean includeDeleted) {\r
+ return getProxy().readNamedItem(vcsid, shortId, includeDeleted.toString());\r
}\r
\r
/**\r
*/\r
@Override\r
public ClientResponse<String> readItemInNamedAuthority(String authShortId, String csid) {\r
- return getProxy().readItemInNamedAuthority(authShortId, csid);\r
+ return getProxy().readItemInNamedAuthority(authShortId, csid, INCLUDE_DELETE_TRUE);\r
+ }\r
+\r
+ @Override\r
+ public ClientResponse<String> readItemInNamedAuthority(String authShortId, String csid, Boolean includeDeleted) {\r
+ return getProxy().readItemInNamedAuthority(authShortId, csid, includeDeleted.toString());\r
}\r
\r
/**\r
*/\r
@Override\r
public ClientResponse<String> readNamedItemInNamedAuthority(String authShortId, String itemShortId) {\r
- return getProxy().readNamedItemInNamedAuthority(authShortId, itemShortId);\r
+ return getProxy().readNamedItemInNamedAuthority(authShortId, itemShortId, INCLUDE_DELETE_TRUE);\r
+ }\r
+\r
+ @Override\r
+ public ClientResponse<String> readNamedItemInNamedAuthority(String authShortId, String itemShortId, Boolean includeDeleted) {\r
+ return getProxy().readNamedItemInNamedAuthority(authShortId, itemShortId, includeDeleted.toString());\r
}\r
\r
/**\r
@Override\r
public ClientResponse<ILT> \r
readItemList(String inAuthority, String partialTerm, String keywords) {\r
- return getProxy().readItemList(inAuthority, partialTerm, keywords);\r
+ return getProxy().readItemList(inAuthority, partialTerm, keywords, INCLUDE_DELETE_TRUE);\r
+ }\r
+\r
+ @Override\r
+ public ClientResponse<ILT> \r
+ readItemList(String inAuthority, String partialTerm, String keywords, Boolean includeDeleted) {\r
+ return getProxy().readItemList(inAuthority, partialTerm, keywords, includeDeleted.toString());\r
}\r
\r
/**\r
@Override\r
public ClientResponse<ILT> readItemListForNamedAuthority(\r
String specifier, String partialTerm, String keywords) {\r
- return getProxy().readItemListForNamedAuthority(specifier, partialTerm, keywords);\r
+ return getProxy().readItemListForNamedAuthority(specifier, partialTerm, keywords, INCLUDE_DELETE_TRUE);\r
+ }\r
+\r
+ @Override\r
+ public ClientResponse<ILT> readItemListForNamedAuthority(\r
+ String specifier, \r
+ String partialTerm, \r
+ String keywords,\r
+ Boolean includeDeleted) {\r
+ return getProxy().readItemListForNamedAuthority(specifier, partialTerm, keywords, includeDeleted.toString());\r
}\r
+ \r
+ /*\r
+ * Workflow related methods\r
+ */\r
+ \r
+ @Override\r
+ public ClientResponse<String> readItemWorkflow(String vcsid, String csid) {\r
+ return getProxy().readItemWorkflow(vcsid, csid);\r
+ }\r
+ \r
+ @Override\r
+ public ClientResponse<String> updateItemWorkflow(String vcsid, String csid, PoxPayloadOut xmlPayload) {\r
+ return getProxy().updateItemWorkflow(vcsid, csid, xmlPayload.getBytes());\r
+ }\r
+ \r
}\r
package org.collectionspace.services.client;\r
\r
+import javax.ws.rs.Consumes;\r
import javax.ws.rs.DELETE;\r
import javax.ws.rs.GET;\r
import javax.ws.rs.POST;\r
import javax.ws.rs.QueryParam;\r
import javax.ws.rs.core.Response;\r
\r
+import org.collectionspace.services.client.workflow.WorkflowClient;\r
import org.collectionspace.services.common.authorityref.AuthorityRefDocList;\r
import org.collectionspace.services.common.authorityref.AuthorityRefList;\r
import org.collectionspace.services.jaxb.AbstractCommonList;\r
//(R)ead Item\r
@GET\r
@Path("/{vcsid}/items/{csid}")\r
- ClientResponse<String> readItem(@PathParam("vcsid") String vcsid, @PathParam("csid") String csid);\r
-\r
+ ClientResponse<String> readItem(@PathParam("vcsid") String vcsid,\r
+ @PathParam("csid") String csid,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
+ \r
//(U)pdate Item\r
@PUT\r
@Path("/{vcsid}/items/{csid}")\r
@Produces("application/xml")\r
ClientResponse<AuthorityRefDocList> getReferencingObjects(\r
@PathParam("csid") String parentcsid,\r
- @PathParam("itemcsid") String itemcsid);\r
+ @PathParam("itemcsid") String itemcsid,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
// List Item Authority References\r
@GET\r
//(R)ead by name\r
@GET\r
@Path("/urn:cspace:name({name})")\r
- ClientResponse<String> readByName(@PathParam("name") String name);\r
+ ClientResponse<String> readByName(@PathParam("name") String name,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
/*\r
* Item subresource methods\r
//(R)ead Named Item\r
@GET\r
@Path("/{vcsid}/items/urn:cspace:name({specifier})")\r
- ClientResponse<String> readNamedItem(@PathParam("vcsid") String vcsid, @PathParam("specifier") String specifier);\r
+ ClientResponse<String> readNamedItem(@PathParam("vcsid") String vcsid,\r
+ @PathParam("specifier") String specifier,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
//(R)ead Item In Named Authority\r
@GET\r
@Path("/urn:cspace:name({specifier})/items/{csid}")\r
- ClientResponse<String> readItemInNamedAuthority(@PathParam("specifier") String specifier, @PathParam("csid") String csid);\r
+ ClientResponse<String> readItemInNamedAuthority(@PathParam("specifier") String specifier,\r
+ @PathParam("csid") String csid,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
//(R)ead Named Item In Named Authority\r
@GET\r
@Path("/urn:cspace:name({specifier})/items/urn:cspace:name({itemspecifier})")\r
- ClientResponse<String> readNamedItemInNamedAuthority(@PathParam("specifier") String specifier, @PathParam("itemspecifier") String itemspecifier);\r
+ ClientResponse<String> readNamedItemInNamedAuthority(@PathParam("specifier") String specifier, \r
+ @PathParam("itemspecifier") String itemspecifier,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
/*\r
* Item subresource List methods\r
ClientResponse<ILT> readItemList(\r
@PathParam("csid") String vcsid,\r
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,\r
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);\r
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
// List Items for a named authority matching a partial term or keywords.\r
@GET\r
ClientResponse<ILT> readItemListForNamedAuthority(\r
@PathParam("specifier") String specifier,\r
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,\r
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);\r
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,\r
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);\r
\r
+ /*\r
+ * Workflow related methods\r
+ * \r
+ */\r
+ \r
+ //(R)ead Item workflow\r
+ @GET\r
+ @Produces({"application/xml"})\r
+ @Consumes({"application/xml"}) \r
+ @Path("/{vcsid}/items/{csid}" + WorkflowClient.SERVICE_PATH)\r
+ ClientResponse<String> readItemWorkflow(@PathParam("vcsid") String vcsid,\r
+ @PathParam("csid") String csid);\r
+ \r
+ //(U)pdate Item workflow\r
+ @PUT\r
+ @Path("/{vcsid}/items/{csid}" + WorkflowClient.SERVICE_PATH)\r
+ ClientResponse<String> updateItemWorkflow(@PathParam("vcsid") String vcsid,\r
+ @PathParam("csid") String csid,\r
+ byte[] xmlPayload);\r
+ \r
}\r
import java.io.File;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.collectionspace.services.jaxb.AbstractCommonList;
import org.collectionspace.services.workflow.WorkflowCommon;
import org.collectionspace.services.client.AbstractPoxServiceClientImpl;
+import org.collectionspace.services.client.AuthorityClient;
import org.collectionspace.services.client.CollectionSpaceClient;
import org.collectionspace.services.client.CollectionSpacePoxClient;
import org.collectionspace.services.client.PayloadOutputPart;
}
/* Use this to keep track of resources to delete */
protected List<String> allResourceIdsCreated = new ArrayList<String>();
+ /* Use this to track authority items */
+ protected Map<String, String> allResourceItemIdsCreated = new HashMap<String, String>(); /* itemCsid, parentCsid */
+
private String EMPTY_SORT_BY_ORDER = "";
/**
logger.debug("Cleaning up temporary resources created for testing ...");
}
CollectionSpaceClient client = this.getClientInstance();
+ //
+ // First, check to see if we need to cleanup any authority items
+ //
+ if (this.isAuthorityClient(client) == true) {
+ AuthorityClient authorityClient = (AuthorityClient)client;
+ for (Map.Entry<String, String> entry : allResourceItemIdsCreated.entrySet()) {
+ String itemResourceId = entry.getKey();
+ String authorityResourceId = entry.getValue();
+ // Note: Any non-success responses are ignored and not reported.
+ authorityClient.deleteItem(authorityResourceId, itemResourceId).releaseConnection();
+ }
+ }
+ //
+ // Next, delete all other entities include possible authorities.
+ //
for (String resourceId : allResourceIdsCreated) {
// Note: Any non-success responses are ignored and not reported.
client.delete(resourceId).releaseConnection();
Assert.assertEquals(updatedWorkflowCommons.getCurrentLifeCycleState(), lifeCycleState);
}
- private CollectionSpacePoxClient assertPoxCandidate() {
+ private CollectionSpacePoxClient assertPoxClient() {
CollectionSpaceClient clientCandidate = this.getClientInstance();
if (CollectionSpacePoxClient.class.isInstance(clientCandidate) != true) { //FIXME: REM - We should remove this check and instead make CollectionSpaceClient support the readIncludeDeleted() method.
String clientCandidateName = "Unknown";
//
// Ask for a list of all resources filtered by the incoming 'includeDeleted' workflow param
//
- CollectionSpacePoxClient client = assertPoxCandidate();
+ CollectionSpacePoxClient client = assertPoxClient();
ClientResponse<AbstractCommonList> res = client.readIncludeDeleted(includeDeleted);
AbstractCommonList list = res.getEntity();
int statusCode = res.getStatus();
return result;
}
+ protected long readItemsIncludeDeleted(String testName, String parentCsid, Boolean includeDeleted) {
+ long result = 0;
+ // Perform setup.
+ setupReadList();
+
+ //
+ // Ask for a list of all resources filtered by the incoming 'includeDeleted' workflow param
+ //
+ AuthorityClient client = (AuthorityClient)this.getClientInstance();
+ ClientResponse<AbstractCommonList> res = client.readItemList(parentCsid,
+ null, /* partial terms */
+ null, /* keywords */
+ includeDeleted);
+ AbstractCommonList list = res.getEntity();
+ int statusCode = res.getStatus();
+ //
+ // Check the status code of the response: does it match
+ // the expected response(s)?
+ //
+ if (logger.isDebugEnabled()) {
+ logger.debug(testName + ": status = " + statusCode);
+ }
+ Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
+ invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
+ Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
+
+ result = list.getTotalItems();
+
+ return result;
+ }
+
/*
* This test assumes that no objects exist yet.
*
//
// Next, test that a GET with WorkflowClient.WORKFLOWSTATE_DELETED query param set to 'false' returns a 404
//
- CollectionSpacePoxClient client = this.assertPoxCandidate();
+ CollectionSpacePoxClient client = this.assertPoxClient();
ClientResponse<String> res = client.readIncludeDeleted(csid, Boolean.FALSE);
int result = res.getStatus();
Assert.assertEquals(result, STATUS_NOT_FOUND);
logger.warn("Sub-class test clients should override this method");
throw new UnsupportedOperationException();
}
+
+ /*
+ * Test classes for authority services should override these method and return 'true'
+ */
+ protected boolean isAuthorityClient(CollectionSpaceClient theClient) {
+ return AuthorityClient.class.isInstance(theClient);
+ }
+
+ protected PoxPayloadOut createItemInstance(String parentCsid, String identifier) {
+ logger.warn("Sub-class test clients should override this method");
+ throw new UnsupportedOperationException();
+ }
+
+ final protected String createWorkflowItemTarget(String testName, String parentCsid) throws Exception {
+ String result = null;
+
+ result = createTestItemObject(testName, parentCsid);
+
+ return result;
+ }
+
+ protected String createTestItemObject(String testName, String parentCsid) throws Exception {
+ String result = null;
+
+ AuthorityClient client = (AuthorityClient)getClientInstance();
+ String identifier = createIdentifier();
+ PoxPayloadOut multipart = createItemInstance(parentCsid, identifier);
+ ClientResponse<Response> res = client.createItem(parentCsid, multipart);
+
+ int statusCode = res.getStatus();
+ Assert.assertEquals(statusCode, STATUS_CREATED);
+
+ result = extractId(res);
+ allResourceItemIdsCreated.put(result, parentCsid);
+
+ return result;
+ }
+
+ /*
+ * This test assumes that no objects exist yet.
+ *
+ * http://localhost:8180/cspace-services/intakes?wf_deleted=false
+ */
+ @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class)
+ public void readAuthorityItemWorkflow(String testName) throws Exception {
+ //
+ // Run this test only if the client is an AuthorityClient //FIXME: REM - Replace this will an AuthorityServiceTest class
+ //
+ if (this.isAuthorityClient(this.getClientInstance()) == true) {
+ try {
+ //
+ // Get the total count of non-deleted existing records
+ //
+ String parentCsid = this.createTestObject(testName);
+
+ //
+ // Create 3 new items
+ //
+ final int OBJECTS_TO_CREATE = 3;
+ String lastCreatedItem = null;
+ for (int i = 0; i < OBJECTS_TO_CREATE; i++) {
+ lastCreatedItem = this.createWorkflowItemTarget(testName, parentCsid);
+ }
+
+ //
+ // Mark one item as soft deleted
+ //
+ String csid = lastCreatedItem;
+ this.setupUpdate();
+ this.updateItemLifeCycleState(testName, parentCsid, csid, WorkflowClient.WORKFLOWSTATE_DELETED);
+ //
+ // Read the list of existing non-deleted records
+ //
+ long updatedTotal = readItemsIncludeDeleted(testName, parentCsid, Boolean.FALSE);
+ Assert.assertEquals(updatedTotal, OBJECTS_TO_CREATE - 1, "Deleted items seem to be returned in list results.");
+
+ //
+ // Next, test that a GET with WorkflowClient.WORKFLOWSTATE_DELETED query param set to 'false' returns a 404
+ //
+ AuthorityClient client = (AuthorityClient)this.getClientInstance();
+ ClientResponse<String> res = client.readItem(parentCsid, csid, Boolean.FALSE);
+ int result = res.getStatus();
+ Assert.assertEquals(result, STATUS_NOT_FOUND);
+
+ } catch (UnsupportedOperationException e) {
+ logger.warn(this.getClass().getName() + " did not implement createWorkflowTarget() method. No workflow tests performed.");
+ return;
+ }
+ }
+ }
+
+ protected void updateItemLifeCycleState(String testName, String parentCsid, String itemCsid, String lifeCycleState) throws Exception {
+ //
+ // Read the existing object
+ //
+ AuthorityClient client = (AuthorityClient)this.getClientInstance();
+ ClientResponse<String> res = client.readItemWorkflow(parentCsid, itemCsid);
+ assertStatusCode(res, testName);
+ logger.debug("Got object to update life cycle state with ID: " + itemCsid);
+ PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
+ WorkflowCommon workflowCommons = (WorkflowCommon) extractPart(input, WorkflowClient.SERVICE_COMMONPART_NAME, WorkflowCommon.class);
+ Assert.assertNotNull(workflowCommons);
+ //
+ // Mark it for a soft delete.
+ //
+ logger.debug("Current workflow state:" + objectAsXmlString(workflowCommons, WorkflowCommon.class));
+ workflowCommons.setCurrentLifeCycleState(lifeCycleState);
+ PoxPayloadOut output = new PoxPayloadOut(WorkflowClient.SERVICE_PAYLOAD_NAME);
+ PayloadOutputPart commonPart = output.addPart(WorkflowClient.SERVICE_COMMONPART_NAME, workflowCommons);
+ //
+ // Perform the update
+ //
+ res = client.updateItemWorkflow(parentCsid, itemCsid, output);
+ assertStatusCode(res, testName);
+ input = new PoxPayloadIn(res.getEntity());
+ WorkflowCommon updatedWorkflowCommons = (WorkflowCommon) extractPart(input, WorkflowClient.SERVICE_COMMONPART_NAME, WorkflowCommon.class);
+ Assert.assertNotNull(updatedWorkflowCommons);
+ //
+ // Read the updated object and make sure it was updated correctly.
+ //
+ res = client.readItemWorkflow(parentCsid, itemCsid);
+ assertStatusCode(res, testName);
+ logger.debug("Got workflow state of updated object with ID: " + itemCsid);
+ input = new PoxPayloadIn(res.getEntity());
+ updatedWorkflowCommons = (WorkflowCommon) extractPart(input, WorkflowClient.SERVICE_COMMONPART_NAME, WorkflowCommon.class);
+ Assert.assertNotNull(workflowCommons);
+ Assert.assertEquals(updatedWorkflowCommons.getCurrentLifeCycleState(), lifeCycleState);
+ }
}
return SERVICE_PATH_COMPONENT;
}
+ @Override
public String getItemCommonPartName() {
return getCommonPartName(SERVICE_ITEM_NAME);
}
ClientResponse<LocationsCommonList> readItemList(
@PathParam("csid") String vcsid,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
// List Items for a named authority matching a partial term or keywords.
@Override
ClientResponse<LocationsCommonList> readItemListForNamedAuthority(
@PathParam("specifier") String specifier,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
@Override
@GET
log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
\r
#packages\r
-log4j.logger.org.collectionspace.services.client.PoxPayloadIn=TRACE\r
-log4j.logger.org.collectionspace.services.client.PoxPayloadOut=TRACE\r
+log4j.logger.org.collectionspace.services.client.PoxPayloadIn=DEBUG\r
+log4j.logger.org.collectionspace.services.client.PoxPayloadOut=DEBUG\r
\r
-log4j.logger.org.collectionspace=ERROR\r
+log4j.logger.org.collectionspace=DEBUG\r
log4j.logger.org.apache=INFO\r
log4j.logger.httpclient=INFO\r
log4j.logger.org.jboss.resteasy=INFO\r
return OrgAuthorityProxy.class;
}
+ @Override
public String getItemCommonPartName() {
return getCommonPartName(SERVICE_ITEM_NAME);
}
ClientResponse<OrganizationsCommonList> readItemList(
@PathParam("csid") String vcsid,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
// List Items for a named authority matching a partial term or keywords.
@Override
ClientResponse<OrganizationsCommonList> readItemListForNamedAuthority(
@PathParam("specifier") String specifier,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
}
import javax.ws.rs.core.Response;
import org.collectionspace.services.OrganizationJAXBSchema;
+import org.collectionspace.services.PersonJAXBSchema;
import org.collectionspace.services.client.CollectionSpaceClient;
import org.collectionspace.services.client.ContactClient;
import org.collectionspace.services.client.ContactClientUtils;
import org.collectionspace.services.client.PayloadOutputPart;
+import org.collectionspace.services.client.PersonAuthorityClient;
+import org.collectionspace.services.client.PersonAuthorityClientUtils;
import org.collectionspace.services.client.PoxPayloadIn;
import org.collectionspace.services.client.PoxPayloadOut;
import org.collectionspace.services.contact.ContactsCommon;
allResourceIdsCreated.add(newID);
}
+ @Override
+ protected PoxPayloadOut createInstance(String identifier) {
+ OrgAuthorityClient client = new OrgAuthorityClient();
+ String displayName = "displayName-" + identifier;
+ PoxPayloadOut multipart = OrgAuthorityClientUtils.createOrgAuthorityInstance(
+ displayName, identifier, client.getCommonPartName());
+ return multipart;
+ }
+
+ @Override
+ protected PoxPayloadOut createItemInstance(String parentCsid, String identifier) {
+ String headerLabel = new OrgAuthorityClient().getItemCommonPartName();
+ String shortId = "testOrg";
+ Map<String, String> testOrgMap = new HashMap<String,String>();
+ testOrgMap.put(OrganizationJAXBSchema.SHORT_IDENTIFIER, shortId);
+ testOrgMap.put(OrganizationJAXBSchema.SHORT_NAME, TEST_ORG_SHORTNAME);
+ testOrgMap.put(OrganizationJAXBSchema.LONG_NAME, "The real official test organization");
+ testOrgMap.put(OrganizationJAXBSchema.FOUNDING_DATE, "May 26, 1907");
+ testOrgMap.put(OrganizationJAXBSchema.FOUNDING_PLACE, TEST_ORG_FOUNDING_PLACE);
+
+ return OrgAuthorityClientUtils.createOrganizationInstance(identifier, testOrgMap, headerLabel);
+ }
+
/**
* Creates the item.
*
return SERVICE_PATH_COMPONENT;
}
+ @Override
public String getItemCommonPartName() {
- return getCommonPartName(SERVICE_ITEM_NAME);
+ return getCommonPartName(SERVICE_ITEM_PAYLOAD_NAME);
+ }
+
+ @Deprecated // Use getItemCommonPartName() instead
+ public String getCommonPartItemName() {
+ return getCommonPartName(SERVICE_ITEM_PAYLOAD_NAME);
}
@Override
* @return the multipart output\r
*/\r
public static PoxPayloadOut createPersonInstance(String inAuthority,\r
- String personAuthRefName, Map<String, String> personInfo,\r
- String headerLabel){\r
+ String personAuthRefName,\r
+ Map<String, String> personInfo,\r
+ String headerLabel){\r
final Map<String, List<String>> EMPTY_PERSON_REPEATABLES_INFO =\r
new HashMap<String, List<String>>();\r
return createPersonInstance(inAuthority, personAuthRefName, personInfo,\r
ClientResponse<PersonsCommonList> readItemList(
@PathParam("csid") String vcsid,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
// List Items for a named authority matching a partial term or keywords.
@Override
ClientResponse<PersonsCommonList> readItemListForNamedAuthority(
@PathParam("specifier") String specifier,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
}
import org.collectionspace.services.client.ContactClient;
import org.collectionspace.services.client.ContactClientUtils;
+import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
import org.collectionspace.services.contact.ContactsCommon;
import org.collectionspace.services.contact.ContactsCommonList;
allResourceIdsCreated.add(newID);
}
+ @Override
+ protected PoxPayloadOut createInstance(String identifier) {
+ PersonAuthorityClient client = new PersonAuthorityClient();
+ String displayName = "displayName-" + identifier;
+ PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonAuthorityInstance(
+ displayName, identifier, client.getCommonPartName());
+ return multipart;
+ }
+
+ @Override
+ protected PoxPayloadOut createItemInstance(String parentCsid, String identifier) {
+ String headerLabel = new PersonAuthorityClient().getItemCommonPartName();
+ HashMap<String, String> personInfo = new HashMap<String, String>();
+ String shortId = "johnWayneTempActor";
+ personInfo.put(PersonJAXBSchema.DISPLAY_NAME_COMPUTED, "false");
+ personInfo.put(PersonJAXBSchema.DISPLAY_NAME, "John Wayne Temp");
+ personInfo.put(PersonJAXBSchema.SHORT_DISPLAY_NAME_COMPUTED, "false");
+ personInfo.put(PersonJAXBSchema.SHORT_DISPLAY_NAME, "JohnWayneTemp");
+ personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
+
+ return PersonAuthorityClientUtils.createPersonInstance(parentCsid, identifier, personInfo, headerLabel);
+ }
+
/**
* Creates the item.
*
+<?xml version="1.0" encoding="UTF-8"?>\r
<classpath>\r
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
- <classpathentry kind="output" path="target/classes"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/javax/script/script-api/1.0/script-api-1.0.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/EditableImage/0.9.5/EditableImage-0.9.5.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4.jar" sourcepath="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/imagej/imagej/1.4.1.e/imagej-1.4.1.e.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/JAI-Adapter/0.9.5/JAI-Adapter-0.9.5.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/media/jai_codec/1.1.2_01/jai_codec-1.1.2_01.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/cup/java-cup/0.11a/java-cup-0.11a.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.0.4.GA/jboss-common-4.0.4.GA.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP1/jboss-remoting-2.2.2.SP1.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1H.7/jetty-6.1H.7.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1H.7/jetty-util-6.1H.7.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/media/mlib_jai/1.1.2_01/mlib_jai-1.1.2_01.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.5/mysql-connector-java-5.1.5.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/common/nuxeo-common/1.6.2/nuxeo-common-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core/1.6.2/nuxeo-core-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-api/1.6.2/nuxeo-core-api-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-client/1.6.2/nuxeo-core-client-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-convert-api/1.6.2/nuxeo-core-convert-api-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-event/1.6.2/nuxeo-core-event-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-facade/1.6.2/nuxeo-core-facade-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-io/1.6.2/nuxeo-core-io-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.client"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.common"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
- <classpathentry kind="src" path="/org.collectionspace.services.vocabulary.jaxb"/>\r
- <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.0.7/org.restlet-1.0.7.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1H.7/servlet-api-2.5-6.1H.7.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
- <attributes>\r
- <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
- </attributes>\r
- </classpathentry>\r
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/xsom/20060306/xsom-20060306.jar"/>\r
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+ <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
*
* @return the item common part name
*/
- public String getCommonPartItemName() {
+ @Override
+ public String getItemCommonPartName() {
return getCommonPartName(SERVICE_ITEM_PAYLOAD_NAME);
}
+ @Deprecated // Use getItemCommonPartName() instead
+ public String getCommonPartItemName() {
+ return getCommonPartName(SERVICE_ITEM_PAYLOAD_NAME);
+ }
+
/*
* Service calls
*/
ClientResponse<VocabularyitemsCommonList> readItemList(
@PathParam("csid") String vcsid,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
// List Items for a named authority matching a partial term or keywords.
@Override
ClientResponse<VocabularyitemsCommonList> readItemListForNamedAuthority(
@PathParam("specifier") String specifier,
@QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm,
- @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords);
+ @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords,
+ @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted);
}
private String knownResourceFullRefName = null;
private String knownItemResourceId = null;
private int nItemsToCreateInList = 5;
- private List<String> allResourceIdsCreated = new ArrayList<String>();
- private Map<String, String> allResourceItemIdsCreated =
- new HashMap<String, String>();
+// private List<String> allResourceIdsCreated = new ArrayList<String>();
+// private Map<String, String> allResourceItemIdsCreated =
+// new HashMap<String, String>();
protected void setKnownResource(String id, String shortIdentifer,
String refName, String fullRefName) {
PoxPayloadOut multipart = VocabularyClientUtils.createEnumerationInstance(
displayName, identifier, client.getCommonPartName());
return multipart;
- }
-
+ }
// ---------------------------------------------------------------
// CRUD tests : CREATE tests
}
+ @Override
+ protected PoxPayloadOut createItemInstance(String parentCsid, String identifier) {
+ String headerLabel = new VocabularyClient().getItemCommonPartName();
+ HashMap<String, String> vocabItemInfo = new HashMap<String, String>();
+ String shortId = createIdentifier();
+ vocabItemInfo.put(AuthorityItemJAXBSchema.SHORT_IDENTIFIER, shortId);
+ vocabItemInfo.put(AuthorityItemJAXBSchema.DISPLAY_NAME, "display-" + shortId);
+
+ return VocabularyClientUtils.createVocabularyItemInstance(identifier, vocabItemInfo, headerLabel);
+ }
+
@Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
dependsOnMethods = {"create"})
public void createItem(String testName) {
* at any point during testing, even if some of those resources
* may be expected to be deleted by certain tests.
*/
- @AfterClass(alwaysRun = true)
- public void cleanUp() {
- String noTest = System.getProperty("noTestCleanup");
- if (Boolean.TRUE.toString().equalsIgnoreCase(noTest)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Skipping Cleanup phase ...");
- }
- return;
- }
- if (logger.isDebugEnabled()) {
- logger.debug("Cleaning up temporary resources created for testing ...");
- }
- VocabularyClient client = new VocabularyClient();
- String vocabularyResourceId;
- String vocabularyItemResourceId;
- // Clean up vocabulary item resources.
- for (Map.Entry<String, String> entry : allResourceItemIdsCreated.entrySet()) {
- vocabularyItemResourceId = entry.getKey();
- vocabularyResourceId = entry.getValue();
- // Note: Any non-success responses are ignored and not reported.
- client.deleteItem(vocabularyResourceId, vocabularyItemResourceId).releaseConnection();
- }
- // Clean up vocabulary resources.
- for (String resourceId : allResourceIdsCreated) {
- // Note: Any non-success responses are ignored and not reported.
- client.delete(resourceId).releaseConnection();
- }
-
- }
+// @AfterClass(alwaysRun = true)
+// public void cleanUp() {
+// String noTest = System.getProperty("noTestCleanup");
+// if (Boolean.TRUE.toString().equalsIgnoreCase(noTest)) {
+// if (logger.isDebugEnabled()) {
+// logger.debug("Skipping Cleanup phase ...");
+// }
+// return;
+// }
+// if (logger.isDebugEnabled()) {
+// logger.debug("Cleaning up temporary resources created for testing ...");
+// }
+// VocabularyClient client = new VocabularyClient();
+// String vocabularyResourceId;
+// String vocabularyItemResourceId;
+// // Clean up vocabulary item resources.
+// for (Map.Entry<String, String> entry : allResourceItemIdsCreated.entrySet()) {
+// vocabularyItemResourceId = entry.getKey();
+// vocabularyResourceId = entry.getValue();
+// // Note: Any non-success responses are ignored and not reported.
+// client.deleteItem(vocabularyResourceId, vocabularyItemResourceId).releaseConnection();
+// }
+// // Clean up vocabulary resources.
+// for (String resourceId : allResourceIdsCreated) {
+// // Note: Any non-success responses are ignored and not reported.
+// client.delete(resourceId).releaseConnection();
+// }
+//
+// }
// ---------------------------------------------------------------
// Utility methods used by tests above
projects / tmp / jakarta-migration.git / commitdiff