Changeset 18770 for greenstone3

Timestamp:

2009-03-24T16:03:39+13:00 (15 years ago)

Author:

ak19

Message:

On error, the correct location of the logs folder needs to be displayed which is different between GS2 and GS3, so this is set by the subclass constructors.

Location:

greenstone3/trunk/src/java/org/greenstone/server

Files:

• BaseServer.java (modified) (3 diffs)
• Server2.java (modified) (1 diff)
• Server3.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/server/BaseServer.java

@@ -36 +36 @@
     protected boolean configure_required_ = true;
     protected String gsdl_home;
+    protected String logs_folder;
     protected BaseServerControl server_control_;    
     
-    protected BaseServer(String gsdl_home, String lang, String build_properties_path)
+    protected BaseServer(String gsdl_home, String lang, String build_properties_path, String logs)
     {
     this.gsdl_home = gsdl_home;
+    // expand the relative location of the logs folder
+    this.logs_folder = this.gsdl_home+File.separator+logs;
 
     // make sure we write to the correct logs
@@ -134 +137 @@
     
     protected void recordError(String message){
-        message = dictionary.get("ServerControl.Error",new String[]{message,gsdl_home});
+        message = dictionary.get("ServerControl.Error",new String[]{message,logs_folder});
     server_control_.displayMessage(message);
     logger_.error(dictionary.get("ServerControl.Failed",new String[]{message}));
@@ -141 +144 @@
 
     protected void recordError(String message, Exception e){
-        message = dictionary.get("ServerControl.Error",new String[]{message,gsdl_home});
+        message = dictionary.get("ServerControl.Error",new String[]{message,logs_folder});
     server_control_.displayMessage(message);
     logger_.error(dictionary.get("ServerControl.Failed",new String[]{message}),e);

greenstone3/trunk/src/java/org/greenstone/server/Server2.java

@@ -19 +19 @@
     {
     super(gsdl2_home, lang,
-          gsdl2_home+File.separator+"lib"+File.separator+"java"+File.separator+"build.properties"); 
+          gsdl2_home+File.separator+"lib"+File.separator+"java"+File.separator+"build.properties",
+          "etc"+File.separator+"logs-gsi"); 
 
     Property = new Server2Property();

greenstone3/trunk/src/java/org/greenstone/server/Server3.java

@@ -13 +13 @@
     public Server3(String gsdl3_src_home, String lang)
     {
-    super(gsdl3_src_home,lang, gsdl3_src_home+File.separatorChar+"build.properties");
+    super(gsdl3_src_home,lang, gsdl3_src_home+File.separatorChar+"build.properties", "logs");
 
     Property = new Server3Property();