#0 fix - Replaced "app.code" by "license.type.code" parameter in config fil...

rsanchez

2015-08-10 3e181c597c1088b7bfee445deaef514fcf198bfa

 src/main/java/net/curisit/securis/LicenseManager.java
..
..
@@ -99,7 +99,7 @@
99
99
 	public LicenseBean validateLicense(File licFile, boolean excludeDateValidation) throws SeCurisException {
100
100
 		LicenseBean licBean = load(licFile);
101
101
 		SignatureHelper.getInstance().validateSignature(licBean);
102
-		LicenseValidator.getInstance().validateHW(licBean, Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
102
+		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));
103
103
 		LicenseValidator.getInstance().validateLogo(licBean);
104
104
 
105
105
 		if (!excludeDateValidation) {
..
..
@@ -118,7 +118,7 @@
118
118
 	 * @throws SeCurisException
119
119
 	 */
120
120
 	public SignedLicenseBean requestLicense(String nameOrReference, String email) throws SeCurisException {
121
-		RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
121
+		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));
122
122
 
123
123
 		SignedLicenseBean lic = requestLicenseToServer(req, nameOrReference, email);
124
124
 		return lic;
..
..
@@ -178,7 +178,7 @@
178
178
 	 * @throws SeCurisException
179
179
 	 */
180
180
 	public RequestBean createRequestFile(File outputRequestFile) throws SeCurisException {
181
-		RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
181
+		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));
182
182
 
183
183
 		ReqGenerator.getInstance().save(req, outputRequestFile);
184
184
 
..
..
@@ -221,11 +221,12 @@
221
221
 	}
222
222
 
223
223
 	public static void main(String[] args) throws SeCurisException {
224
-		String filename = null;
224
+		String filename  = "/Users/rob/.doxr/config_server.lic";
225
+
225
226
 		if (filename == null)
226
227
 			filename = "./license.req";
227
228
 		File file = new File(filename);
228
-		LicenseManager.getInstance().createRequestFile(file);
229
+		LicenseManager.getInstance().validateLicense(file);
229
230
 		LOG.info("Request file {} generated OK", file.getAbsolutePath());
230
231
 
231
232
 	}