CSPACE-63: Abstract base class "CollectionObjectClient" now has method for getting...

diff --git a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionObjectClient.java b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionObjectClient.java
index ffda95ba718e1171c6a71127f78afbe38e22e280..8fd55ac08062280fb65df53e5e2ec094dff12628 100644 (file)
--- a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionObjectClient.java
+++ b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionObjectClient.java
@@ -15,7 +15,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
  * @version $Revision:$
  */
-public class CollectionObjectClient implements CollectionSpaceClient {
+public class CollectionObjectClient extends CollectionSpaceClient {
 
 
     /**
@@ -35,7 +35,7 @@ public class CollectionObjectClient implements CollectionSpaceClient {
     private CollectionObjectClient() {
         ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
         RegisterBuiltin.register(factory);
-        collectionObjectProxy = ProxyFactory.create(CollectionObjectProxy.class, HOST + URI);
+        collectionObjectProxy = ProxyFactory.create(CollectionObjectProxy.class, getURL());
     }
 
     /**

diff --git a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionSpaceClient.java b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionSpaceClient.java
index c43fb45df8903cf9991cc5aa7d7ef183b1c3acac..879800e34812b1ef052fe23f79188396a736dc4f 100644 (file)
--- a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionSpaceClient.java
+++ b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/CollectionSpaceClient.java
@@ -1,6 +1,34 @@
 package org.collectionspace.hello.client;\r
 \r
-public interface CollectionSpaceClient {\r
-       static final String HOST = "http://localhost:8080";\r
-       static final String URI = "/helloworld/cspace-nuxeo";\r
+import java.util.*;\r
+\r
+public abstract class CollectionSpaceClient {\r
+       static final String URL_PROPERTY = "org.collectionspace.url";\r
+       /*\r
+       static final String URL_PROPERTY_SCHEME = "org.collectionspace.url.schme";\r
+       static final String URL_PROPERTY_HOST = "org.collectionspace.url.host";\r
+       static final String URL_PROPERTY_PORT = "org.collectionspace.url.port";\r
+       static final String URL_PROPERTY_CONTEXT = "org.collectionspace.url.context";\r
+        */\r
+       \r
+       private static final String SCHEME = "http";\r
+       private static final String HOST = "localhost";\r
+       private static final String PORT = "8080";\r
+       private static final String URI = "/helloworld/cspace-nuxeo";\r
+       private static final String URL = SCHEME + "://" +\r
+               HOST + ":" +\r
+               PORT +\r
+               URI;\r
+       private String collectionSpaceURL = null;\r
+       \r
+       \r
+       String getURL() {\r
+               String result = collectionSpaceURL;\r
+               \r
+               if (collectionSpaceURL == null) {\r
+                       result = collectionSpaceURL = System.getProperty(URL_PROPERTY, URL);\r
+               }\r
+               \r
+               return result;\r
+       }\r
 }\r

diff --git a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/DomainIdentifierClient.java b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/DomainIdentifierClient.java
index 98c6a7189fe30fafd4f57081b99ab0ef1bebcab8..56061c6ad100596568ce17c2794ff4de992ff0e5 100644 (file)
--- a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/DomainIdentifierClient.java
+++ b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/DomainIdentifierClient.java
@@ -13,7 +13,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
  * @version $Revision:$
  */
-public class DomainIdentifierClient implements CollectionSpaceClient {
+public class DomainIdentifierClient extends CollectionSpaceClient {
 
 
     /**
@@ -33,7 +33,7 @@ public class DomainIdentifierClient implements CollectionSpaceClient {
     private DomainIdentifierClient() {
         ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
         RegisterBuiltin.register(factory);
-        identifierProxy = ProxyFactory.create(DomainIdentifierProxy.class, HOST + URI);
+        identifierProxy = ProxyFactory.create(DomainIdentifierProxy.class, getURL());
     }
 
     /**

diff --git a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/IdentifierClient.java b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/IdentifierClient.java
index 62c03f356e845b239d8e12bdf7a3b7541e470790..a7b12f9673b514109b711f5c7e46002ae1de091c 100644 (file)
--- a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/IdentifierClient.java
+++ b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/IdentifierClient.java
@@ -13,7 +13,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
  * @version $Revision:$
  */
-public class IdentifierClient implements CollectionSpaceClient {
+public class IdentifierClient {
 
     /**
      *
@@ -32,7 +32,7 @@ public class IdentifierClient implements CollectionSpaceClient {
     private IdentifierClient() {
         ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
         RegisterBuiltin.register(factory);
-        identifierProxy = ProxyFactory.create(IdentifierProxy.class, HOST + URI);
+        identifierProxy = ProxyFactory.create(IdentifierProxy.class, "http://localhost:8080/helloworld/cspace");
     }
 
     /**

diff --git a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonNuxeoClient.java b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonNuxeoClient.java
index d60bb07d4009bbf8b018488f835ca367b931b36c..68cdbf318ec75e805dff6e37fa24ff01e3787afa 100644 (file)
--- a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonNuxeoClient.java
+++ b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonNuxeoClient.java
@@ -14,7 +14,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
  * @version $Revision:$
  */
-public class PersonNuxeoClient implements CollectionSpaceClient {
+public class PersonNuxeoClient extends CollectionSpaceClient {
 
     /**
      *
@@ -33,7 +33,7 @@ public class PersonNuxeoClient implements CollectionSpaceClient {
     private PersonNuxeoClient() {
         ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
         RegisterBuiltin.register(factory);
-        personProxy = ProxyFactory.create(PersonNuxeoProxy.class, HOST + URI);
+        personProxy = ProxyFactory.create(PersonNuxeoProxy.class, getURL());
     }
 
     /**