Changeset 18558

Timestamp:

2009-02-20T13:21:39+13:00 (15 years ago)

Author:

davidb

Message:

Restructuring of code to support a web server version for Greenstone2 and well as Greenstone3

Location:

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

Files:

• BaseProperty.java (added)
• BaseServer.java (added)
• BaseServerControl.java (added)
• BaseServerSettings.java (added)
• BrowserLauncher.java (modified) (1 diff)
• RunAnt.java (modified) (1 diff)
• RunMake.java (added)
• RunTarget.java (added)
• Server.java (deleted)
• Server2.java (added)
• Server2Control.java (added)
• Server2Property.java (added)
• Server2Settings.java (added)
• Server3.java (added)
• Server3Control.java (added)
• Server3Property.java (added)
• Server3Settings.java (added)
• ServerControl.java (deleted)
• ServerSettings.java (deleted)
• StaticStrings.java (deleted)

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

@@ -41 +41 @@
         // we use cmd and start
         if (Misc.isWindows9x()) {
-        this.command = StaticStrings.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\"";
+        this.command = BaseServer.Property.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\"";
         } else {
-        this.command = StaticStrings.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
+        this.command = BaseServer.Property.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
         }
     } else if (Misc.isMac()) {
-        this.command = StaticStrings.MAC_OPEN_COMMAND; // "open %1"
+        this.command = BaseServer.Property.MAC_OPEN_COMMAND; // "open %1"
     } else {
          // we try to look for a browser

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

@@ -1 +1 @@
 package org.greenstone.server;
 
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import org.greenstone.server.RunTarget;
 
-import org.greenstone.server.StreamGobbler;
+public class RunAnt extends RunTarget 
+{
+    public RunAnt()
+    {
+    super();
 
-import org.apache.log4j.*;
-
-public class RunAnt extends Thread {
-    private String antCmd = "";
-    static Logger logger = Logger.getLogger(org.greenstone.server.RunAnt.class.getName());
-    private int state = -1; //success: 0 error: 1    
-    public static int SUCCESS = 0;
-    public static int FAILED = 1; 
-
-    private String antSuccess = "BUILD SUCCESSFUL";
-    private String antFailed = "BUILD FAILED";
-    private String antFinished = "Total time";
-
-    public void run() {
-     
-     try {
-         state = -1;
-         Runtime run = Runtime.getRuntime();
-             Process process = run.exec(getAntCmd());
-         BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
-         String line = null;
-             while (!(line = br.readLine()).startsWith(antFinished)){
-                 
-         if (line.equals(antSuccess)){
-             state = 0;
-         }
-     
-         if (line.equals(antFailed)){
-             state = 1; 
-                  }
-         logger.info(line);
-         }    
-     } catch (Exception e) {
-         logger.error(e);
-         state = 1;
-     } 
-    }
-  
-    public int getAntState(){
-    return state;     
+    targetSuccess  = "BUILD SUCCESSFUL";
+    targetFailed   = "BUILD FAILED";
+    targetFinished = "Total time";
     }
     
-    public void setAntCmd(String cmd) {
+    public void setTargetCmd(String target) 
+    {
     String osName = System.getProperty("os.name");
         if (osName.startsWith("Windows")) {
-        this.antCmd = "ant.bat " + cmd;
+        targetCmd = "ant.bat " + target;
     } else {
-        this.antCmd = "ant " + cmd;
+        targetCmd = "ant " + target;
     }
     }
-
-    public String getAntCmd() {
-    return this.antCmd;
-    }
 }