From 3ce6496355d55b4970d6f7815f11c21b0b40cf32 Mon Sep 17 00:00:00 2001 From: Laramie Crocker Date: Thu, 24 Mar 2011 21:54:14 +0000 Subject: [PATCH] nojira setting svn:ignore; ; --- .svnignore.txt | 4 ++++ .../jaxrs/CollectionSpaceJaxRsApplication.java | 4 ++-- .../resources/collectionspace-client.properties | 4 ++-- .../collectionobject/CollectionObjectResource.java | 14 ++------------ .../common/vocabulary/RefNameServiceUtils.java | 1 + ...RelationResource.java => RelationResource.java} | 12 +++++------- 6 files changed, 16 insertions(+), 23 deletions(-) create mode 100644 .svnignore.txt rename services/relation/service/src/main/java/org/collectionspace/services/relation/{NewRelationResource.java => RelationResource.java} (97%) diff --git a/.svnignore.txt b/.svnignore.txt new file mode 100644 index 000000000..41ad7b088 --- /dev/null +++ b/.svnignore.txt @@ -0,0 +1,4 @@ +.svn/* +.svn +*.iml + 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 7383e37ab..f669634d3 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 @@ -35,8 +35,8 @@ import org.collectionspace.services.objectexit.ObjectExitResource; import org.collectionspace.services.imports.ImportsResource; import org.collectionspace.services.location.LocationAuthorityResource; import org.collectionspace.services.movement.MovementResource; +import org.collectionspace.services.relation.RelationResource; import org.collectionspace.services.report.ReportResource; -import org.collectionspace.services.relation.NewRelationResource; import org.collectionspace.services.acquisition.AcquisitionResource; import org.collectionspace.services.dimension.DimensionResource; import org.collectionspace.services.contact.ContactResource; @@ -86,7 +86,7 @@ public class CollectionSpaceJaxRsApplication extends Application { singletons.add(new ContactResource()); singletons.add(new PersonAuthorityResource()); singletons.add(new OrgAuthorityResource()); - singletons.add(new NewRelationResource()); + singletons.add(new RelationResource()); singletons.add(new NoteResource()); singletons.add(new LoaninResource()); singletons.add(new LoanoutResource()); diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties index 4adcd000a..afdb63731 100644 --- a/services/client/src/main/resources/collectionspace-client.properties +++ b/services/client/src/main/resources/collectionspace-client.properties @@ -1,8 +1,8 @@ #url of the collectionspace server -cspace.url=http://localhost:8180/cspace-services/ +##cspace.url=http://localhost:8180/cspace-services/ #cspace.url=http://localhost:8200/cspace-services/ #for sockspy: -#cspace.url=http://localhost:8280/cspace-services/ +cspace.url=http://localhost:8280/cspace-services/ cspace.ssl=false cspace.auth=true diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java index d3dc89a6d..504707179 100644 --- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java +++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java @@ -25,10 +25,7 @@ */ package org.collectionspace.services.collectionobject; -import java.io.InputStream; //FIXME: REM - Please remove unneeded imports -import java.io.File; import java.util.ArrayList; -import java.util.Enumeration; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -53,13 +50,8 @@ import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; //import org.collectionspace.services.common.imaging.nuxeo.NuxeoImageUtils; //FIXME: REM - Please remove all unneeded imports import org.collectionspace.services.common.AbstractMultiPartCollectionSpaceResourceImpl; -import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.authorityref.AuthorityRefList; -import org.collectionspace.services.common.blob.BlobInput; -import org.collectionspace.services.blob.BlobsCommon; -import org.collectionspace.services.common.context.ServiceContextFactory; //import org.collectionspace.services.common.context.MultipartServiceContext; -import org.collectionspace.services.common.context.MultipartServiceContextFactory; import org.collectionspace.services.common.context.MultipartServiceContextImpl; import org.collectionspace.services.common.context.ServiceBindingUtils; import org.collectionspace.services.common.context.ServiceContext; @@ -71,16 +63,14 @@ import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.query.IQueryManager; import org.collectionspace.services.common.query.QueryManager; import org.collectionspace.services.common.security.UnauthorizedException; -import org.collectionspace.services.common.vocabulary.RefNameServiceUtils; import org.collectionspace.services.intake.IntakeResource; import org.collectionspace.services.intake.IntakesCommonList; //import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.client.java.DocumentModelHandler; -import org.collectionspace.services.relation.NewRelationResource; +import org.collectionspace.services.relation.RelationResource; import org.collectionspace.services.relation.RelationsCommonList; import org.collectionspace.services.relation.RelationshipType; import org.collectionspace.services.common.profile.Profiler; -import org.collectionspace.services.common.FileUtils; import org.jboss.resteasy.util.HttpResponseCodes; @@ -420,7 +410,7 @@ public class CollectionObjectResource String subjectCsid = csid; String predicate = RelationshipType.COLLECTIONOBJECT_INTAKE.value(); String objectCsid = null; - NewRelationResource relationResource = new NewRelationResource(); + RelationResource relationResource = new RelationResource(); RelationsCommonList relationsCommonList = relationResource.getRelationList(queryParams, subjectCsid, null, /*subjectType*/ diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java index aeac575a3..004785164 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java @@ -70,6 +70,7 @@ public class RefNameServiceUtils { AbstractCommonList commonList = (AbstractCommonList) wrapperList; commonList.setPageNum(pageNum); commonList.setPageSize(pageSize); + List list = wrapperList.getAuthorityRefDocItem(); diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java similarity index 97% rename from services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java rename to services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java index 4ccde9f82..2cba6a45d 100644 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java +++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java @@ -1,5 +1,5 @@ /** - * NewRelationResource.java + * RelationResource.java * * {Purpose of This Class} * @@ -54,27 +54,25 @@ import org.collectionspace.services.common.document.DocumentNotFoundException; import org.collectionspace.services.common.document.DocumentHandler; import org.collectionspace.services.common.security.UnauthorizedException; -import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; -import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; import org.jboss.resteasy.util.HttpResponseCodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * The Class NewRelationResource. + * The Class RelationResource. */ @Path("/relations") @Consumes("application/xml") @Produces("application/xml") -public class NewRelationResource extends +public class RelationResource extends AbstractMultiPartCollectionSpaceResourceImpl { /** The Constant serviceName. */ public final static String serviceName = "relations"; /** The logger. */ - final Logger logger = LoggerFactory.getLogger(NewRelationResource.class); + final Logger logger = LoggerFactory.getLogger(RelationResource.class); /* (non-Javadoc) * @see org.collectionspace.services.common.AbstractCollectionSpaceResource#getVersionString() @@ -117,7 +115,7 @@ public class NewRelationResource extends DocumentHandler handler = createDocumentHandler(ctx); String csid = getRepositoryClient(ctx).create(ctx, handler); UriBuilder path = UriBuilder - .fromResource(NewRelationResource.class); + .fromResource(RelationResource.class); path.path("" + csid); Response response = Response.created(path.build()).build(); return response; -- 2.47.3