#2695 fix - Minor changes

rsanchez

2015-08-10 29d222da06d3ec281b605ce1d7fccf558d29110b

#2695 fix - Minor changes

 src/main/java/net/curisit/securis/LicenseManager.java
..
..
@@ -221,12 +221,16 @@
221
221
 	}
222
222
 
223
223
 	public static void main(String[] args) throws SeCurisException {
224
-		String filename  = "/Users/rob/.doxr/config_server.lic";
224
+		String filename  = "/Users/rob/.doxr/doxr.lic";
225
225
 
226
226
 		if (filename == null)
227
227
 			filename = "./license.req";
228
228
 		File file = new File(filename);
229
229
 		LicenseManager.getInstance().validateLicense(file);
230
+		LOG.info("Validation Ok");
231
+		String r = "{\"licenseTypeCode\":\"DX01\",\"packCode\":\"DEVDX01\",\"arch\":\"x86_64\",\"osName\":\"darwin\",\"customerCode\":\"CIT\",\"macAddresses\":[\"60:c5:47:03:cf:c8\",\"b2:00:12:b6:88:e0\"]}";
232
+		RequestBean rb = JsonUtils.json2object(r, RequestBean.class);
233
+		System.out.println(rb);
230
234
 		LOG.info("Request file {} generated OK", file.getAbsolutePath());
231
235
 
232
236
 	}
 src/main/java/net/curisit/securis/beans/LicenseBean.java
..
..
@@ -11,7 +11,7 @@
11
11
 
12
12
 @JsonAutoDetect
13
13
 @JsonPropertyOrder({
14
-        "appName", "licenseCode", "licenseTypeCode", "expirationDate", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata"
14
+        "appName", "licenseCode", "licenseTypeCode", "expirationDate", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata", "packCode"
15
15
 })
16
16
 public class LicenseBean extends RequestBean {
17
17
     private Date expirationDate;
 src/main/java/net/curisit/securis/beans/RequestBean.java
..
..
@@ -14,7 +14,7 @@
14
14
 @JsonAutoDetect
15
15
 @JsonInclude(Include.NON_NULL)
16
16
 @JsonPropertyOrder({
17
-        "appName", "licenseTypeCode", "packCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo"
17
+        "licenseTypeCode", "packCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo"
18
18
 })
19
19
 public class RequestBean {
20
20
     private String customerCode;
 src/main/java/net/curisit/securis/utils/SignatureHelper.java
..
..
@@ -49,9 +49,6 @@
49
49
 	public void prepareSignature(Signature signature, LicenseBean licBean) throws SeCurisException {
50
50
 		try {
51
51
 			String aux = JsonUtils.toJSON(licBean) + AUX;
52
-			System.out.println();
53
-			System.out.println(aux);
54
-			System.out.println();
55
52
 			signature.update(JsonUtils.toJSON(licBean).getBytes("utf-8"));
56
53
 			signature.update(AUX.getBytes("utf-8"));
57
54
 		} catch (SignatureException | UnsupportedEncodingException e) {