From 36edce38f6b17f73322fa38404d6e01818a44fd2 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 11 Dec 2014 19:08:16 +0000
Subject: [PATCH] #2140 fix - Added renew period to pack, change on DB schema, fixed pack selection in listing, upgrade angular to 1.3.6 and other minor issues
---
securis/src/main/java/net/curisit/securis/LicenseGenerator.java | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/LicenseGenerator.java b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
index b614e4d..cfba707 100644
--- a/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
@@ -13,7 +13,6 @@
import java.security.spec.InvalidKeySpecException;
import java.util.Date;
import java.util.Map;
-import java.util.TreeMap;
import net.curisit.securis.beans.LicenseBean;
import net.curisit.securis.beans.RequestBean;
@@ -46,13 +45,12 @@
/**
* Generate a license bean with the specified data
*
- * @param hw
- * @param customerCode
- * - e.g: "BP"
- * @param maxInstances
- * @param maxUsers
- * @param maxTimeThreshold
- * Max time between synchronizations expressed in days
+ * @param req
+ * @param licCode
+ * @param metadata
+ * @param expirationDate
+ * @param licenseCode
+ * @param appName
* @return
* @throws SeCurisException
*/
@@ -61,6 +59,7 @@
LOG.debug("Generating license: MAC: {}, Customer code: {}, AppName: {}", req.getMacAddresses(), req.getCustomerCode(), appName);
LicenseBean license = new LicenseBean(req);
license.setAppName(appName);
+ license.setLicenseCode(licenseCode);
license.setExpirationDate(expirationDate);
license.setMetadata(metadata);
sign(license);
@@ -131,25 +130,4 @@
throw new SeCurisException("License could not be generated");
}
- public static void main(String[] args) throws SeCurisException {
-
- RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req"));
- Map<String, Object> metadata = new TreeMap<>();
- // CurisData parameters:
- // metadata.put("maxUsers", 5);
- // metadata.put("maxSessionUsers", 100);
- // curisIntegrity
- metadata.put("maxUsers", 0);
- metadata.put("maxInstances", 0);
- metadata.put("timeThreshold", 0);
- metadata.put("datasetPrefix", "BP");
- metadata.put("extendedMode", true);
-
- Date expirationDate = new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10));
- LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CI-01", "LIC-CURISTEC-0001");
- LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/AxelLicCI.lic"));
-
- System.out.print("License expires at: " + expirationDate.getTime());
-
- }
}
--
Gitblit v1.3.2