renamed config.txt into netcalendar.conf

8 files changed, 15 insertions, 15 deletions

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 @@
     <copy todir="${classes}/images">
 		<fileset dir="images" />
 	</copy>
-    <copy file="config.txt" tofile="${classes}/config.txt" />
+    <copy file="netcalendar.conf" tofile="${classes}/netcalendar.conf" />
   </target>
 
   <target name="jar" depends="compile" description="generate the jar" >
@@ -52,7 +52,7 @@
     <copy todir="${dist}/calendardb">
 		<fileset dir="calendardb" />
 	</copy>
-    <copy file="config.txt" tofile="${dist}/config.txt" />
+    <copy file="netcalendar.conf" tofile="${dist}/netcalendar.conf" />
     <copy file="CHANGELOG.txt" tofile="${dist}/CHANGELOG.txt" />
     <copy file="README.txt" tofile="${dist}/README.txt" />
     <copy file="LICENSE.txt" tofile="${dist}/LICENSE.txt" />
diff --git a/config.txt b/netcalendar.conf
index dbc3e3d..dbc3e3d 100644
--- a/config.txt
+++ b/netcalendar.conf
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) {