From 4be65eae04c0ed497bf404d43f9a11a4993a239d Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 29 Sep 2014 15:25:59 +0000
Subject: [PATCH] #2021 fix - Added HTTP client to connect to SeCuris server
---
src/main/java/net/curisit/securis/License.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/curisit/securis/License.java b/src/main/java/net/curisit/securis/License.java
index 1d49af8..1f2a210 100644
--- a/src/main/java/net/curisit/securis/License.java
+++ b/src/main/java/net/curisit/securis/License.java
@@ -33,8 +33,6 @@
* file. --server parameter is mandatory.
* -s,--server <url_license_server> License server url.
* -t,--test_lc Test if License Server (LC) is
- * available. --server parameter is
- * mandatory.
* </pre>
*
* @author roberto <roberto.sanchez@curisit.net>
@@ -85,16 +83,13 @@
}
if (cmd.hasOption('c')) {
- String reqFilename = cmd.getOptionValue("rfile");
- checkMandatoryParameter(reqFilename, "rfile");
-
- LOG.warn("This command is not yet implemented");
- System.exit(0);
+ LicenseManager.getInstance().requestLicense();
+ System.exit(0);
}
if (cmd.hasOption('t')) {
- LOG.warn("This command is not yet implemented");
- System.exit(0);
+ LicenseManager.getInstance().testServer();
+ System.exit(0);
}
if (cmd.hasOption('r')) {
@@ -168,8 +163,8 @@
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.").hasArg(true).create('c'));
- options.addOption("t", "test_lc", false, "Test if License Server (LC) is available. --server parameter is mandatory.");
+ options.addOption(OptionBuilder.withLongOpt("create").withDescription("Request a license file to server.").hasArg(false).create('c'));
+ options.addOption("t", "test_lc", false, "Test if License Server (LC) is available. ");
options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("renew").withDescription("Synchronize/renew the current license file.").hasArg(true).create('r'));
return options;
--
Gitblit v1.3.2