diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-12-12 15:52:51 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-12-12 15:52:51 +0530 |
| commit | 12a8f8bacffa9e7e6d600ac4d7e95c7d46b836e3 (patch) | |
| tree | 4f8c1ebeb64e900ceb5e20f9756f2de01996db2e /src/org.gluster.storage.management.client/src/org/gluster/storage/management | |
| parent | 5fee99642f7726955dd1721e1b90a8865e9fe050 (diff) | |
Modified to include API version number in root JNLP file, and rename the feature jnlp file appropriately during build.
Modified ClientUtil to pick up the API version number from the system property gluster.api.version
Diffstat (limited to 'src/org.gluster.storage.management.client/src/org/gluster/storage/management')
2 files changed, 7 insertions, 2 deletions
diff --git a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java index f683a507..6a8f0e5d 100644 --- a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java +++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java @@ -25,7 +25,8 @@ public class ClientConstants { public static final String SYS_PROP_SERVER_URL = "gluster.server.url"; public static final String DEFAULT_SERVER_URL = "https://localhost:8443/glustermg/linux.gtk.x86_64"; public static final String CONTEXT_ROOT = "glustermg"; - public static final String REST_API_VERSION = "1.0.0"; + public static final String SYS_PROP_API_VERSION = "gluster.api.version"; + public static final String DEFAULT_API_VERSION = "1.0.0"; // SSL related public static final String TRUSTED_KEYSTORE = "gmc-trusted.keystore"; diff --git a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java index ed05ad12..a4d665f9 100644 --- a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java +++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java @@ -28,7 +28,11 @@ import org.gluster.storage.management.client.constants.ClientConstants; public class ClientUtil { public static URI getServerBaseURI() { - return UriBuilder.fromUri(getBaseURL()).path(ClientConstants.REST_API_VERSION).build(); + return UriBuilder.fromUri(getBaseURL()).path(getAPIVersion()).build(); + } + + private static String getAPIVersion() { + return System.getProperty(ClientConstants.SYS_PROP_API_VERSION, ClientConstants.DEFAULT_API_VERSION); } private static String getBaseURL() { |