Mercurial > hg > ThermostatQA
changeset 105:a31fddb9db68
adding versioning for patterns and dbconfig files
line wrap: on
line diff
--- a/ChangeLog Wed Oct 02 10:01:39 2013 +0200 +++ b/ChangeLog Wed Oct 02 15:13:15 2013 +0200 @@ -1,3 +1,30 @@ +2013-10-02 Jana Fabrikova <jfabriko@redhat.com> + + * outputtexts: + the current version of output texts moved into a new dir outputtexts/head + further there will be directories for all the released versions of thermostat + * patterns: + both AA and noAA directories moved into a new dir called patterns/head, + further there will be directories for all the released versions of thermostat + * storageconfig: + both directories with mongodb and web storage configuration files used + by the web storage tests were moved into storageconfig/head, + further there will be directories for all the released versions of thermostat + * test.properties: + instead of thermostat_output_version a more general property + thermostat_version + * src/org/thermostat/qa/common/Configuration.java: + instead of thermostat_output_version a more general property + thermostat_version + * src/org/thermostat/qa/framework/Patterns.java: + adding several new patterns + * src/org/thermostat/qa/framework/ThermostatUtilities.java: + * src/org/thermostat/qa/framework/ThermostatGuiTest.java: + * src/org/thermostat/qa/framework/OutputTextsGenerator.java: + * src/org/thermostat/qa/testsuites/OutputMessagesTest.java: + * src/org/thermostat/qa/testsuites/CliClientSmokeTest.java: + changes induced by the versioning of patterns and thermostat db configurations + 2013-10-02 Pavel Tisnovsky <ptisnovs@redhat.com> * src/org/thermostat/qa/annotations/SinceVersion.java:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/output_of_exit_therm_shell.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,3 @@ +Thermostat version 0.14.0 +Thermostat > exit +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/output_of_help_therm_shell.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,22 @@ +Thermostat version 0.14.0 +Thermostat > help +list of commands: + + help show help for a given command or help overview + clean-data Drop all data related to all of the specified agents + connect persistently connect to storage + disconnect disconnect from the currently used storage + dump-heap trigger a heap dump on the VM + find-objects finds objects in a heapdump + find-root finds the shortest path from an object to a GC root + list-heap-dumps list all heap dumps + list-vms lists all currently monitored VMs + object-info prints information about an object in a heap dump + ping using the Command Channel, send a ping to a running agent + save-heap-dump-to-file saves a heap dump to a local file + show-heap-histogram show the heap histogram + validate validates a thermostat plug-in XML file against the schema + vm-info shows basic information about a VM + vm-stat show various statistics about a VM +Thermostat > exit +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,22 @@ +list of commands: + + help show help for a given command or help overview + agent starts and stops the thermostat agent + clean-data Drop all data related to all of the specified agents + dump-heap trigger a heap dump on the VM + find-objects finds objects in a heapdump + find-root finds the shortest path from an object to a GC root + gui launches the GUI client + list-heap-dumps list all heap dumps + list-vms lists all currently monitored VMs + object-info prints information about an object in a heap dump + ping using the Command Channel, send a ping to a running agent + save-heap-dump-to-file saves a heap dump to a local file + service starts and stops the thermostat storage and agent + shell launches the Thermostat interactive shell + show-heap-histogram show the heap histogram + storage starts and stops the thermostat storage + validate validates a thermostat plug-in XML file against the schema + vm-info shows basic information about a VM + vm-stat show various statistics about a VM + webservice starts and stops the thermostat web service
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,22 @@ +list of commands: + + help show help for a given command or help overview + agent starts and stops the thermostat agent + clean-data Drop all data related to all of the specified agents + dump-heap trigger a heap dump on the VM + find-objects finds objects in a heapdump + find-root finds the shortest path from an object to a GC root + gui launches the GUI client + list-heap-dumps list all heap dumps + list-vms lists all currently monitored VMs + object-info prints information about an object in a heap dump + ping using the Command Channel, send a ping to a running agent + save-heap-dump-to-file saves a heap dump to a local file + service starts and stops the thermostat storage and agent + shell launches the Thermostat interactive shell + show-heap-histogram show the heap histogram + storage starts and stops the thermostat storage + validate validates a thermostat plug-in XML file against the schema + vm-info shows basic information about a VM + vm-stat show various statistics about a VM + webservice starts and stops the thermostat web service
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_agent.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,10 @@ +usage: thermostat agent [-d <url>] [-s] [-l <level>] + starts and stops the thermostat agent + +thermostat agent + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -s,--saveOnExit save the data on exit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_connect.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,9 @@ +usage: thermostat connect -d <url> [-l <level>] + persistently connect to storage +Note: this command is only supported inside the shell +thermostat connect + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_disconnect.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,8 @@ +usage: thermostat disconnect [-l <level>] + disconnect from the currently used storage +Note: this command is only supported inside the shell +thermostat disconnect + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_dump-heap.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat dump-heap --vmId <vm> --hostId <host> [--dbUrl <dbUrl>] + [--logLevel <logLevel>] + trigger a heap dump on the VM + +thermostat dump-heap + -a,--hostId <host> the ID of the host to monitor + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -v,--vmId <vm> the ID of the VM to monitor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_find-objects.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat find-objects --heapId <heap> [--dbUrl <dbUrl>] [--limit + <limit>] [--logLevel <logLevel>] pattern + finds objects in a heapdump + +thermostat find-objects + -d,--dbUrl <dbUrl> connect to the given URL + -h,--heapId <heap> the ID of the heapdump to analyze + -L,--limit <limit> limit search to top N results, defaults to 10 + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_find-root.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,13 @@ +usage: thermostat find-root --objectId <heap> --heapId <heap> [--dbUrl <dbUrl>] + [--all] [--logLevel <logLevel>] + finds the shortest path from an object to a GC root + +thermostat find-root + -a,--all finds all paths to GC roots + -d,--dbUrl <dbUrl> connect to the given URL + -h,--heapId <heap> the ID of the heapdump to analyze + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -o,--objectId <heap> the ID of the object to query
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_gui.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,8 @@ +usage: thermostat gui [-l <level>] + launches the GUI client + +thermostat gui + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_list-heap-dumps.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat list-heap-dumps [--vmId <vm>] [--dbUrl <dbUrl>] [--hostId + <host>] [--logLevel <logLevel>] + list all heap dumps + +thermostat list-heap-dumps + -a,--hostId <host> the ID of the host to monitor + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -v,--vmId <vm> the ID of the VM to monitor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_list-vms.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,9 @@ +usage: thermostat list-vms [-d <url>] [-l <level>] + lists all currently monitored VMs + +thermostat list-vms + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_object-info.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat object-info --objectId <object> --heapId <heap> [--dbUrl + <dbUrl>] [--logLevel <logLevel>] + prints information about an object in a heap dump + +thermostat object-info + -d,--dbUrl <dbUrl> connect to the given URL + -h,--heapId <heap> the ID of the heapdump to analyze + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -o,--objectId <object> the ID of the object to query
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_ping.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,9 @@ +usage: thermostat ping <agentId> [-d <url>] [-l <level>] + using the Command Channel, send a ping to a running agent + +thermostat ping + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_save-heap-dump-to-file.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat save-heap-dump-to-file --file <filename> --heapId <heap> + [--dbUrl <dbUrl>] [--logLevel <logLevel>] + saves a heap dump to a local file + +thermostat save-heap-dump-to-file + -d,--dbUrl <dbUrl> connect to the given URL + -f,--file <filename> the file name to save to + -h,--heapId <heap> the ID of the heapdump to analyze + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_service.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,8 @@ +usage: thermostat service [-l <level>] + starts and stops the thermostat storage and agent + +thermostat service + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_shell.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,5 @@ +usage: thermostat shell + launches the Thermostat interactive shell + +thermostat shell +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_show-heap-histogram.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,11 @@ +usage: thermostat show-heap-histogram --heapId <heap> [--dbUrl <dbUrl>] + [--logLevel <logLevel>] + show the heap histogram + +thermostat show-heap-histogram + -d,--dbUrl <dbUrl> connect to the given URL + -h,--heapId <heap> the ID of the heapdump to analyze + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_storage.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,13 @@ +usage: thermostat storage <-start|--stop|--status> [--dryRun] [-q] [-l <level>] + starts and stops the thermostat storage + +thermostat storage + -d,--dryRun run the service in dry run mode + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -q,--quiet don't produce any output + --start start the database + --status check if the database is running + --stop stop the database
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_vm-info.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,11 @@ +usage: thermostat vm-info [-vmId <vm>] [--hostId <host>] [-d <url>] [-l <level>] + shows basic information about a VM + +thermostat vm-info + -a,--hostId <hostId> the ID of the host to monitor + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -v,--vmId <vmId> the ID of the VM to monitor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_vm-stat.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat vm-stat -hostId <host> --vmId <vm> [-d <url>] [-l <level>] + show various statistics about a VM + +thermostat vm-stat + -a,--hostId <hostId> the ID of the host to monitor + -c,--continuous print data continuously + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity are: + SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST + and OFF + -v,--vmId <vmId> the ID of the VM to monitor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/outputtexts/head/thermostat_help_webservice.txt Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,12 @@ +usage: thermostat webservice -d <url> -b <addrs> [-l <level>] + starts and stops the thermostat web service + +thermostat webservice + -b,--bindAddrs <bindAddrs> A comma separated list of IP address, port pairs + used for binding (e.g. + 127.0.0.1:8888,127.0.0.1:8889) + -d,--dbUrl <dbUrl> connect to the given URL + -l,--logLevel <logLevel> sets the log level for this invocation. Possible + values for <logLevel> in decreasing severity + are: SEVERE, WARNING, INFO, CONFIG, FINE, FINER, + FINEST and OFF
--- a/src/org/thermostat/qa/common/Configuration.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/common/Configuration.java Wed Oct 02 15:13:15 2013 +0200 @@ -46,7 +46,7 @@ private String thermostatExecutablePath = null; private String thermostatExecutableName = null; - private String thermostatOutputTextsVersion = null; + private String thermostatVersion = null; private String thermostatHome = null; private String thermostatUserHome = null; private String apacheTomcatHome = null; @@ -104,15 +104,15 @@ properties.load(fileInputStream); this.thermostatExecutablePath = properties.getProperty("thermostat_executable_path"); this.thermostatExecutableName = properties.getProperty("thermostat_executable_name"); - this.thermostatOutputTextsVersion = properties.getProperty("thermostat_output_version"); + this.thermostatVersion = properties.getProperty("thermostat_version"); this.thermostatHome = properties.getProperty("thermostat_home"); this.thermostatUserHome = properties.getProperty("thermostat_user_home"); this.apacheTomcatHome = properties.getProperty("apache_tomcat_home"); } - public String getThermostatOutputTextsVersion() + public String getThermostatVersion() { - return this.thermostatOutputTextsVersion; + return this.thermostatVersion; } public String getThermostatExecutable()
--- a/src/org/thermostat/qa/framework/Patterns.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/framework/Patterns.java Wed Oct 02 15:13:15 2013 +0200 @@ -38,12 +38,13 @@ { public static final String ERROR_ICON = "FailureToConnectToStorageDialog/error_icon"; public static final String CONFIGURE_BUTTON = "FailureToConnectToStorageDialog/configure_button"; - public static final String QUIT_BUTTON = "FailureToConnectToStorageDialog/quit_button"; + public static final String[] QUIT_BUTTON = {"FailureToConnectToStorageDialog/quit_button", + "FailureToConnectToStorageDialog/quit_button_mouseover"}; } public static class MainWindow { - public static final String[] MAGNIFY_ICON = {"MainWindow/magnify_icon","MainWindow/magnify_icon2"}; + public static final String[] MAGNIFY_ICON = {"MainWindow/magnify_icon","MainWindow/magnify_icon2", "MainWindow/no_magnify_icon"}; public static final String ISSUES_LABEL = "MainWindow/issues_label"; public static final String SUMMARY_LABEL = "MainWindow/summary_label"; public static final String MAIN_MENU = "MainWindow/main_menu"; @@ -99,13 +100,18 @@ public static class ClientPreferencesDialog { - public static final String OK_BUTTON = "ClientPreferencesDialog/ok_button"; + public static final String[] OK_BUTTON = {"ClientPreferencesDialog/ok_button", "ClientPreferencesDialog/ok_button2"}; public static final String CANCEL_BUTTON = "ClientPreferencesDialog/cancel_button"; public static final String USER_NAME_LABEL = "ClientPreferencesDialog/user_name_label"; public static final String PASSWORD_LABEL = "ClientPreferencesDialog/password_label"; public static final String STORAGE_URL_LABEL = "ClientPreferencesDialog/storage_url_label"; public static final String CONNECTION_INFO_LABEL = "ClientPreferencesDialog/connection_info_label"; public static final String SAVE_ENTITLEMENTS_CHECKBOX = "ClientPreferencesDialog/save_entitlements_checkbox"; + public static final String BAD_LOGIN_USER_NAME = "ClientPreferencesDialog/bad_login_user_name"; + public static final String SAVE_ENTITLEMENTS_CHECKED = "ClientPreferencesDialog/save_entitlements_checked"; + public static final String PASSWORD_EDIT_AND_LABEL = "ClientPreferencesDialog/password_edit_and_label"; + public static final String WEB_STORAGE_CONNECTION_INFO = "ClientPreferencesDialog/web_storage_connection_info"; + } public static class AllAgentsDialog
--- a/src/org/thermostat/qa/framework/ThermostatGuiTest.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/framework/ThermostatGuiTest.java Wed Oct 02 15:13:15 2013 +0200 @@ -149,7 +149,8 @@ // patterns should be divided into two categories: one for desktop with text AA enabled // and one for desktop with AA disabled - String subdir = this.useAntialiasedText ? AA_SUBDIR : NOAA_SUBDIR; + String subdir = this.configuration.getThermostatVersion()+"/"+ + (this.useAntialiasedText ? AA_SUBDIR : NOAA_SUBDIR); String fullPatternName = PATTERNS_DIRECTORY + "/" + subdir + "/" + patternFileName + ".png"; return robot.findPattern(fullPatternName);
--- a/src/org/thermostat/qa/framework/ThermostatOutputTextsGenerator.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/framework/ThermostatOutputTextsGenerator.java Wed Oct 02 15:13:15 2013 +0200 @@ -127,7 +127,7 @@ { StringBuffer sb = new StringBuffer(); sb.append("outputtexts/"); - sb.append(this.configuration.getThermostatOutputTextsVersion()); + sb.append(this.configuration.getThermostatVersion()); sb.append("/thermostat"); if(flags != null) { @@ -146,7 +146,7 @@ { StringBuffer sb = new StringBuffer(); sb.append("outputtexts/"); - sb.append(this.configuration.getThermostatOutputTextsVersion()); + sb.append(this.configuration.getThermostatVersion()); sb.append("/output_of_"); return sb.toString()+scriptname; }
--- a/src/org/thermostat/qa/framework/ThermostatUtilities.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/framework/ThermostatUtilities.java Wed Oct 02 15:13:15 2013 +0200 @@ -444,11 +444,11 @@ protected void prepareWebStorageConfigFiles() throws IOException { List<String> lines = new LinkedList<String>(); - lines.add("cp ./storageconfig/web-tomcat/agent.auth "+this.configuration.getThermostatUserHome() + "etc/"); - lines.add("cp ./storageconfig/web-tomcat/agent.properties "+this.configuration.getThermostatUserHome() + "etc/"); - lines.add("cp ./storageconfig/web-tomcat/client.properties "+this.configuration.getThermostatUserHome() + "etc/"); - lines.add("cp ./storageconfig/web-tomcat/thermostat-roles.properties "+this.configuration.getThermostatHome() + "etc/"); - lines.add("cp ./storageconfig/web-tomcat/thermostat-users.properties "+this.configuration.getThermostatHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/web-tomcat/agent.auth "+this.configuration.getThermostatUserHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/web-tomcat/agent.properties "+this.configuration.getThermostatUserHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/web-tomcat/client.properties "+this.configuration.getThermostatUserHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/web-tomcat/thermostat-roles.properties "+this.configuration.getThermostatHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/web-tomcat/thermostat-users.properties "+this.configuration.getThermostatHome() + "etc/"); runBashScriptWithContent("webStorage_prepareWebConfig.sh", lines); } @@ -468,7 +468,7 @@ protected void prepareWebStorageBadAgentLoginFile() throws IOException { List<String> lines = new LinkedList<String>(); - lines.add("cp ./storageconfig/web-tomcat/agent.badauth "+this.configuration.getThermostatUserHome() + "etc/agent.auth"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/web-tomcat/agent.badauth "+this.configuration.getThermostatUserHome() + "etc/agent.auth"); runBashScriptWithContent("webStorage_prepareBadAgentAuth.sh", lines); } @@ -489,11 +489,11 @@ //move back the original versions of the configuration files //web storage -> mongodb List<String> lines = new LinkedList<String>(); - lines.add("cp ./storageconfig/db-mongodb/agent.auth "+this.configuration.getThermostatUserHome() + "etc/"); - lines.add("cp ./storageconfig/db-mongodb/agent.properties "+this.configuration.getThermostatUserHome() + "etc/"); - lines.add("cp ./storageconfig/db-mongodb/client.properties "+this.configuration.getThermostatUserHome() + "etc/"); - lines.add("cp ./storageconfig/db-mongodb/thermostat-roles.properties "+this.configuration.getThermostatHome() + "etc/"); - lines.add("cp ./storageconfig/db-mongodb/thermostat-users.properties "+this.configuration.getThermostatHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/db-mongodb/agent.auth "+this.configuration.getThermostatUserHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/db-mongodb/agent.properties "+this.configuration.getThermostatUserHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/db-mongodb/client.properties "+this.configuration.getThermostatUserHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/db-mongodb/thermostat-roles.properties "+this.configuration.getThermostatHome() + "etc/"); + lines.add("cp ./storageconfig/"+this.configuration.getThermostatVersion()+"/db-mongodb/thermostat-users.properties "+this.configuration.getThermostatHome() + "etc/"); runBashScriptWithContent("webStorage_restoreNormalConfig.sh", lines); }
--- a/src/org/thermostat/qa/testsuites/CliClientSmokeTest.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/testsuites/CliClientSmokeTest.java Wed Oct 02 15:13:15 2013 +0200 @@ -71,7 +71,7 @@ @Override protected void setUp() { - this.pathToOutputTexts = "outputtexts/"+this.configuration.getThermostatOutputTextsVersion()+"/"; + pathToOutputTexts = "outputtexts/"+this.configuration.getThermostatVersion()+"/"; this.thermostatShellHelpMessage = FileUtils.getStringArrayFromOutputTextFile(this.pathToOutputTexts+"output_of_help_therm_shell.txt"); this.thermostatShellExitMessage = FileUtils.getStringArrayFromOutputTextFile(this.pathToOutputTexts+"output_of_exit_therm_shell.txt"); } @@ -139,7 +139,7 @@ stopStorage(); } - + public static void main(String[] args) { new CliClientSmokeTest().doTests(args); }
--- a/src/org/thermostat/qa/testsuites/OutputMessagesTest.java Wed Oct 02 10:01:39 2013 +0200 +++ b/src/org/thermostat/qa/testsuites/OutputMessagesTest.java Wed Oct 02 15:13:15 2013 +0200 @@ -108,28 +108,28 @@ @Override protected void setUp() { - this.outputsPath = "outputtexts/"+this.configuration.getThermostatOutputTextsVersion()+"/"; - THERMOSTAT_STANDARD_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat.txt"); - THERMOSTAT_HELP_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help.txt"); - THERMOSTAT_HELP_AGENT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_agent.txt"); - THERMOSTAT_HELP_CONNECT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_connect.txt"); - THERMOSTAT_HELP_DISCONNECT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_disconnect.txt"); - THERMOSTAT_HELP_DUMP_HEAP_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_dump-heap.txt"); - THERMOSTAT_HELP_FIND_OBJECTS_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_find-objects.txt"); - THERMOSTAT_HELP_FIND_ROOT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_find-root.txt"); - THERMOSTAT_HELP_GUI_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_gui.txt"); - THERMOSTAT_HELP_LIST_HEAP_DUMPS_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_list-heap-dumps.txt"); - THERMOSTAT_HELP_LIST_VMS_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_list-vms.txt"); - THERMOSTAT_HELP_OBJECT_INFO_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_object-info.txt"); - THERMOSTAT_HELP_PING_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_ping.txt"); - THERMOSTAT_HELP_SAVE_HEAP_DUMP_TO_FILE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_save-heap-dump-to-file.txt"); - THERMOSTAT_HELP_SERVICE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_service.txt"); - THERMOSTAT_HELP_SHELL_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_shell.txt"); - THERMOSTAT_HELP_SHOW_HEAP_HISTOGRAM_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_show-heap-histogram.txt"); - THERMOSTAT_HELP_STORAGE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_storage.txt"); - THERMOSTAT_HELP_VM_INFO_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_vm-info.txt"); - THERMOSTAT_HELP_VM_STAT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_vm-stat.txt"); - THERMOSTAT_HELP_WEBSERVICE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(this.outputsPath+"thermostat_help_webservice.txt"); + this.outputsPath = "outputtexts/"+this.configuration.getThermostatVersion()+"/"; + THERMOSTAT_STANDARD_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat.txt"); + THERMOSTAT_HELP_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help.txt"); + THERMOSTAT_HELP_AGENT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_agent.txt"); + THERMOSTAT_HELP_CONNECT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_connect.txt"); + THERMOSTAT_HELP_DISCONNECT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_disconnect.txt"); + THERMOSTAT_HELP_DUMP_HEAP_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_dump-heap.txt"); + THERMOSTAT_HELP_FIND_OBJECTS_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_find-objects.txt"); + THERMOSTAT_HELP_FIND_ROOT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_find-root.txt"); + THERMOSTAT_HELP_GUI_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_gui.txt"); + THERMOSTAT_HELP_LIST_HEAP_DUMPS_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_list-heap-dumps.txt"); + THERMOSTAT_HELP_LIST_VMS_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_list-vms.txt"); + THERMOSTAT_HELP_OBJECT_INFO_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_object-info.txt"); + THERMOSTAT_HELP_PING_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_ping.txt"); + THERMOSTAT_HELP_SAVE_HEAP_DUMP_TO_FILE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_save-heap-dump-to-file.txt"); + THERMOSTAT_HELP_SERVICE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_service.txt"); + THERMOSTAT_HELP_SHELL_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_shell.txt"); + THERMOSTAT_HELP_SHOW_HEAP_HISTOGRAM_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_show-heap-histogram.txt"); + THERMOSTAT_HELP_STORAGE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_storage.txt"); + THERMOSTAT_HELP_VM_INFO_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_vm-info.txt"); + THERMOSTAT_HELP_VM_STAT_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_vm-stat.txt"); + THERMOSTAT_HELP_WEBSERVICE_MESSAGE = FileUtils.getStringArrayFromOutputTextFile(outputsPath+"thermostat_help_webservice.txt"); } @Override
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/db-mongodb/agent.auth Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,9 @@ +# This file is intended to be read by a hand-rolled reader/parser, to avoid +# passwords needing to be represented as String objects at runtime. It must +# be saved with Unix line end characters, and encoded as ascii. +# Uncomment the following lines and replace with your storage authentication +# parameters as needed. +# +#username=thermostat +#password=thermostat +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/db-mongodb/agent.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,15 @@ +# Indicates if this agent will save its data to the database on exit +# or rather will purge the db +SAVE_ON_EXIT=false + +# A netty-based side channel for accepting configuration/tuning +# requests from the client will listen for connections on the address +# configured here. +# If this is removed or commented out, the default port is 127.0.0.1:12000 +CONFIG_LISTEN_ADDRESS=127.0.0.1:12000 + +# Connection URL to storage. This can be overridden with the -d option +# on the command line. In order to use web storage instead, use something +# similar to the following line: +#DB_URL=https://storage-server.example.com:8443/thermostat/storage +DB_URL=mongodb://127.0.0.1:27518
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/db-mongodb/client.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,5 @@ +# +#Mon Aug 26 10:34:41 CEST 2013 +connection-url=mongodb\://127.0.0.1\:27518 +save-entitlements=false +username=
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/db-mongodb/thermostat-roles.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,52 @@ +# This file is used if the PropertiesUsernameRolesLoginModule is used +# as a delegate in the JAAS configuration *and* the 'roles.properties' option +# has not been specified for the login module. +# +# If that is the case, this file does two things: +# 1. It maps user names to roles. +# 2. Defines an optional recursive set of roles. This is useful in order to +# define role sets. Users can then be members of such defined role sets. +# Note that every line which does not have a user name (as defined in the +# corresponding users.properties file) on the left hand side of the +# equals sign ('='), represents a role. +# +# A user is assigned multiple roles by separating them by a comma ','. Every +# entity in this file which isn't a user name, will be implicitly defined as a +# role. +# +# Format is as follows: +# +# user1 = my-role, my-role2 +# user2 = new-role, role1 +# role1 = other-role +# +# Considering users 'user1' and 'user2' are defined in users.properties, the +# above would assign 'user1' the roles 'my-role' and 'my-role2'. 'user2' would +# be a member of 'new-role', 'role1' and 'other-role' (transitively via role1) +# +# +# +# Example recursive role definition allowed-to-do-everything agent-users. You +# can uncomment the following lines and assign your agent users this +# "thermostat-agent" role. +#thermostat-agent = thermostat-add, thermostat-replace, thermostat-update, \ +# thermostat-remove, thermostat-save-file, thermostat-purge, \ +# thermostat-register-category, thermostat-register-category, \ +# thermostat-cmdc-verify, thermostat-login, thermostat-realm +# +# Example recursive role definition for allowed-to-see-everything client-users. +# You may uncomment the following lines and assign your client users this +# "thermostat-client" role. +#thermostat-client = thermostat-realm, thermostat-login, thermostat-query, \ +# thermostat-cmdc-generate, thermostat-load-file, \ +# thermostat-register-category, thermostat-prepare-statement +# +# Example recursive role definition that grants all command channel privileges. +# You may uncomment the following lines and assign your client users this +# "thermostat-cmdc" role. +#thermostat-cmdc = thermostat-cmdc-grant-garbage-collect, \ +# thermostat-cmdc-grant-dump-heap, \ +# thermostat-cmdc-grant-thread-harvester, \ +# thermostat-cmdc-grant-killvm, \ +# thermostat-cmdc-grant-ping, \ +# thermostat-cmdc-grant-jmx-toggle-notifications
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/db-mongodb/thermostat-users.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,19 @@ +# This file is used if the PropertiesUsernameRolesLoginModule is used +# as a delegate in the JAAS configuration *and* the 'users.properties' option +# has not been specified for the login module. +# +# If that is the case, this defines the database of users with corresponding +# passwords, the thermostat web storage servlet knows about. +# +# WARNING: Passwords of users are in plain text. This needs to be considered +# when using this module in production. The main goal of this login +# module is to provide a simple way to define thermostat users and +# their corresponding passwords. +# +# The format of this file is as follows (whitespace in usernames/passwords are +# not recommended): +# +# user1=password1 +# user2=password2 +# ... +# \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/agent.auth Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,8 @@ +# This file is intended to be read by a hand-rolled reader/parser, to avoid +# passwords needing to be represented as String objects at runtime. It must +# be saved with Unix line end characters, and encoded as ascii. +# Uncomment the following lines and replace with your storage authentication +# parameters as needed. +# +username=agent-tester +password=heslo1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/agent.badauth Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,8 @@ +# This file is intended to be read by a hand-rolled reader/parser, to avoid +# passwords needing to be represented as String objects at runtime. It must +# be saved with Unix line end characters, and encoded as ascii. +# Uncomment the following lines and replace with your storage authentication +# parameters as needed. +# +username=doctor-evil +password=mini-me
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/agent.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,16 @@ +# Indicates if this agent will save its data to the database on exit +# or rather will purge the db +SAVE_ON_EXIT=false + +# A netty-based side channel for accepting configuration/tuning +# requests from the client will listen for connections on the address +# configured here. +# If this is removed or commented out, the default port is 127.0.0.1:12000 +CONFIG_LISTEN_ADDRESS=127.0.0.1:12000 + +# Connection URL to storage. This can be overridden with the -d option +# on the command line. In order to use web storage instead, use something +# similar to the following line: +#DB_URL=https://storage-server.example.com:8443/thermostat/storage +#DB_URL=mongodb://127.0.0.1:27518 +DB_URL=http://127.0.0.1:8080/thermostat/storage
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/client.badauth Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,6 @@ +# +#Thu Aug 22 16:10:25 CEST 2013 +password=aaargh +connection-url=http\://127.0.0.1\:8080/thermostat/storage +save-entitlements=true +username=time-for-tea
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/client.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,6 @@ +# +#Thu Aug 22 16:10:25 CEST 2013 +password=heslo2 +connection-url=http\://127.0.0.1\:8080/thermostat/storage +save-entitlements=true +username=client-tester
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/thermostat-roles.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,75 @@ +# This file is used if the PropertiesUsernameRolesLoginModule is used +# as a delegate in the JAAS configuration *and* the 'roles.properties' option +# has not been specified for the login module. +# +# If that is the case, this file does two things: +# 1. It maps user names to roles. +# 2. Defines an optional recursive set of roles. This is useful in order to +# define role sets. Users can then be members of such defined role sets. +# Note that every line which does not have a user name (as defined in the +# corresponding users.properties file) on the left hand side of the +# equals sign ('='), represents a role. +# +# A user is assigned multiple roles by separating them by a comma ','. Every +# entity in this file which isn't a user name, will be implicitly defined as a +# role. +# +# Format is as follows: +# +# user1 = my-role, my-role2 +# user2 = new-role, role1 +# role1 = other-role +# +# Considering users 'user1' and 'user2' are defined in users.properties, the +# above would assign 'user1' the roles 'my-role' and 'my-role2'. 'user2' would +# be a member of 'new-role', 'role1' and 'other-role' (transitively via role1) +# +# +# +# Example recursive role definition allowed-to-do-everything agent-users. You +# can uncomment the following lines and assign your agent users this +# "thermostat-agent" role. +#thermostat-agent = thermostat-add, thermostat-replace, thermostat-update, \ +# thermostat-remove, thermostat-save-file, thermostat-purge, \ +# thermostat-register-category, thermostat-register-category, \ +# thermostat-cmdc-verify, thermostat-login, thermostat-realm +# +# Example recursive role definition for allowed-to-see-everything client-users. +# You may uncomment the following lines and assign your client users this +# "thermostat-client" role. +#thermostat-client = thermostat-realm, thermostat-login, thermostat-query, \ +# thermostat-cmdc-generate, thermostat-load-file, \ +# thermostat-register-category, thermostat-prepare-statement +# +# Example recursive role definition that grants all command channel privileges. +# You may uncomment the following lines and assign your client users this +# "thermostat-cmdc" role. +#thermostat-cmdc = thermostat-cmdc-grant-garbage-collect, \ +# thermostat-cmdc-grant-dump-heap, \ +# thermostat-cmdc-grant-thread-harvester, \ +# thermostat-cmdc-grant-killvm, \ +# thermostat-cmdc-grant-ping, \ +# thermostat-cmdc-grant-jmx-toggle-notifications +agent-tester=thermostat-agent +client-tester=thermostat-client +thermostat-agent=thermostat-write, \ + thermostat-save-file, \ + thermostat-purge, \ + thermostat-prepare-statement, \ + thermostat-register-category, \ + thermostat-cmdc-verify, \ + thermostat-login, \ + thermostat-realm +# Grants users who are member of the "thermostat-client" role ALL read privileges. +# See http://icedtea.classpath.org/wiki/?title=Thermostat/SecurityConsiderations#Thermostat_Access_Control +thermostat-client=thermostat-agents-grant-read-agentId-ALL, \ + thermostat-hosts-grant-read-hostname-ALL, \ + thermostat-vms-grant-read-vmId-ALL, \ + thermostat-vms-grant-read-username-ALL, \ + thermostat-realm, \ + thermostat-login, \ + thermostat-query, \ + thermostat-prepare-statement, \ + thermostat-cmdc-generate, \ + thermostat-load-file, \ + thermostat-register-category
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/thermostat-roles.properties-old Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,56 @@ +# This file is used if the PropertiesUsernameRolesLoginModule is used +# as a delegate in the JAAS configuration *and* the 'roles.properties' option +# has not been specified for the login module. +# +# If that is the case, this file does two things: +# 1. It maps user names to roles. +# 2. Defines an optional recursive set of roles. This is useful in order to +# define role sets. Users can then be members of such defined role sets. +# Note that every line which does not have a user name (as defined in the +# corresponding users.properties file) on the left hand side of the +# equals sign ('='), represents a role. +# +# A user is assigned multiple roles by separating them by a comma ','. Every +# entity in this file which isn't a user name, will be implicitly defined as a +# role. +# +# Format is as follows: +# +# user1 = my-role, my-role2 +# user2 = new-role, role1 +# role1 = other-role +# +# Considering users 'user1' and 'user2' are defined in users.properties, the +# above would assign 'user1' the roles 'my-role' and 'my-role2'. 'user2' would +# be a member of 'new-role', 'role1' and 'other-role' (transitively via role1) +# +# +# +# Example recursive role definition allowed-to-do-everything agent-users. You +# can uncomment the following lines and assign your agent users this +# "thermostat-agent" role. +#thermostat-agent = thermostat-add, thermostat-replace, thermostat-update, \ +# thermostat-remove, thermostat-save-file, thermostat-purge, \ +# thermostat-register-category, thermostat-register-category, \ +# thermostat-cmdc-verify, thermostat-login, thermostat-realm +# +# Example recursive role definition for allowed-to-see-everything client-users. +# You may uncomment the following lines and assign your client users this +# "thermostat-client" role. +#thermostat-client = thermostat-realm, thermostat-login, thermostat-query, \ +# thermostat-cmdc-generate, thermostat-load-file, \ +# thermostat-register-category, thermostat-prepare-statement +# +# Example recursive role definition that grants all command channel privileges. +# You may uncomment the following lines and assign your client users this +# "thermostat-cmdc" role. +#thermostat-cmdc = thermostat-cmdc-grant-garbage-collect, \ +# thermostat-cmdc-grant-dump-heap, \ +# thermostat-cmdc-grant-thread-harvester, \ +# thermostat-cmdc-grant-killvm, \ +# thermostat-cmdc-grant-ping, \ +# thermostat-cmdc-grant-jmx-toggle-notifications +agent-tester=thermostat-agent +client-tester=thermostat-client +thermostat-agent=thermostat-add, thermostat-replace, thermostat-update, thermostat-remove, thermostat-save-file, thermostat-purge, thermostat-register-category, thermostat-register-category, thermostat-cmdc-verify, thermostat-login, thermostat-realm +thermostat-client=thermostat-agents-grant-read-agentId-ALL, thermostat-hosts-grant-read-hostname-ALL, thermostat-vms-grant-read-vmId-ALL,thermostat-vms-grant-read-username-sgehwolf, thermostat-realm, thermostat-login, thermostat-query, thermostat-prepare-statement, thermostat-cmdc-generate, thermostat-load-file, thermostat-get-count, thermostat-register-category
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/storageconfig/head/web-tomcat/thermostat-users.properties Wed Oct 02 15:13:15 2013 +0200 @@ -0,0 +1,21 @@ +# This file is used if the PropertiesUsernameRolesLoginModule is used +# as a delegate in the JAAS configuration *and* the 'users.properties' option +# has not been specified for the login module. +# +# If that is the case, this defines the database of users with corresponding +# passwords, the thermostat web storage servlet knows about. +# +# WARNING: Passwords of users are in plain text. This needs to be considered +# when using this module in production. The main goal of this login +# module is to provide a simple way to define thermostat users and +# their corresponding passwords. +# +# The format of this file is as follows (whitespace in usernames/passwords are +# not recommended): +# +# user1=password1 +# user2=password2 +# ... +# +agent-tester=heslo1 +client-tester=heslo2
--- a/test.properties Wed Oct 02 10:01:39 2013 +0200 +++ b/test.properties Wed Oct 02 15:13:15 2013 +0200 @@ -1,6 +1,6 @@ thermostat_executable_path=/home/jfabriko/thermostaty/testing_thermostat/thermostat/distribution/target/image/bin/ thermostat_executable_name=thermostat -thermostat_output_version=0.12.0 +thermostat_version=head thermostat_home=/home/jfabriko/thermostaty/testing_thermostat/thermostat/distribution/target/image/ thermostat_user_home=/home/jfabriko/.thermostat/ apache_tomcat_home=/home/jfabriko/thermostaty/apache-tomcat-7.0.42/