Changeset 18694

Timestamp:

2009-03-16T17:42:38+13:00 (14 years ago)

Author:

ak19

Message:

Merged server.properties files of GS2 and GS3. Corresponding changes in the java code.

File:

• greenstone3/trunk/resources/java/server.properties (modified) (3 diffs)

greenstone3/trunk/resources/java/server.properties

@@ +1 @@
+#greenstone.version=Version 2-trunk
+Server2Settings.Port=Apache port:
+Server2Settings.URL=Library URL prefix:
+Server2Control.Version=Version 2-trunk
+Server2Control.Title=Greenstone 2 Digital Library
+
+#greenstone.version=Version 3.2
+Server3Settings.Port=Tomcat port:
+Server3Settings.URL=Servlet:
+Server3Control.Version=Version 3-trunk
+Server3Control.Title=Greenstone3 Digital Library
+
 ServerSettings.Title=Server settings
-ServerSettings.Port=Tomcat port:
-ServerSettings.Servlet=Servlet:
 ServerSettings.Auto_Start=Enter the library automatically
 ServerSettings.OK=OK
@@ -13 +23 @@
 ServerControl.RestartLibrary=Restart Library
 ServerControl.StartServer=Start Server
-ServerControl.Version=Version 3-trunk
 ServerControl.Frame_Title=Greenstone Server
-ServerControl.Title=Greenstone3 Digital Library
 ServerControl.Help_RestartLibrary=Press the 'Restart Library' button to restart the server, launch a browser and enter the library
 ServerControl.Help_EnterLibrary=Press the 'Enter Library' button to launch a browser and enter the library
@@ -27 +35 @@
 ServerControl.Menu.Exit=Exit
 ServerControl.Error={0} failed, please check server.log in {1}/logs for details. 
-ServerControl.Falied={0} failed
+ServerControl.Failed={0} failed
 ServerControl.Success={0} success
-greenstone.version=Version 3.2
 ServerSetting.SettingChanged=The new settings will be avaliable after the server has been restarted