From 7d9055a4985cdad24c23dfe53a5b0d2ba046bd7c Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 19 Sep 2014 14:50:56 +0000
Subject: [PATCH] #396 feature - Added license generation from request file/content
---
securis/src/main/java/net/curisit/securis/LicenseGenerator.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
similarity index 95%
rename from securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
rename to securis/src/main/java/net/curisit/securis/LicenseGenerator.java
index 272a652..74d170d 100644
--- a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
@@ -26,19 +26,19 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import com.google.inject.Singleton;
+
/**
* License generator and signer
*
* @author roberto <roberto.sanchez@curisit.net>
*/
+@Singleton
public class LicenseGenerator {
private static final Logger LOG = LogManager.getLogger(LicenseGenerator.class);
private static LicenseGenerator singleton = new LicenseGenerator();
-
- private LicenseGenerator() {
- }
public static LicenseGenerator getInstance() {
return singleton;
@@ -113,7 +113,7 @@
Signature signature;
try {
signature = Signature.getInstance(SignatureHelper.SIGNATURE_GENERATION_ALGORITHM);
- signature.initSign(sh.generatePrivateKey(new File("/Users/cproberto/Documents/wsPython/doky/tests/securis_private_key.pkcs8")));
+ signature.initSign(sh.generatePrivateKey(new File(System.getProperty("user.home") + File.separator + ".SeCuris" + File.separator + "keys" + File.separator + "securis_private_key.pkcs8")));
sh.prepareSignature(signature, licBean);
@@ -147,6 +147,7 @@
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"));
@@ -155,3 +156,4 @@
}
}
+
--
Gitblit v1.3.2