From 261509641ae2f405c50744134d12f261f30e81e3 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 11 Jul 2014 10:03:58 +0000
Subject: [PATCH] #0 feature - Changed server parameter to properties file, new version 0.9.3
---
src/main/java/net/curisit/securis/utils/Params.java | 2 ++
src/main/java/net/curisit/securis/LicenseManager.java | 3 +++
src/main/resources/securis-client.properties | 1 +
pom.xml | 2 +-
src/main/java/net/curisit/securis/License.java | 14 +++-----------
5 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index b817f81..a792286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.curisit</groupId>
<artifactId>securis-client</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.9.3-SNAPSHOT</version>
<build>
<plugins>
<plugin>
diff --git a/src/main/java/net/curisit/securis/License.java b/src/main/java/net/curisit/securis/License.java
index 224c506..8f08b6f 100644
--- a/src/main/java/net/curisit/securis/License.java
+++ b/src/main/java/net/curisit/securis/License.java
@@ -88,17 +88,12 @@
if (cmd.hasOption('c')) {
String reqFilename = cmd.getOptionValue("rfile");
checkMandatoryParameter(reqFilename, "rfile");
- String server = cmd.getOptionValue("server");
- checkMandatoryParameter(server, "server");
log.warn("This command is not yet implemented");
System.exit(0);
}
if (cmd.hasOption('t')) {
- String server = cmd.getOptionValue("server");
- checkMandatoryParameter(server, "server");
-
log.warn("This command is not yet implemented");
System.exit(0);
}
@@ -106,9 +101,6 @@
if (cmd.hasOption('r')) {
String licFilename = cmd.getOptionValue("renew");
checkMandatoryParameter(licFilename, "renew");
- String server = cmd.getOptionValue("server");
- checkMandatoryParameter(server, "server");
-
log.warn("This command is not yet implemented");
System.exit(0);
}
@@ -173,13 +165,13 @@
options.addOption("h", "help", false, "Show help.");
options.addOption(OptionBuilder.withArgName("req_file").withLongOpt("rfile").withDescription("Set request file for its generation or for license requesting.").hasArg(true).create('r'));
- options.addOption(OptionBuilder.withArgName("url_license_server").withLongOpt("server").withDescription("License server url.").hasArg(true).create('s'));
+ // options.addOption(OptionBuilder.withArgName("url_license_server").withLongOpt("server").withDescription("License server url.").hasArg(true).create('s'));
options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("validate").withDescription("Validate lic file.").hasArg(true).create('l'));
options.addOption("g", "gen_request", false, "Generate request file. If --rfile parameter is missing then It is generated in current directory.");
- options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("create").withDescription("Request a license file from server. --server parameters is mandatory.").hasArg(true).create('c'));
+ options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("create").withDescription("Request a license file from server.").hasArg(true).create('c'));
options.addOption("t", "test_lc", false, "Test if License Server (LC) is available. --server parameter is mandatory.");
- options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("renew").withDescription("Synchronize/renew the current license file. --server parameter is mandatory.").hasArg(true).create('r'));
+ options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("renew").withDescription("Synchronize/renew the current license file.").hasArg(true).create('r'));
return options;
}
diff --git a/src/main/java/net/curisit/securis/LicenseManager.java b/src/main/java/net/curisit/securis/LicenseManager.java
index 83571f0..c2d87e7 100644
--- a/src/main/java/net/curisit/securis/LicenseManager.java
+++ b/src/main/java/net/curisit/securis/LicenseManager.java
@@ -29,7 +29,10 @@
private static LicenseManager singleton = new LicenseManager();
+ String serverUrl = null;
+
private LicenseManager() {
+ serverUrl = Params.get(Params.KEYS.LICENSE_SERVER_URL);
}
public static LicenseManager getInstance() {
diff --git a/src/main/java/net/curisit/securis/utils/Params.java b/src/main/java/net/curisit/securis/utils/Params.java
index 2822010..3ccbb66 100644
--- a/src/main/java/net/curisit/securis/utils/Params.java
+++ b/src/main/java/net/curisit/securis/utils/Params.java
@@ -190,6 +190,8 @@
public static final String APPLICATION_CODE = "app.code";
public static final String CUSTOMER_CODE = "customer.code";
+
+ public static final String LICENSE_SERVER_URL = "license.server.url";
}
}
diff --git a/src/main/resources/securis-client.properties b/src/main/resources/securis-client.properties
index 2e3c1d5..c1e07d0 100644
--- a/src/main/resources/securis-client.properties
+++ b/src/main/resources/securis-client.properties
@@ -1,3 +1,4 @@
+license.server.url = https://securis.curistec.com/securis/api
public.key.file = __ADD_PUBLIC_KEY_FILE__
app.code = __ADD_APP_CODE__
customer.code = __ADD_CUSTOMER_CODE__
--
Gitblit v1.3.2