Commit 4aea48d1 by Tomasz Ciesielczyk

generate config file fix

parent 0edb97cf
......@@ -6,8 +6,6 @@
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-powercapping/m2dc-powercapping_main.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-powercapping/m2dc-powercapping_main.iml" group="m2dc-powercapping" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-powercapping/m2dc-powercapping_test.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-powercapping/m2dc-powercapping_test.iml" group="m2dc-powercapping" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-rtm.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-rtm.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-rtm-fanmanager/m2dc-rtm-fanmanager_main.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-rtm-fanmanager/m2dc-rtm-fanmanager_main.iml" group="m2dc-rtm-fanmanager" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-rtm-fanmanager/m2dc-rtm-fanmanager_test.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-rtm-fanmanager/m2dc-rtm-fanmanager_test.iml" group="m2dc-rtm-fanmanager" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-rtm-rest.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-rtm-rest.iml" group="m2dc-rtm-rest" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-rtm-rest/m2dc-rtm-rest_main.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-rtm-rest/m2dc-rtm-rest_main.iml" group="m2dc-rtm-rest" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/m2dc-rtm-rest/m2dc-rtm-rest_test.iml" filepath="$PROJECT_DIR$/.idea/modules/m2dc-rtm-rest/m2dc-rtm-rest_test.iml" group="m2dc-rtm-rest" />
......
......@@ -84,7 +84,6 @@ dependencies {
compile "com.auth0:java-jwt:3.2.0"
compile "com.beust:jcommander:1.58"
compile project(':m2dc-powercapping')
compile project(':m2dc-rtm-fanmanager')
}
compileKotlin {
......
package psnc.m2dc.rtm.commands.java
val APP_VERSION = "1.0.440_55347"
\ No newline at end of file
val APP_VERSION = "1.0.440_79419"
\ No newline at end of file
......@@ -67,13 +67,16 @@ class RTMCLI : Runnable {
@CommandLine.Option(names = ["--config"], description = ["path to main config file"])
var configPath: String = "rtm.conf"
override fun run() {
fun run(generateConf: Boolean) {
if (generateConf)
return
if (!File(configPath).exists()) {
printConsole("generating new configuration file")
ConfigurationGenerator.generate(configPath)
}
RTMProperties.init(configPath)
RTMRestClient.instance.debug = debug
......@@ -92,4 +95,9 @@ class RTMCLI : Runnable {
// printConsole(Keys.PCM.default_node_priority.path + "")
// printConsole(Keys.RTM.resource_type_map.key + "")
}
override fun run() {
run(false)
}
}
\ No newline at end of file
package psnc.m2dc.rtm.client
const val APP_VERSION = "1.1.440_55348"
\ No newline at end of file
const val APP_VERSION = "1.1.440_79419"
\ No newline at end of file
......@@ -29,7 +29,7 @@ class ConfigCommand : Runnable {
private var filename: String? = null
override fun run() {
parent.run()
//parent.run(true)
if (this.generate) {
if (this.filename == null || this.filename!!.length < 3) {
println(ConfigurationGenerator.generate())
......
rootProject.name = 'm2dc-rtm'
include 'm2dc-rtm-utils'
include 'm2dc-powercapping'
include 'm2dc-rtm-fanmanager'
include 'm2dc-rtm-rest'
include 'm2dc-rtm-restclient'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment