#396 feature - Added license generation from request file/content

Roberto Sánchez

2014-09-19 7d9055a4985cdad24c23dfe53a5b0d2ba046bd7c

 securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
similarity index 95%rename from securis/src/patch/java/net/curisit/securis/LicenseGenerator.javarename to securis/src/main/java/net/curisit/securis/LicenseGenerator.java
..
..
@@ -26,19 +26,19 @@
26
26
 import org.apache.logging.log4j.LogManager;
27
27
 import org.apache.logging.log4j.Logger;
28
28
 
29
+import com.google.inject.Singleton;
30
+
29
31
 /**
30
32
  * License generator and signer
31
33
  * 
32
34
  * @author roberto <roberto.sanchez@curisit.net>
33
35
  */
36
+@Singleton
34
37
 public class LicenseGenerator {
35
38
 
36
39
     private static final Logger LOG = LogManager.getLogger(LicenseGenerator.class);
37
40
 
38
41
     private static LicenseGenerator singleton = new LicenseGenerator();
39
-
40
-    private LicenseGenerator() {
41
-    }
42
42
 
43
43
     public static LicenseGenerator getInstance() {
44
44
         return singleton;
..
..
@@ -113,7 +113,7 @@
113
113
         Signature signature;
114
114
         try {
115
115
             signature = Signature.getInstance(SignatureHelper.SIGNATURE_GENERATION_ALGORITHM);
116
-            signature.initSign(sh.generatePrivateKey(new File("/Users/cproberto/Documents/wsPython/doky/tests/securis_private_key.pkcs8")));
116
+            signature.initSign(sh.generatePrivateKey(new File(System.getProperty("user.home") + File.separator + ".SeCuris" + File.separator + "keys" + File.separator + "securis_private_key.pkcs8")));
117
117
 
118
118
             sh.prepareSignature(signature, licBean);
119
119
 
..
..
@@ -147,6 +147,7 @@
147
147
         metadata.put("timeThreshold", 0);
148
148
         metadata.put("datasetPrefix", "BP");
149
149
         metadata.put("extendedMode", true);
150
+        
150
151
         Date expirationDate = new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10));
151
152
         LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CI-01", "LIC-CURISTEC-0001");
152
153
         LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/AxelLicCI.lic"));
..
..
@@ -155,3 +156,4 @@
155
156
 
156
157
     }
157
158
 }
159
+