From 3de8fa2128c740e131676683dec649bb44c8ea73 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Mon, 24 Feb 2014 13:22:01 +0000
Subject: [PATCH] #593 feature - Changed log lib to log4j2 and bugfixing

---
 src/main/java/net/curisit/securis/License.java |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/curisit/securis/License.java b/src/main/java/net/curisit/securis/License.java
index 87fd7b7..dd634bb 100644
--- a/src/main/java/net/curisit/securis/License.java
+++ b/src/main/java/net/curisit/securis/License.java
@@ -1,6 +1,8 @@
 package net.curisit.securis;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.util.Date;
 
 import net.curisit.securis.utils.Params;
 
@@ -11,8 +13,8 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class License {
 
@@ -22,10 +24,14 @@
 		// LogManager.getRootLogger().
 	}
 
-	private static final Logger log = LoggerFactory.getLogger(License.class);
+	// private static final Logger log = LoggerFactory.getLogger(License.class);
+	private static final Logger log = LogManager.getLogger(License.class);
 
-	public static void main(String[] args) {
-		log.info("Tool init");
+	public static void main(String[] args) throws URISyntaxException {
+		// Configuration conf = XMLConfigurationFactory.getInstance().getConfiguration("config", License.class.getResource("/log4j.xml").toURI());
+
+		log.info("Tool init {}", new Date());
+
 		checkConfigFile();
 		CommandLine cmd = getCommandLine(args);
 
@@ -34,7 +40,24 @@
 				String filename = cmd.getOptionValue("rfile");
 				if (filename == null)
 					filename = "./license.req";
-				LicenseManager.getInstance().createRequestFile(new File(filename));
+				File file = new File(filename);
+				LicenseManager.getInstance().createRequestFile(file);
+				log.info("Request file {} generated OK", file.getAbsolutePath());
+				System.exit(0);
+			}
+
+			if (cmd.hasOption('l')) {
+				String filename = cmd.getOptionValue("validate");
+				if (filename == null)
+					filename = "./license.lic";
+				File file = new File(filename);
+				try {
+					LicenseManager.getInstance().validateLicense(file);
+					log.info("License file {} is valid", file.getAbsolutePath());
+				} catch (SeCurisException e) {
+					log.info("License file {} is NOT valid", file.getAbsolutePath());
+				}
+
 				System.exit(0);
 			}
 

--
Gitblit v1.3.2