CSPACE-733: Adding a "version" method to children of the the AbstractCollectionSpaceR...

diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
index 9261e4d9513a4ed60089a2921895fe184acdb089..f2c19f2b646308f18913551571afd42e001975c9 100644 (file)
--- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
+++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
@@ -62,6 +62,13 @@ public class AccountResource
     final Logger logger = LoggerFactory.getLogger(AccountResource.class);
     final StorageClient storageClient = new AccountStorageClient();
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
index cfc53eedd8840da1466e3d1a09950726e4ef994c..55e0c1f11b83c5f3a645c4852c2e228f75312e22 100644 (file)
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
@@ -65,6 +65,13 @@ public class AcquisitionResource
     final private String serviceName = "acquisitions";
     final Logger logger = LoggerFactory.getLogger(AcquisitionResource.class);
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

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 66bf635672bd2bc4c1da437ad3e601f7572de5d0..3750ce684c51c1d444c15a6b92fa800deee362bd 100644 (file)
--- 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
@@ -44,6 +44,7 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
+import org.collectionspace.services.common.Version;
 import org.collectionspace.services.common.query.QueryManager;
 import org.collectionspace.services.common.query.IQueryManager;
 import org.collectionspace.services.collectionobject.nuxeo.CollectionObjectHandlerFactory;
