From 464f9fc6047ff994728acf69f6f0d3971984b492 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 29 Sep 2014 17:16:21 +0000
Subject: [PATCH] #2021 fix - Changed "ping" command return to JSON, StatusBean
---
src/main/java/net/curisit/securis/License.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/curisit/securis/License.java b/src/main/java/net/curisit/securis/License.java
index 1f2a210..2d51327 100644
--- a/src/main/java/net/curisit/securis/License.java
+++ b/src/main/java/net/curisit/securis/License.java
@@ -3,6 +3,7 @@
import java.io.File;
import java.net.URISyntaxException;
+import net.curisit.securis.beans.SignedLicenseBean;
import net.curisit.securis.utils.Params;
import org.apache.commons.cli.CommandLine;
@@ -14,6 +15,7 @@
import org.apache.commons.cli.PosixParser;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.codehaus.jackson.map.DeserializerFactory.Config;
/**
* Main class when SeCuris client is used from command line.
@@ -40,7 +42,7 @@
*/
public class License {
- private static final Logger LOG = LogManager.getLogger(License.class);
+ private static final Logger LOG = LogManager.getLogger(License.class);
/**
* Aplication entry point when it used as CLI
@@ -83,12 +85,20 @@
}
if (cmd.hasOption('c')) {
- LicenseManager.getInstance().requestLicense();
+ SignedLicenseBean lic = LicenseManager.getInstance().requestLicense();
+ String filename = cmd.getOptionValue("lic_file");
+ if (filename == null)
+ filename = "./license.lic";
+ File file = new File(filename);
+ LicenseManager.getInstance().save(lic, file);
+ LOG.info("License file sucessfully saved in file: {}", file.getAbsolutePath());
System.exit(0);
}
if (cmd.hasOption('t')) {
LicenseManager.getInstance().testServer();
+ LOG.info("Server is OK, url: {}", Params.get(Params.KEYS.LICENSE_SERVER_URL, Params.DEFAUT_SERVER_URL));
+
System.exit(0);
}
@@ -163,7 +173,7 @@
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.withLongOpt("create").withDescription("Request a license file to server.").hasArg(false).create('c'));
+ options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("create").withDescription("Request a license file to server.").hasArg(true).hasOptionalArg().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'));
--
Gitblit v1.3.2