From: Richard Millet Date: Wed, 16 Feb 2011 00:20:18 +0000 (+0000) Subject: CSPACE-3574: Merging Plain Old XML payload work into trunk. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6c30caefc2615ac2801edb7ec8debcfff3394dba;p=tmp%2Fjakarta-migration.git CSPACE-3574: Merging Plain Old XML payload work into trunk. --- diff --git a/services/JaxRsServiceProvider/.classpath b/services/JaxRsServiceProvider/.classpath index bd6bf38eb..770908c36 100644 --- a/services/JaxRsServiceProvider/.classpath +++ b/services/JaxRsServiceProvider/.classpath @@ -1,9 +1,404 @@ - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/JaxRsServiceProvider/.project b/services/JaxRsServiceProvider/.project index 8e9b7cd3d..8a3b33c9d 100644 --- a/services/JaxRsServiceProvider/.project +++ b/services/JaxRsServiceProvider/.project @@ -1,36 +1,75 @@ - org.collectionspace.services.jaxrs.provider - + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - org.collectionspace.services.authorization-mgt + org.collectionspace.services.3rdparty.nuxeo.quote-api + org.collectionspace.services.account.jaxb + org.collectionspace.services.account.service + org.collectionspace.services.acquisition.client org.collectionspace.services.acquisition.jaxb org.collectionspace.services.acquisition.service + org.collectionspace.services.authentication.jaxb + org.collectionspace.services.authorization-mgt.service + org.collectionspace.services.authorization.jaxb + org.collectionspace.services.authorization.service + org.collectionspace.services.blob.client + org.collectionspace.services.blob.service + org.collectionspace.services.client + org.collectionspace.services.collectionobject.client org.collectionspace.services.collectionobject.jaxb org.collectionspace.services.collectionobject.service org.collectionspace.services.common - org.collectionspace.services.id.jaxb + org.collectionspace.services.contact.client + org.collectionspace.services.contact.jaxb + org.collectionspace.services.contact.service + org.collectionspace.services.dimension.jaxb + org.collectionspace.services.dimension.service + org.collectionspace.services.hyperjaxb org.collectionspace.services.id.service + org.collectionspace.services.intake.client org.collectionspace.services.intake.jaxb org.collectionspace.services.intake.service + org.collectionspace.services.jaxb + org.collectionspace.services.loanin.jaxb + org.collectionspace.services.loanin.service + org.collectionspace.services.loanout.jaxb + org.collectionspace.services.loanout.service + org.collectionspace.services.location.client + org.collectionspace.services.location.jaxb + org.collectionspace.services.location.service + org.collectionspace.services.media.client + org.collectionspace.services.media.jaxb + org.collectionspace.services.media.service + org.collectionspace.services.movement.jaxb + org.collectionspace.services.movement.service + org.collectionspace.services.note.jaxb + org.collectionspace.services.note.service + org.collectionspace.services.objectexit.client + org.collectionspace.services.objectexit.jaxb + org.collectionspace.services.objectexit.service + org.collectionspace.services.organization.client + org.collectionspace.services.organization.jaxb + org.collectionspace.services.organization.service + org.collectionspace.services.person.client + org.collectionspace.services.person.jaxb + org.collectionspace.services.person.service org.collectionspace.services.relation.service + org.collectionspace.services.report.jaxb + org.collectionspace.services.report.service + org.collectionspace.services.vocabulary.client org.collectionspace.services.vocabulary.jaxb org.collectionspace.services.vocabulary.service org.eclipse.jdt.core.javabuilder - - org.maven.ide.eclipse.maven2Builder - - org.maven.ide.eclipse.maven2Nature org.eclipse.jdt.core.javanature - + \ No newline at end of file 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 590ca0247..6d745dfcf 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 @@ -49,13 +49,13 @@ import javax.ws.rs.core.Application; import java.util.HashSet; import java.util.Set; -import org.collectionspace.services.common.FileUtils; +//import org.collectionspace.services.common.FileUtils; import org.collectionspace.services.authorization.PermissionResource; import org.collectionspace.services.authorization.RoleResource; import org.collectionspace.services.common.security.SecurityInterceptor; -import org.collectionspace.services.common.document.DocumentUtils; -import org.collectionspace.services.common.imaging.nuxeo.NuxeoImageUtils; -import org.collectionspace.services.common.profile.Profiler; +//import org.collectionspace.services.common.document.DocumentUtils; +//import org.collectionspace.services.common.imaging.nuxeo.NuxeoImageUtils; +//import org.collectionspace.services.common.profile.Profiler; /** * CollectionSpaceJaxRsApplication, the root application @@ -79,25 +79,24 @@ public class CollectionSpaceJaxRsApplication extends Application { singletons.add(new RoleResource()); singletons.add(new PermissionResource()); singletons.add(new CollectionObjectResource()); - singletons.add(new IDResource()); - singletons.add(new NoteResource()); singletons.add(new IntakeResource()); + singletons.add(new VocabularyResource()); + singletons.add(new DimensionResource()); + singletons.add(new ContactResource()); + singletons.add(new PersonAuthorityResource()); + singletons.add(new OrgAuthorityResource()); + singletons.add(new NewRelationResource()); + singletons.add(new NoteResource()); singletons.add(new LoaninResource()); singletons.add(new LoanoutResource()); + singletons.add(new AcquisitionResource()); singletons.add(new ObjectExitResource()); - singletons.add(new LocationAuthorityResource()); singletons.add(new MediaResource()); singletons.add(new BlobResource()); singletons.add(new MovementResource()); singletons.add(new ReportResource()); - singletons.add(new AcquisitionResource()); - singletons.add(new NewRelationResource()); - singletons.add(new VocabularyResource()); - singletons.add(new OrgAuthorityResource()); - singletons.add(new PersonAuthorityResource()); - singletons.add(new DimensionResource()); - singletons.add(new ContactResource()); - + singletons.add(new LocationAuthorityResource()); + singletons.add(new IDResource()); // singletons.add(new QueryResource()); // singletons.add(new DomainIdentifierResource()); // singletons.add(new PingResource());