@@ -67,11 +68,16 @@ import org.slf4j.LoggerFactory;
 public class CollectionObjectResource
         extends AbstractCollectionSpaceResource {
 
-       //FIXME: Remove this static string
-       final private String lastChangeRevision = "$LastChangedRevision$";
     final private String serviceName = "collectionobjects";
     final Logger logger = LoggerFactory.getLogger(CollectionObjectResource.class);
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision$";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
index 67b916489a4feb5680b2b8c5c3055ef729877fb1..9f06264a71dafcef76c5bcbafda95ff2886510a9 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
@@ -23,6 +23,10 @@
  */\r
 package org.collectionspace.services.common;\r
 \r
+import javax.ws.rs.GET;\r
+import javax.ws.rs.Path;\r
+import javax.ws.rs.Produces;\r
+\r
 import org.collectionspace.services.common.context.ServiceContext;\r
 import org.collectionspace.services.common.document.DocumentHandler;\r
 import org.collectionspace.services.common.repository.RepositoryClient;\r
@@ -30,22 +34,39 @@ import org.collectionspace.services.common.repository.RepositoryClientFactory;
 import org.collectionspace.services.common.storage.StorageClient;\r
 import org.collectionspace.services.common.storage.jpa.JpaStorageClient;\r
 \r
+/**\r
+ * The Class AbstractCollectionSpaceResource.\r
+ */\r
 public abstract class AbstractCollectionSpaceResource\r
         implements CollectionSpaceResource {\r
 \r
     // Fields for default client factory and client\r
+    /** The repository client factory. */\r
     private RepositoryClientFactory repositoryClientFactory;\r
+    \r
+    /** The repository client. */\r
     private RepositoryClient repositoryClient;\r
+    \r
+    /** The storage client. */\r
     private StorageClient storageClient;\r
 \r
+    /**\r
+     * Instantiates a new abstract collection space resource.\r
+     */\r
     public AbstractCollectionSpaceResource() {\r
         repositoryClientFactory = RepositoryClientFactory.getInstance();\r
     }\r
 \r
+    /* (non-Javadoc)\r
+     * @see org.collectionspace.services.common.CollectionSpaceResource#getServiceName()\r
+     */\r
     @Override\r
     abstract public String getServiceName();\r
 \r
 \r
+    /* (non-Javadoc)\r
+     * @see org.collectionspace.services.common.CollectionSpaceResource#getRepositoryClient(org.collectionspace.services.common.context.ServiceContext)\r
+     */\r
     @Override\r
     synchronized public RepositoryClient getRepositoryClient(ServiceContext ctx) {\r
         if(repositoryClient != null){\r
@@ -55,6 +76,9 @@ public abstract class AbstractCollectionSpaceResource
         return repositoryClient;\r
     }\r
 \r
+    /* (non-Javadoc)\r
+     * @see org.collectionspace.services.common.CollectionSpaceResource#getStorageClient(org.collectionspace.services.common.context.ServiceContext)\r
+     */\r
     @Override\r
     synchronized public StorageClient getStorageClient(ServiceContext ctx) {\r
         if(storageClient != null) {\r
@@ -64,6 +88,33 @@ public abstract class AbstractCollectionSpaceResource
         return storageClient;\r
     }\r
 \r
+    /* (non-Javadoc)\r
+     * @see org.collectionspace.services.common.CollectionSpaceResource#createDocumentHandler(org.collectionspace.services.common.context.ServiceContext)\r
+     */\r
     @Override\r
     abstract public DocumentHandler createDocumentHandler(ServiceContext ctx) throws Exception ;\r
+    \r
+    /**\r
+     * Gets the version string.\r
+     * \r
+     * @return the version string\r
+     */\r
+    abstract protected String getVersionString();\r
+    \r
+    /**\r
+     * Gets the version.\r
+     * \r
+     * @return the version\r
+     */\r
+    @GET\r
+    @Path("/version")    \r
+    @Produces("application/xml")\r
+    public Version getVersion() {\r
+       Version result = new Version();\r
+       \r
+       result.setVersionString(getVersionString());\r
+       \r
+       return result;\r
+    }\r
+    \r
 }\r

diff --git a/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java b/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java
index 2bfca676e184c37a5262a00bfc1d179dea5c70af..399bb62d7e05602244faed90c4e5ceaa4c89d00a 100644 (file)
--- a/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java
+++ b/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java
@@ -68,6 +68,13 @@ public class ContactResource extends AbstractCollectionSpaceResource {
         // do nothing
     }
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

diff --git a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java
index 55ed1b8066c15cff2d91c7604d399650e00056ae..71d9620041c5761e466f749051369f4ba271108a 100644 (file)
--- a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java
+++ b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java
@@ -68,6 +68,13 @@ public class DimensionResource extends AbstractCollectionSpaceResource {
         // do nothing
     }
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
index b41f13b03b16909d7599155f4a635b7b4d90ed37..179a76d65d26dc872f484efa5032290062c2615d 100644 (file)
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
@@ -73,6 +73,13 @@ public class IntakeResource extends AbstractCollectionSpaceResource {
         // do nothing
     }
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java
index 053854baea98786e7a3146f84b10cec505c0288d..62dbf04a5071a90a4ad08475cc6664a34f607f2c 100644 (file)
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java
@@ -72,6 +72,13 @@ public class OrgAuthorityResource extends AbstractCollectionSpaceResource {
         // do nothing
     }
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return orgAuthorityServiceName;

diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java b/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java
index c922a1a7b03b735b6c690c87ac889e73d37cc67e..8a3c608baabe111a2011848f5103c62f546282d3 100644 (file)
--- a/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java
+++ b/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java
@@ -72,6 +72,13 @@ public class PersonAuthorityResource extends AbstractCollectionSpaceResource {
         // do nothing
     }
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return personAuthorityServiceName;

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/NewRelationResource.java
index 436ee70be67bc9bc2bacf32ff52fb997a630b4d7..e04b2d05bbfe2f6b9685cf3c692487dc39f5ecd9 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
@@ -66,6 +66,13 @@ public class NewRelationResource extends AbstractCollectionSpaceResource {
     public final static String serviceName = "relations";
     final Logger logger = LoggerFactory.getLogger(NewRelationResource.class);
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return serviceName;

diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
index 9b6737ab77b5cee700996f78bffacc8998f56e15..88fed1956daada909307b9c228774cea1b7cf3d0 100644 (file)
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
@@ -72,6 +72,13 @@ public class VocabularyResource extends AbstractCollectionSpaceResource {
         // do nothing
     }
 
+    @Override
+    protected String getVersionString() {
+       /** The last change revision. */
+       final String lastChangeRevision = "$LastChangedRevision: 1165 $";
+       return lastChangeRevision;
+    }
+    
     @Override
     public String getServiceName() {
         return vocabularyServiceName;