From 3e181c597c1088b7bfee445deaef514fcf198bfa Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Aug 2015 09:10:09 +0000
Subject: [PATCH] #0 fix - Replaced "app.code" by "license.type.code" parameter in config file (keeping compatibility)
---
src/main/java/net/curisit/securis/LicenseManager.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/curisit/securis/LicenseManager.java b/src/main/java/net/curisit/securis/LicenseManager.java
index 5cd0c22..99db584 100644
--- a/src/main/java/net/curisit/securis/LicenseManager.java
+++ b/src/main/java/net/curisit/securis/LicenseManager.java
@@ -99,7 +99,7 @@
public LicenseBean validateLicense(File licFile, boolean excludeDateValidation) throws SeCurisException {
LicenseBean licBean = load(licFile);
SignatureHelper.getInstance().validateSignature(licBean);
- LicenseValidator.getInstance().validateHW(licBean, Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
+ LicenseValidator.getInstance().validateHW(licBean, Params.get(Params.KEYS.LIC_TYPE_CODE, Params.get(Params.KEYS.APPLICATION_CODE)), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
LicenseValidator.getInstance().validateLogo(licBean);
if (!excludeDateValidation) {
@@ -118,7 +118,7 @@
* @throws SeCurisException
*/
public SignedLicenseBean requestLicense(String nameOrReference, String email) throws SeCurisException {
- RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
+ RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.LIC_TYPE_CODE, Params.get(Params.KEYS.APPLICATION_CODE)), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
SignedLicenseBean lic = requestLicenseToServer(req, nameOrReference, email);
return lic;
@@ -178,7 +178,7 @@
* @throws SeCurisException
*/
public RequestBean createRequestFile(File outputRequestFile) throws SeCurisException {
- RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
+ RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.LIC_TYPE_CODE, Params.get(Params.KEYS.APPLICATION_CODE)), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
ReqGenerator.getInstance().save(req, outputRequestFile);
@@ -221,11 +221,12 @@
}
public static void main(String[] args) throws SeCurisException {
- String filename = null;
+ String filename = "/Users/rob/.doxr/config_server.lic";
+
if (filename == null)
filename = "./license.req";
File file = new File(filename);
- LicenseManager.getInstance().createRequestFile(file);
+ LicenseManager.getInstance().validateLicense(file);
LOG.info("Request file {} generated OK", file.getAbsolutePath());
}
--
Gitblit v1.3.2