Changeset 18868 for greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java

Timestamp:

2009-04-01T19:31:09+13:00 (15 years ago)

Author:

ak19

Message:

Updated Server files for Linux GS2 Local Library Server to work the same way as the Windows GS2 LLS. Basically the major difference is that build.properties is no longer used but glisite.cfg or llssite.cfg depending on whether or not gs2-server.sh is launched from gli. There are a few additional changes required for this to keep it consistent with the way the Windows GS2 LLS works: storing the preview URL in glisite.cfg/llssite.cfg while the server is running and removing it when the server has stopped, Server2.java's main method taking the configfile as an additional parameter (and corresponding adjustments in the gsicontrol.sh script of GS2).

File:

• greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java (modified) (3 diffs)

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

@@ -132 +132 @@
     public void updateControl(){
         switch (server.getServerState()){
+    case BaseServer.START_SERVER:
     case BaseServer.SERVER_STARTED:
         {
@@ -157 +158 @@
     case BaseServer.BROWSER_LAUNCH_FAILED:
         {
-        enter_button.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.EnterLibrary")));
+        enter_button.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.EnterLibrary")
+                          + "(URL: " + server.getBrowserURL() + ")"));
         enter_button.setEnabled(true);
         fMenu.setEnabled(true);
@@ -201 +203 @@
     public void actionPerformed(ActionEvent ev) {
         switch (server.getServerState()){
+        case BaseServer.START_SERVER:
+        {
+         Thread runInThread = new Thread(new Runnable(){
+                public void run(){
+                server.start();
+                server.launchBrowser();
+                }
+            },"start server and launch browser");
+            
+            runInThread.start(); 
+                   break;     
+        }
         case BaseServer.SERVER_STARTED: case BaseServer.BROWSER_LAUNCH_FAILED:
         {