From a1267fb1830ecbca0c5e3939ab2f0cea8386c562 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 18 Feb 2009 22:36:15 +0000 Subject: renamed config.txt into netcalendar.conf --- CHANGELOG.txt | 1 + MANIFEST.MF | 3 +-- README.txt | 8 ++++---- build.xml | 4 ++-- config.txt | 12 ------------ netcalendar.conf | 12 ++++++++++++ sources/client/inputforms/Preferences.java | 4 ++-- sources/shared/Config.java | 8 ++++---- sources/shared/Main.java | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 config.txt create mode 100644 netcalendar.conf diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 66a8c06..926f5e0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,6 @@ Changes from 1.0 -> 1.1 SVN +* conf.txt has been renamed into netcalendar.conf * Fixes in the docu * Added icons * Switched from Make to Ant (Build system) diff --git a/MANIFEST.MF b/MANIFEST.MF index ed85a20..8a0822f 100644 --- a/MANIFEST.MF +++ b/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.7.0 -Created-By: 1.6.0_03-p4-root_09_oct_2008_13_07-b00 (Sun Microsystems I - nc.) +Created-By: 11.2-b01 (Sun Microsystems Inc.) Built-By: Dipl.-Inform. (FH) Paul C. Buetow Main-Class: shared/Main diff --git a/README.txt b/README.txt index 98ed290..9a7133f 100644 --- a/README.txt +++ b/README.txt @@ -49,8 +49,8 @@ III. HOW TO START THE NETCALENDAR DISTRIBUTED (WITH SSL): 1. Server and client should use, if possible, the same version of the JRE. 2. You should copy the complete NetCalendar suite to the client and the server -computer. On edit on both sides (server and client) the conf.txt and set -use_ssl to true. +computer. On edit on both sides (server and client) the netcalendar.conf and +set use_ssl to true. 3. You should create clientKeys,clientTrust,serverKeys and serverTrust as discribed in http://www.ibm.com/developerworks/java/library/j-customssl/ and @@ -83,8 +83,8 @@ If you want to see more available parameters, then run the command java -jar NetCalendar.jar --help It is possible to configure the NetCalendar by editing the configuration file -which is "config.txt". However, the preferred way is using the client GUI via -"Session -> Preferences". +which is "netcalendar.conf". However, the preferred way is using the client +GUI via "Session -> Preferences". V. INFORMATIONS CONCERNING THE COLORS BEING USED WITHIN THE NETCALENDAR CLIENT: diff --git a/build.xml b/build.xml index feb7fed..9baf726 100644 --- a/build.xml +++ b/build.xml @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/config.txt b/config.txt deleted file mode 100644 index dbc3e3d..0000000 --- a/config.txt +++ /dev/null @@ -1,12 +0,0 @@ -client_max_events=100; -client_run=true; -logfile=netcalendar.log; -passphrase=dsfiu6786sdfsdhf; -regexp_case_insensitive=true; -server_address=localhost; -server_database_dir=calendardb; -server_port=4321; -server_run=true; -server_startup_command=none; -server_updatedb_command=none; -use_ssl=false; diff --git a/netcalendar.conf b/netcalendar.conf new file mode 100644 index 0000000..dbc3e3d --- /dev/null +++ b/netcalendar.conf @@ -0,0 +1,12 @@ +client_max_events=100; +client_run=true; +logfile=netcalendar.log; +passphrase=dsfiu6786sdfsdhf; +regexp_case_insensitive=true; +server_address=localhost; +server_database_dir=calendardb; +server_port=4321; +server_run=true; +server_startup_command=none; +server_updatedb_command=none; +use_ssl=false; diff --git a/sources/client/inputforms/Preferences.java b/sources/client/inputforms/Preferences.java index cefc192..a08fa65 100644 --- a/sources/client/inputforms/Preferences.java +++ b/sources/client/inputforms/Preferences.java @@ -12,7 +12,7 @@ import client.helper.GUIHelper; import shared.*; /** * This class contains all the GUI components of the preferences/options/config dialog. - * Its used for editing the current config values of the config.txt file. + * Its used for editing the current config values of the netcalendar.conf file. * @author buetow * */ @@ -88,7 +88,7 @@ public class Preferences extends InputForm { /** * This method is invoked if the enter key is pressed or if the submit button * has been pressed. It starts a client request relating to the user's input of - * the text fields. It will write all changes to the config.txt file. + * the text fields. It will write all changes to the netcalendar.conf file. */ protected void submit() { for (int i = 0; i < iNumPairs; ++i) diff --git a/sources/shared/Config.java b/sources/shared/Config.java index 92484b2..40e561c 100644 --- a/sources/shared/Config.java +++ b/sources/shared/Config.java @@ -6,13 +6,13 @@ import java.io.*; /** * This class makes all the configuration options available to all the other classes and objects - * of this program. Its reading and writing back the values from and to the config.txt file. + * of this program. Its reading and writing back the values from and to the netcalendar.conf file. * @author buetow * */ public final class Config { public static final String VERSION = "NetCalendar 1.1 SVN"; - private static final String CONFIG_FILE = "config.txt"; + private static final String CONFIG_FILE = "netcalendar.conf"; private static HashMap mapConfigVals; /** @@ -66,7 +66,7 @@ public final class Config { } /** - * This methods reads the options from the calendar config file 'config.txt'. + * This methods reads the options from the calendar config file 'netcalendar.conf'. * @param sConfigFile Specifies the relative or absolute path to the config file. */ public static void readConfig(String sConfigFile) { @@ -211,7 +211,7 @@ public final class Config { } /** - * This method writes the current configuration to the config file "config.txt". + * This method writes the current configuration to the config file "netcalendar.conf". */ public static void writeConfigToFile() { String [] sKeys = getSortedKeyArray(); diff --git a/sources/shared/Main.java b/sources/shared/Main.java index 37ebc03..a22bf24 100644 --- a/sources/shared/Main.java +++ b/sources/shared/Main.java @@ -75,7 +75,7 @@ public final class Main { } /** - * This method writes a specific message string into a logfile which is specified in the config.txt. + * This method writes a specific message string into a logfile which is specified in the netcalendar.conf. * @param sMessage Specified the message string to write into the logfile. */ private static void logMessage(String sMessage) { -- cgit v1.2.3