#0 feature - Changed server parameter to properties file, new version 0.9.3

Roberto Sánchez

2014-07-11 261509641ae2f405c50744134d12f261f30e81e3

#0 feature - Changed server parameter to properties file, new version
0.9.3

 pom.xml
..
..
@@ -3,7 +3,7 @@
3
3
 	<modelVersion>4.0.0</modelVersion>
4
4
 	<groupId>net.curisit</groupId>
5
5
 	<artifactId>securis-client</artifactId>
6
-	<version>0.9.2-SNAPSHOT</version>
6
+	<version>0.9.3-SNAPSHOT</version>
7
7
 	<build>
8
8
 		<plugins>
9
9
 			<plugin>
 src/main/java/net/curisit/securis/License.java
..
..
@@ -88,17 +88,12 @@
88
88
 			if (cmd.hasOption('c')) {
89
89
 				String reqFilename = cmd.getOptionValue("rfile");
90
90
 				checkMandatoryParameter(reqFilename, "rfile");
91
-				String server = cmd.getOptionValue("server");
92
-				checkMandatoryParameter(server, "server");
93
91
 
94
92
 				log.warn("This command is not yet implemented");
95
93
 				System.exit(0);
96
94
 			}
97
95
 
98
96
 			if (cmd.hasOption('t')) {
99
-				String server = cmd.getOptionValue("server");
100
-				checkMandatoryParameter(server, "server");
101
-
102
97
 				log.warn("This command is not yet implemented");
103
98
 				System.exit(0);
104
99
 			}
..
..
@@ -106,9 +101,6 @@
106
101
 			if (cmd.hasOption('r')) {
107
102
 				String licFilename = cmd.getOptionValue("renew");
108
103
 				checkMandatoryParameter(licFilename, "renew");
109
-				String server = cmd.getOptionValue("server");
110
-				checkMandatoryParameter(server, "server");
111
-
112
104
 				log.warn("This command is not yet implemented");
113
105
 				System.exit(0);
114
106
 			}
..
..
@@ -173,13 +165,13 @@
173
165
 
174
166
 		options.addOption("h", "help", false, "Show help.");
175
167
 		options.addOption(OptionBuilder.withArgName("req_file").withLongOpt("rfile").withDescription("Set request file for its generation or for license requesting.").hasArg(true).create('r'));
176
-		options.addOption(OptionBuilder.withArgName("url_license_server").withLongOpt("server").withDescription("License server url.").hasArg(true).create('s'));
168
+		// options.addOption(OptionBuilder.withArgName("url_license_server").withLongOpt("server").withDescription("License server url.").hasArg(true).create('s'));
177
169
 		options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("validate").withDescription("Validate lic file.").hasArg(true).create('l'));
178
170
 
179
171
 		options.addOption("g", "gen_request", false, "Generate request file. If --rfile parameter is missing then It is generated in current directory.");
180
-		options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("create").withDescription("Request a license file from server. --server parameters is mandatory.").hasArg(true).create('c'));
172
+		options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("create").withDescription("Request a license file from server.").hasArg(true).create('c'));
181
173
 		options.addOption("t", "test_lc", false, "Test if License Server (LC) is available. --server parameter is mandatory.");
182
-		options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("renew").withDescription("Synchronize/renew the current license file. --server parameter is mandatory.").hasArg(true).create('r'));
174
+		options.addOption(OptionBuilder.withArgName("lic_file").withLongOpt("renew").withDescription("Synchronize/renew the current license file.").hasArg(true).create('r'));
183
175
 
184
176
 		return options;
185
177
 	}
 src/main/java/net/curisit/securis/LicenseManager.java
..
..
@@ -29,7 +29,10 @@
29
29
 
30
30
 	private static LicenseManager singleton = new LicenseManager();
31
31
 
32
+	String serverUrl = null;
33
+
32
34
 	private LicenseManager() {
35
+		serverUrl = Params.get(Params.KEYS.LICENSE_SERVER_URL);
33
36
 	}
34
37
 
35
38
 	public static LicenseManager getInstance() {
 src/main/java/net/curisit/securis/utils/Params.java
..
..
@@ -190,6 +190,8 @@
190
190
 		public static final String APPLICATION_CODE = "app.code";
191
191
 
192
192
 		public static final String CUSTOMER_CODE = "customer.code";
193
+
194
+		public static final String LICENSE_SERVER_URL = "license.server.url";
193
195
 	}
194
196
 
195
197
 }
 src/main/resources/securis-client.properties
..
..
@@ -1,3 +1,4 @@
1
+license.server.url = https://securis.curistec.com/securis/api
1
2
 public.key.file = __ADD_PUBLIC_KEY_FILE__
2
3
 app.code = __ADD_APP_CODE__
3
4
 customer.code = __ADD_CUSTOMER_CODE__