DRYD-1575: Rename repatriationclaim to repatriationrequest

services/JaxRsServiceProvider/pom.xml

@@ -243,7 +243,7 @@
       <!-- new claim as of 8.1.0 -->
       <dependency>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.repatriationclaim.service</artifactId>
+        <artifactId>org.collectionspace.services.repatriationrequest.service</artifactId>
         <version>${project.version}</version>
       </dependency>
         <dependency>

services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java

@@ -40,7 +40,7 @@
 import org.collectionspace.services.index.IndexResource;
 import org.collectionspace.services.loanin.LoaninResource;
 import org.collectionspace.services.loanout.LoanoutResource;
-import org.collectionspace.services.repatriationclaim.RepatriationClaimResource;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestResource;
 import org.collectionspace.services.nagprainventory.NagpraInventoryResource;
 import org.collectionspace.services.summarydocumentation.SummaryDocumentationResource;
 import org.collectionspace.services.transport.TransportResource;
@@ -165,7 +165,7 @@ public CollectionSpaceJaxRsApplication() {
         addResourceToMapAndSingletons(new PropagationResource());
         addResourceToMapAndSingletons(new PottagResource());
         addResourceToMapAndSingletons(new ClaimResource());
-        addResourceToMapAndSingletons(new RepatriationClaimResource());
+        addResourceToMapAndSingletons(new RepatriationRequestResource());
         addResourceToMapAndSingletons(new ReportResource());
         addResourceToMapAndSingletons(new PublicItemResource());
         addResourceToMapAndSingletons(new TransportResource());

services/common/src/main/resources/db/postgresql/load_id_generators.sql

@@ -1306,3 +1306,39 @@ INSERT INTO id_generators
         SELECT  csid
         FROM    id_generators
         );
+
+-- REPATRIATION_REQUEST_NUMBER
+
+INSERT INTO id_generators
+    (csid, displayname, description, priority, last_generated_id, id_generator_state)
+  SELECT
+     '7f6e2d67-b95a-4a0c-841c-5a00a9cd1db0',
+     'Repatriation Request Number',
+     'Identifies a repatriation request document.',
+     '9',
+     '',
+'<org.collectionspace.services.id.SettableIDGenerator>
+  <parts>
+    <org.collectionspace.services.id.StringIDGeneratorPart>
+      <initialValue>RR</initialValue>
+      <currentValue>RR</currentValue>
+    </org.collectionspace.services.id.StringIDGeneratorPart>
+    <org.collectionspace.services.id.YearIDGeneratorPart>
+      <currentValue></currentValue>
+    </org.collectionspace.services.id.YearIDGeneratorPart>
+    <org.collectionspace.services.id.StringIDGeneratorPart>
+      <initialValue>.</initialValue>
+      <currentValue>.</currentValue>
+    </org.collectionspace.services.id.StringIDGeneratorPart>
+    <org.collectionspace.services.id.NumericIDGeneratorPart>
+      <maxLength>6</maxLength>
+      <initialValue>1</initialValue>
+      <currentValue>-1</currentValue>
+    </org.collectionspace.services.id.NumericIDGeneratorPart>
+  </parts>
+</org.collectionspace.services.id.SettableIDGenerator>'
+  WHERE '7f6e2d67-b95a-4a0c-841c-5a00a9cd1db0' NOT IN
+        (
+        SELECT  csid
+        FROM    id_generators
+        );

services/pom.xml

@@ -99,7 +99,7 @@
 		<module>publicitem</module>
 		<module>iterationreport</module>
 		<module>chronology</module>
-		<module>repatriationclaim</module>
+		<module>repatriationrequest</module>
 		<module>nagprainventory</module>
 		<module>summarydocumentation</module>
 		<module>heldintrust</module>

services/repatriationclaim/build.xml → services/repatriationrequest/build.xml

@@ -1,6 +1,6 @@
-<project name="repatriationclaim" default="package" basedir=".">
+<project name="repatriationrequest" default="package" basedir=".">
   <description>
-    repatriationclaim service
+    repatriationrequest service
   </description>
   <!-- set global properties for this build -->
   <property name="services.trunk" value="../.." />

services/repatriationclaim/client/pom.xml → services/repatriationrequest/client/pom.xml

@@ -4,13 +4,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.repatriationclaim</artifactId>
+    <artifactId>org.collectionspace.services.repatriationrequest</artifactId>
     <version>${revision}</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.collectionspace.services.repatriationclaim.client</artifactId>
-  <name>services.repatriationclaim.client</name>
+  <artifactId>org.collectionspace.services.repatriationrequest.client</artifactId>
+  <name>services.repatriationrequest.client</name>
 
   <dependencies>
     <!-- CollectionSpace dependencies -->
@@ -21,7 +21,7 @@
     </dependency>
     <dependency>
       <groupId>org.collectionspace.services</groupId>
-      <artifactId>org.collectionspace.services.repatriationclaim.jaxb</artifactId>
+      <artifactId>org.collectionspace.services.repatriationrequest.jaxb</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -56,6 +56,6 @@
   </dependencies>
 
   <build>
-    <finalName>collectionspace-services-repatriationclaim-client</finalName>
+    <finalName>collectionspace-services-repatriationrequest-client</finalName>
   </build>
 </project>

services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java → services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestClient.java

@@ -14,24 +14,24 @@
  */
 package org.collectionspace.services.client;
 
-import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestsCommon;
 
 /**
- * RepatriationClaimClient.java
+ * RepatriationRequestClient.java
  */
-public class RepatriationClaimClient extends AbstractCommonListPoxServiceClientImpl<RepatriationClaimProxy, RepatriationClaimsCommon> {
+public class RepatriationRequestClient extends AbstractCommonListPoxServiceClientImpl<RepatriationRequestProxy, RepatriationRequestsCommon> {
 
-    public static final String SERVICE_NAME = "repatriationclaims";
+    public static final String SERVICE_NAME = "repatriationrequests";
     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 + "/";
     public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
 
-    public RepatriationClaimClient() throws Exception {
+    public RepatriationRequestClient() throws Exception {
         super();
     }
 
-    public RepatriationClaimClient(String clientPropertiesFilename) throws Exception {
+    public RepatriationRequestClient(String clientPropertiesFilename) throws Exception {
         super(clientPropertiesFilename);
     }
 
@@ -46,7 +46,7 @@ public String getServiceName() {
     }
 
     @Override
-    public Class<RepatriationClaimProxy> getProxyClass() {
-        return RepatriationClaimProxy.class;
+    public Class<RepatriationRequestProxy> getProxyClass() {
+        return RepatriationRequestProxy.class;
     }
 }

services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java → services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestProxy.java

@@ -19,9 +19,9 @@
 import javax.ws.rs.Produces;
 
 /**
- * RepatriationClaimProxy.java
+ * RepatriationRequestProxy.java
  */
-@Path(RepatriationClaimClient.SERVICE_PATH_PROXY)
+@Path(RepatriationRequestClient.SERVICE_PATH_PROXY)
 @Produces({"application/xml"})
 @Consumes({"application/xml"})
-public interface RepatriationClaimProxy extends CollectionSpaceCommonListPoxProxy {}
+public interface RepatriationRequestProxy extends CollectionSpaceCommonListPoxProxy {}