Changeset 17612

Timestamp:

2008-10-24T17:45:51+13:00 (15 years ago)

Author:

ak19

Message:

Turned class RemoteGreenstoneServer.java from an all-static class into a regular OOP class. It is now also split into three files (the other two being ActionQueue.java and RemoteGreenstoneServerAction.java).

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (6 diffs)
• cdm/CollectionConfiguration.java (modified) (2 diffs)
• cdm/GeneralManager.java (modified) (1 diff)
• cdm/MacrosManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (8 diffs)
• collection/ScriptOptions.java (modified) (1 diff)
• file/FileManager.java (modified) (7 diffs)
• greenstone/Classifiers.java (modified) (2 diffs)
• greenstone/Plugins.java (modified) (2 diffs)
• greenstone3/ServletConfiguration.java (modified) (2 diffs)
• gui/ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (1 diff)
• gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• gui/Preferences.java (modified) (2 diffs)
• gui/ReplaceSrcDocWithHtmlPrompt.java (modified) (3 diffs)
• metadata/MetadataXMLFileManager.java (modified) (1 diff)
• metadata/ProfileXMLFile.java (modified) (1 diff)
• remote/ActionQueue.java (added)
• remote/RemoteGreenstoneServer.java (modified) (22 diffs)
• remote/RemoteGreenstoneServerAction.java (added)
• shell/GShell.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/Gatherer.java

@@ -85 +85 @@
 
     static private Dimension size = new Dimension(800, 540);
+    static public RemoteGreenstoneServer remoteGreenstoneServer = null;
 
     /** Has the exit flag been set? */
@@ -299 +300 @@
         // Finally, we're ready to find out the version of the remote Greenstone server 
         if(isGsdlRemote) {
+        // instantiate the RemoteGreenstoneServer object first
+        remoteGreenstoneServer = new RemoteGreenstoneServer();
+
         int greenstoneVersion = 2;
         requestGLIServerURL();
         gliserver_url_string = Configuration.gliserver_url.toString();
         
-        greenstoneVersion = RemoteGreenstoneServer.getGreenstoneVersion();
+        greenstoneVersion = remoteGreenstoneServer.getGreenstoneVersion();
         // Display the version to make error reports a lot more useful
         System.err.println("Remote Greenstone server version: " + greenstoneVersion);
@@ -316 +320 @@
             library_url_string = fedora_info.getLibraryURL();
         } else {
-            library_url_string = RemoteGreenstoneServer.getLibraryURL(Configuration.gliserver_url.toString());
+            library_url_string = remoteGreenstoneServer.getLibraryURL(Configuration.gliserver_url.toString());
         }
         }
@@ -472 +476 @@
     // If using a remote Greenstone we need to download the collection configurations now
     if (Gatherer.isGsdlRemote) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        if (remoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
         // !! Something went wrong downloading the collection configurations
         System.err.println("Error: Could not download collection configurations.");
@@ -551 +555 @@
     // If using a remote Greenstone we need to download the collection configurations now
     if (Gatherer.isGsdlRemote) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        if (remoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
         // !! Something went wrong downloading the collection configurations
         System.err.println("Error: Could not download collection configurations.");
@@ -616 +620 @@
     // If we're using a remote Greenstone server we need to make sure that all jobs have completed first
     if (isGsdlRemote) {
-        RemoteGreenstoneServer.exit();
+        remoteGreenstoneServer.exit();
     }
 

gli/trunk/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -3707 +3707 @@
         // If we're using a remote Greenstone server, upload the new 'collectionConfig.xml' file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
         }
         
@@ -3799 +3799 @@
             // If we're using a remote Greenstone server, upload the new collect.cfg file
             if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
+                Gatherer.remoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
             }
         }

gli/trunk/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -344 +344 @@
                 // If we're using a remote Greenstone server, upload the image
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), collection_image_file);
+                Gatherer.remoteGreenstoneServer.uploadCollectionFile(
+                                   CollectionManager.getLoadedCollectionName(), collection_image_file);
                 }
             }

gli/trunk/src/org/greenstone/gatherer/cdm/MacrosManager.java

@@ -217 +217 @@
         // Users need to wait until the upload has finished before pressing Preview Collection!
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), extra_dm_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), extra_dm_file);
         }
         }

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -379 +379 @@
     // Remove the lock file on the server
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
     }
 
@@ -547 +547 @@
         collection_import_directory.mkdirs();
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.newCollectionDirectory(name, collection_import_directory);
+            Gatherer.remoteGreenstoneServer.newCollectionDirectory(name, collection_import_directory);
         }
         }
@@ -581 +581 @@
         if (Gatherer.isGsdlRemote) {
             String base_collection_name = base_collection_directory.getName();
-            RemoteGreenstoneServer.downloadCollection(base_collection_name);
+            Gatherer.remoteGreenstoneServer.downloadCollection(base_collection_name);
         }
 
@@ -765 +765 @@
     // Delete the collection on the server if we're using a remote Greenstone
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollection(collection_name);
+        Gatherer.remoteGreenstoneServer.deleteCollection(collection_name);
     }
 
@@ -1056 +1056 @@
         // If we're using a remote Greenstone server, upload the metadata file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
         }
         }
@@ -1122 +1122 @@
     if (Gatherer.isGsdlRemote) {
         String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
-        if (RemoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
+        if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
         return;
         }
@@ -1618 +1618 @@
         // If we're using a remote Greenstone server, delete the metadata file on the server
         if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
         }
     }
@@ -1750 +1750 @@
 
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
-            RemoteGreenstoneServer.moveCollectionFile(collection.getName(), new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(
+                             collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getName(), 
+                    new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
         }
 

gli/trunk/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -225 +225 @@
 
         if (Gatherer.isGsdlRemote) {
-        String script_output = RemoteGreenstoneServer.getScriptOptions(filename, "");
+        String script_output = Gatherer.remoteGreenstoneServer.getScriptOptions(filename, "");
         document = XMLTools.parseXML(new StringReader(script_output));
         }

gli/trunk/src/org/greenstone/gatherer/file/FileManager.java

@@ -180 +180 @@
                 source_files[i] = source_nodes[i].getFile();
             }
-            RemoteGreenstoneServer.uploadFilesIntoCollection(collection_name, source_files, target_node.getFile());
+            Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(collection_name, source_files, target_node.getFile());
             }
             else if (type == FileJob.DELETE) {
             // Deletes: delete each top-level file/directory one at a time
             for (int i = 0; i < source_nodes.length; i++) {
-                RemoteGreenstoneServer.deleteCollectionFile(collection_name, source_nodes[i].getFile());
+                Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection_name, source_nodes[i].getFile());
             }
             }
@@ -191 +191 @@
             // Moves: move each top-level file/directory one at a time
             for (int i = 0; i < source_nodes.length; i++) {
-                RemoteGreenstoneServer.moveCollectionFile(collection_name, source_nodes[i].getFile(), target_node.getFile());
+                Gatherer.remoteGreenstoneServer.moveCollectionFile(
+                                     collection_name, source_nodes[i].getFile(), target_node.getFile());
             }
             }
@@ -272 +273 @@
         // ... but only if it is inside the collection and we haven't already downloaded it
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
-            if (RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), file).equals("")) {
+            if (Gatherer.remoteGreenstoneServer.downloadCollectionFile(
+                                 CollectionManager.getLoadedCollectionName(), file).equals("")) {
             // Something has gone wrong downloading the file
             return;
@@ -347 +349 @@
                 folder_file.createNewFile();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), folder_file);
+                Gatherer.remoteGreenstoneServer.uploadCollectionFile(
+                                         CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -353 +356 @@
                 folder_file.mkdirs();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.newCollectionDirectory(CollectionManager.getLoadedCollectionName(), folder_file);
+                Gatherer.remoteGreenstoneServer.newCollectionDirectory(
+                                         CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -413 +417 @@
         file_queue.addJob(System.currentTimeMillis(), collection_tree, new FileNode[] { collection_tree_node }, collection_tree, new_collection_tree_node, FileJob.RENAME);
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.moveCollectionFile(CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file);
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(
+                             CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file);
         }
         }
@@ -462 +467 @@
         file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, (FileNode)collection_tree_node.getParent(),  FileJob.COPY_FILE_ONLY);
         if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.uploadFilesIntoCollection(CollectionManager.getLoadedCollectionName(), new File[] { new_file }, target_directory);
+        Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(
+                         CollectionManager.getLoadedCollectionName(), new File[] { new_file }, target_directory);
         }
         // do a replace of old file with new file

gli/trunk/src/org/greenstone/gatherer/greenstone/Classifiers.java

@@ -134 +134 @@
             classinfo_options += "&collection=" + collection_name;
         }
-        classinfo_xml = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
+        classinfo_xml = Gatherer.remoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
         }
         else {
@@ -195 +195 @@
             classinfo_options += "&collection=" + collection_name;
         }
-        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
+        String classinfo_output = Gatherer.remoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
         xml = new StringBuffer(classinfo_output);
         }

gli/trunk/src/org/greenstone/gatherer/greenstone/Plugins.java

@@ -135 +135 @@
             pluginfo_options += "&collection=" + collection_name;
         }
-        pluginfo_xml = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
+        pluginfo_xml = Gatherer.remoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
         }
         else {
@@ -198 +198 @@
             pluginfo_options += "&collection=" + collection_name;
         }
-        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
+        String pluginfo_output = Gatherer.remoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
         xml = new StringBuffer(pluginfo_output);
         }

gli/trunk/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java

@@ -70 +70 @@
 
     if (Gatherer.isGsdlRemote){
-        if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
+        if (Gatherer.remoteGreenstoneServer.downloadWebXMLFile().equals("")) {
         System.err.println("Error: Could not download web.xml.");
         System.exit(0);
@@ -89 +89 @@
     this.sites = new ArrayList();
     if (Gatherer.isGsdlRemote){
-        String sites_on_server = RemoteGreenstoneServer.getSiteNames();
+        String sites_on_server = Gatherer.remoteGreenstoneServer.getSiteNames();
         if (sites_on_server.equals("")) {
         // !! Something went wrong : could not get names of the sites

gli/trunk/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -274 +274 @@
         String collection_name = CollectionManager.getLoadedCollectionName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String metadata_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(metadata_file, collection_directory_path);
+        String metadata_file_relative_path = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(
+                                                          metadata_file, collection_directory_path);
         command_parts_list.add("-file");
         command_parts_list.add(metadata_file_relative_path);
@@ -345 +346 @@
         if (Gatherer.isGsdlRemote) {
             Utility.delete(metadata_file.getParentFile());
-            RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(
+                             CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
         }
 

gli/trunk/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -438 +438 @@
         remote_greenstone_server_progress_panel.setLayout(new BorderLayout());
         remote_greenstone_server_progress_panel.add(remote_greenstone_server_progress_label, BorderLayout.WEST);
-        remote_greenstone_server_progress_panel.add(RemoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
+        remote_greenstone_server_progress_panel.add(Gatherer.remoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
         content_pane.add(remote_greenstone_server_progress_panel, BorderLayout.SOUTH);
         }

gli/trunk/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -259 +259 @@
     // Remote collections that aren't shared have the user's username prefixed to the collection name
     if (Gatherer.isGsdlRemote && personal_collection_button.isSelected()) {
-        name_buffer = new StringBuffer(RemoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
+        name_buffer = new StringBuffer(Gatherer.remoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
     }
 

gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

@@ -826 +826 @@
         Configuration.save();
         if (Gatherer.isGsdlRemote && Gatherer.GS3 && site_changed ){
-        RemoteGreenstoneServer.downloadCollectionConfigurations();
+        Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         // Refresh the GLI to account for the configuration changes
@@ -956 +956 @@
             if (Gatherer.c_man.getCollection()!=null){
             File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
-            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
             Gatherer.g_man.closeCurrentCollection();
             }
             Configuration.site_name=site;
-            RemoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
-            RemoteGreenstoneServer.downloadCollectionConfigurations();
+            Gatherer.remoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
+            Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         }

gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java

@@ -272 +272 @@
         String collection_name = CollectionManager.getLoadedCollectionName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String srcdoc_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(
+        String srcdoc_file_relative_path = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(
         this.srcdoc_files[fileNum], collection_directory_path); // preserves spaces in filename
         command_parts_list.add("-file");
@@ -382 +382 @@
             // download the generated html file from the server side to put it 
             // into the import directory on the client side
-            RemoteGreenstoneServer.downloadCollectionFile(
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(
                           CollectionManager.getLoadedCollectionName(),
                           new File(srcdoc_files[i].getParentFile(), htmlFile));
@@ -389 +389 @@
             File assoc_folder = new File(srcdoc_files[i].getParentFile(), suffixlessFilename+"_files");
             // If an associated_folder by such a name exists, download it
-            if(RemoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {
-              RemoteGreenstoneServer.downloadCollectionFile(
+            if(Gatherer.remoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {
+              Gatherer.remoteGreenstoneServer.downloadCollectionFile(
                                     CollectionManager.getLoadedCollectionName(), assoc_folder);
             }

gli/trunk/src/org/greenstone/gatherer/metadata/MetadataXMLFileManager.java

@@ -368 +368 @@
 
         // Upload the files modified since last time, then reset the list
-        RemoteGreenstoneServer.uploadCollectionFiles(CollectionManager.getLoadedCollectionName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
+        Gatherer.remoteGreenstoneServer.uploadCollectionFiles(
+                  CollectionManager.getLoadedCollectionName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
         modified_metadata_xml_files.clear();
     }

gli/trunk/src/org/greenstone/gatherer/metadata/ProfileXMLFile.java

@@ -110 +110 @@
     // This is inefficient but for simplicity we'll just upload the file every time it is changed
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), this);
+        Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), this);
     }
 

gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -58 +58 @@
 public class RemoteGreenstoneServer
 {
+    // A PasswordAuthentication object is created whenever it is required
+    static private PasswordAuthentication remote_greenstone_server_authentication = null;
+    // static private PasswordAuthentication remote_greenstone_server_authentication = new PasswordAuthentication(System.getProperty("user.name"), new char[] { });
+
+    private ActionQueue remote_greenstone_server_action_queue;
+    private RemoteGreenstoneServer.ProgressBar progress_bar;
+
+    public RemoteGreenstoneServer() {
+    remote_greenstone_server_action_queue = new ActionQueue();
+    progress_bar = new RemoteGreenstoneServer.ProgressBar();
+    }
+
     // ----------------------------------------------------------------------------------------------------
     //   PUBLIC LAYER
     // ----------------------------------------------------------------------------------------------------
-
-
-    static public String deleteCollection(String collection_name)
-    {
-    return performAction(new RemoteGreenstoneServerDeleteCollectionAction(collection_name));
-    }
-
-
-    static public String deleteCollectionFile(String collection_name, File collection_file)
-    {
-    return performAction(new RemoteGreenstoneServerDeleteCollectionFileAction(collection_name, collection_file));
-    }
-
-
-    static public String downloadCollection(String collection_name)
-    {
-    return performAction(new RemoteGreenstoneServerDownloadCollectionAction(collection_name));
-    }
-
-
-    static public String downloadCollectionArchives(String collection_name)
-    {
-    return performAction(new RemoteGreenstoneServerDownloadCollectionArchivesAction(collection_name));
-    }
-
-
-    static public String downloadCollectionConfigurations()
-    {
-    return performAction(new RemoteGreenstoneServerDownloadCollectionConfigurationsAction());
-    }
-
-
-    static public String downloadCollectionFile(String collection_name, File collection_file)
-    {
-    return performAction(new RemoteGreenstoneServerDownloadCollectionFileAction(collection_name, collection_file));
+    public String deleteCollection(String collection_name)
+    {
+    return performAction(new RemoteGreenstoneServerAction.DeleteCollectionAction(collection_name));
+    }
+
+
+    public String deleteCollectionFile(String collection_name, File collection_file)
+    {
+    return performAction(new RemoteGreenstoneServerAction.DeleteCollectionFileAction(collection_name, collection_file));
+    }
+
+
+    public String downloadCollection(String collection_name)
+    {
+    return performAction(new RemoteGreenstoneServerAction.DownloadCollectionAction(collection_name));
+    }
+
+
+    public String downloadCollectionArchives(String collection_name)
+    {
+    return performAction(new RemoteGreenstoneServerAction.DownloadCollectionArchivesAction(collection_name));
+    }
+
+
+    public String downloadCollectionConfigurations()
+    {
+    return performAction(new RemoteGreenstoneServerAction.DownloadCollectionConfigurationsAction());
+    }
+
+
+    public String downloadCollectionFile(String collection_name, File collection_file)
+    {
+    return performAction(new RemoteGreenstoneServerAction.DownloadCollectionFileAction(collection_name, collection_file));
     }
     
     // get web.xml from the server -- for a remote gli of GS3
-    static public String downloadWebXMLFile()
-    {
-    return performAction(new RemoteGreenstoneServerDownloadWebXMLFileAction());
-    }
-
-    static public String getScriptOptions(String script_name, String script_arguments)
-    {
-    return performAction(new RemoteGreenstoneServerGetScriptOptionsAction(script_name, script_arguments));
+    public String downloadWebXMLFile()
+    {
+    return performAction(new RemoteGreenstoneServerAction.DownloadWebXMLFileAction());
+    }
+
+    public String getScriptOptions(String script_name, String script_arguments)
+    {
+    return performAction(new RemoteGreenstoneServerAction.GetScriptOptionsAction(script_name, script_arguments));
     }
     
     //get all available site names from the server -- for a remote gli of GS3
-    static public String getSiteNames()
-    {
-    return performAction(new RemoteGreenstoneServerGetSiteNamesAction());
-    }
-
-    static public String moveCollectionFile(String collection_name, File source_collection_file, File target_collection_file)
-    {
-    return performAction(new RemoteGreenstoneServerMoveCollectionFileAction(collection_name, source_collection_file, target_collection_file));
-    }
-
-
-    static public String newCollectionDirectory(String collection_name, File new_collection_directory)
-    {
-    return performAction(new RemoteGreenstoneServerNewCollectionDirectoryAction(collection_name, new_collection_directory));
-    }
-
-
-    static public String runScript(String collection_name, String script_name, String script_arguments, GShell shell)
-    {
-    return performAction(new RemoteGreenstoneServerRunScriptAction(collection_name, script_name, script_arguments, shell));
-    }
-
-
-    static public String uploadCollectionFile(String collection_name, File collection_file)
-    {
-    return performAction(new RemoteGreenstoneServerUploadCollectionFilesAction(collection_name, new File[] { collection_file }));
-    }
-
-
-    static public String uploadCollectionFiles(String collection_name, File[] collection_files)
-    {
-    return performAction(new RemoteGreenstoneServerUploadCollectionFilesAction(collection_name, collection_files));
-    }
-
-
-    static public String uploadFilesIntoCollection(String collection_name, File[] source_files, File target_collection_directory)
-    {
-    return performAction(new RemoteGreenstoneServerUploadFilesIntoCollectionAction(collection_name, source_files, target_collection_directory));
-    }
-
-    static public boolean exists(String collection_name, File collection_file)
-    {
-    String result = performAction(new RemoteGreenstoneServerExistsAction(collection_name, collection_file));
+    public String getSiteNames()
+    {
+    return performAction(new RemoteGreenstoneServerAction.GetSiteNamesAction());
+    }
+
+    public String moveCollectionFile(String collection_name, File source_collection_file, File target_collection_file)
+    {
+    return performAction(new RemoteGreenstoneServerAction.MoveCollectionFileAction(
+                             collection_name, source_collection_file, target_collection_file));
+    }
+
+
+    public String newCollectionDirectory(String collection_name, File new_collection_directory)
+    {
+    return performAction(new RemoteGreenstoneServerAction.NewCollectionDirectoryAction(
+                             collection_name, new_collection_directory));
+    }
+
+
+    public String runScript(String collection_name, String script_name, String script_arguments, GShell shell)
+    {
+    return performAction(new RemoteGreenstoneServerAction.RunScriptAction(
+                             collection_name, script_name, script_arguments, shell));
+    }
+
+
+    public String uploadCollectionFile(String collection_name, File collection_file)
+    {
+    return performAction(new RemoteGreenstoneServerAction.UploadCollectionFilesAction(
+                             collection_name, new File[] { collection_file }));
+    }
+
+
+    public String uploadCollectionFiles(String collection_name, File[] collection_files)
+    {
+    return performAction(new RemoteGreenstoneServerAction.UploadCollectionFilesAction(collection_name, collection_files));
+    }
+
+
+    public String uploadFilesIntoCollection(String collection_name, File[] source_files, File target_collection_directory)
+    {
+    return performAction(new RemoteGreenstoneServerAction.UploadFilesIntoCollectionAction(
+                             collection_name, source_files, target_collection_directory));
+    }
+
+    public boolean exists(String collection_name, File collection_file)
+    {
+    String result = performAction(new RemoteGreenstoneServerAction.ExistsAction(collection_name, collection_file));
     if(result.indexOf("exists") != -1) {
         return true;
@@ -162 +177 @@
     }
 
-    static public int getGreenstoneVersion()
+    public int getGreenstoneVersion()
     {
     // returns message "Greenstone version is: <version number of the Greenstone remote server>"
-    String result = performAction(new RemoteGreenstoneServerVersionAction());
+    String result = performAction(new RemoteGreenstoneServerAction.VersionAction());
     int index = result.indexOf(":"); 
     if(index != -1) {
@@ -175 +190 @@
 
     /** For constructing the preview command (the library URL) with */
-    static public String getLibraryURL(String serverHomeURL)
+    public String getLibraryURL(String serverHomeURL)
     {
     // returns message "Greenstone library URL suffix is: <e.g. /greenstone3/library or /gsdl/cgi-bin/library>"
-    String libSuffix = performAction(new RemoteGreenstoneServerLibraryURLSuffixAction());
+    String libSuffix = performAction(new RemoteGreenstoneServerAction.LibraryURLSuffixAction());
     int index = libSuffix.indexOf(":"); 
     if(index != -1) {
@@ -200 +215 @@
 
 
-    static public void exit()
+    public void exit()
     {
     System.err.println("Exiting, number of jobs on queue: " + remote_greenstone_server_action_queue.size());
@@ -223 +238 @@
 
     /** Returns null if we cannot wait for the action to finish, "" if the action failed, or the action output. */
-    static private String performAction(RemoteGreenstoneServerAction remote_greenstone_server_action)
+    private String performAction(RemoteGreenstoneServerAction remote_greenstone_server_action)
     {
     // Add the action to the queue
@@ -255 +270 @@
 
 
-    static private RemoteGreenstoneServerActionQueue remote_greenstone_server_action_queue = new RemoteGreenstoneServerActionQueue();
-
-
-    static private class RemoteGreenstoneServerActionQueue
-    extends Thread
-    {
-    /** The queue of waiting jobs. */
-    private ArrayList queue = null;
-
-
-    public RemoteGreenstoneServerActionQueue()
-    {
-        if (Gatherer.isGsdlRemote) {
-        queue = new ArrayList();
-        start();
-        }
-    }
-
-
-    synchronized public void addAction(RemoteGreenstoneServerAction remote_greenstone_server_action)
-    {
-        queue.add(remote_greenstone_server_action);
-        notifyAll();
-    }
-
-
-    public int size()
-    {
-        return queue.size();
-    }
-
-
-    public void run()
-    {
-        boolean exit = false;
-        while (true) {
-        // If there are jobs on the queue, get the next in line and process it
-        if (queue.size() > 0) {
-            RemoteGreenstoneServerAction remote_greenstone_server_action = (RemoteGreenstoneServerAction) queue.get(0);
-
-            try {
-            remote_greenstone_server_action.perform();
-            
-            // No exceptions were thrown, so the action was successful
-            remote_greenstone_server_action.processed_successfully = true;
-            }
-            catch (RemoteGreenstoneServerActionCancelledException exception) {
-            remote_greenstone_server_action.processed_successfully = false;
-            exit = true;
-            } 
-            catch(java.net.ConnectException exception) {
-            if(exception.getMessage().trim().startsWith("Connection refused")) {
-                exit = true;
-            } else {
-                DebugStream.printStackTrace(exception);
-            }
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
-            remote_greenstone_server_action.processed_successfully = false;         
-            }
-            catch (FileNotFoundException exception) {
-            // FileNotFoundException happens when there's no GS server at the user-provided
-            // url (the address of gliserver.pl is wrong).
-            exit = true;
-            DebugStream.printStackTrace(exception);
-            JOptionPane.showMessageDialog(Gatherer.g_man, 
-                              Dictionary.get("RemoteGreenstoneServer.Error", 
-                                     "No gliserver.pl found. " + exception.getMessage()), 
-                              Dictionary.get("RemoteGreenstoneServer.Error_Title"), 
-                              JOptionPane.ERROR_MESSAGE);
-            remote_greenstone_server_action.processed_successfully = false;
-            }
-            catch (Exception exception) {
-            DebugStream.printStackTrace(exception);
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
-            remote_greenstone_server_action.processed_successfully = false;
-            }
-
-            // We're done with this action, for better or worse
-            remote_greenstone_server_action.processed = true;
-            queue.remove(0);
-        }
-
-        // Otherwise the queue is empty
-        else {
-            progress_bar.setAction(null);
-
-            // Wait until we are notify()ed by addAction that there is a new job on the queue
-            synchronized (this) {
-            try {
-                wait();
-            }
-            catch (InterruptedException exception) { }
-            }
-        }
-        
-        // stop the gazillion annoying error messages when the connection was simply
-        // refused or when the user pressed Cancel in the opening dialog, by exitting
-        // cleanly in one go.
-        if(exit == true) {
-            Gatherer.exit();
-        }
-        }
-    }
-    }
-
-
     // ----------------------------------------------------------------------------------------------------
     //   PROGRESS BAR
     // ----------------------------------------------------------------------------------------------------
 
-
-    static private RemoteGreenstoneServerProgressBar progress_bar = new RemoteGreenstoneServerProgressBar();
-
-
-    static private class RemoteGreenstoneServerProgressBar
+    static class ProgressBar
     extends JProgressBar
     {
-    public RemoteGreenstoneServerProgressBar()
+    public ProgressBar()
     {
         setBackground(Configuration.getColor("coloring.collection_tree_background", false));
@@ -404 +309 @@
     }
     }
-
-
-    static public RemoteGreenstoneServerProgressBar getProgressBar()
+    
+    public RemoteGreenstoneServer.ProgressBar getProgressBar()
     {
     return progress_bar;
@@ -413 +317 @@
 
     // ----------------------------------------------------------------------------------------------------
-    //   ACTIONS
-    // ----------------------------------------------------------------------------------------------------
-
-
-    static private abstract class RemoteGreenstoneServerAction
-    {
-    public String action_output = null;
-    public boolean processed = false;
-    public boolean processed_successfully;
-
-    abstract public void perform()
-        throws Exception;
-    }
-
-
-    static private class RemoteGreenstoneServerActionCancelledException
-    extends Exception
-    {
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DELETE COLLECTION
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDeleteCollectionAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-
-    public RemoteGreenstoneServerDeleteCollectionAction(String collection_name)
-    {
-        this.collection_name = collection_name;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Deleting collection " + collection_name + "...");
-
-        String delete_collection_command = "cmd=delete-collection";
-        delete_collection_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        action_output = sendCommandToServer(delete_collection_command, null);
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DELETE COLLECTION FILE
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDeleteCollectionFileAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File collection_file;
-
-    public RemoteGreenstoneServerDeleteCollectionFileAction(String collection_name, File collection_file)
-    {
-        this.collection_name = collection_name;
-        this.collection_file = collection_file;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String collection_file_relative_path = getPathRelativeToDirectory(collection_file, collection_directory_path);
-        collection_file_relative_path = collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        progress_bar.setAction("Deleting collection file " + collection_file_relative_path + "...");
-
-        String delete_collection_file_command = "cmd=delete-collection-file";
-        delete_collection_file_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        delete_collection_file_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
-        action_output = sendCommandToServer(delete_collection_file_command, null);
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DOWNLOAD COLLECTION
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDownloadCollectionAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-
-    public RemoteGreenstoneServerDownloadCollectionAction(String collection_name)
-    {
-        this.collection_name = collection_name;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Downloading remote collection " + collection_name + "...");
-
-        String download_collection_command = "cmd=download-collection";
-        download_collection_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        String zip_file_path = Gatherer.getCollectDirectoryPath() + collection_name + ".zip";
-        action_output = downloadFile(download_collection_command, zip_file_path);
-
-        // Delete the existing (local) collection directory
-        Utility.delete(new File(CollectionManager.getCollectionDirectoryPath(collection_name)));
-
-        // Unzip the collection just downloaded
-        UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DOWNLOAD COLLECTION ARCHIVES
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDownloadCollectionArchivesAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-
-    public RemoteGreenstoneServerDownloadCollectionArchivesAction(String collection_name)
-    {
-        this.collection_name = collection_name;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Downloading collection archives for " + collection_name + "...");
-
-        String download_collection_archives_command = "cmd=download-collection-archives";
-        download_collection_archives_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        String zip_file_path = Gatherer.getCollectDirectoryPath() + collection_name + "-archives.zip";
-        action_output = downloadFile(download_collection_archives_command, zip_file_path);
-
-        // Delete the existing (local) collection archives
-        Utility.delete(new File(CollectionManager.getLoadedCollectionArchivesDirectoryPath()));
-
-        // Unzip the collection archives just downloaded
-        UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DOWNLOAD COLLECTION CONFIGURATIONS
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDownloadCollectionConfigurationsAction
-    extends RemoteGreenstoneServerAction
-    {
-    public RemoteGreenstoneServerDownloadCollectionConfigurationsAction()
-    {
-    }
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Downloading collection configurations...");
-
-        // Delete the existing (local) collect directory
-        Utility.delete(new File(Gatherer.getCollectDirectoryPath()));
-        new File(Gatherer.getCollectDirectoryPath()).mkdirs();
-
-        String download_collection_configurations_command = "cmd=download-collection-configurations";
-        String zip_file_path = Gatherer.getCollectDirectoryPath() + "collections.zip";
-        action_output = downloadFile(download_collection_configurations_command, zip_file_path);
-
-        // Unzip the collection configurations just downloaded
-        UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
-    }
-    }
-
-     /**
-     * --------------------------------------------------------------------------------------------
-     *    DISCOVERING WHAT VERSION THE REMOTE GREENSTONE SERVER IS (2 or 3)
-     * --------------------------------------------------------------------------------------------
-     */
-
-    static private class RemoteGreenstoneServerVersionAction
-    extends RemoteGreenstoneServerAction
-    {
-    public void perform()
-        throws Exception
-    {
-        action_output = sendCommandToServer("cmd=greenstone-server-version", null);
-    }   
-    }
-
-    static private class RemoteGreenstoneServerLibraryURLSuffixAction
-    extends RemoteGreenstoneServerAction
-    {
-    public void perform()
-        throws Exception
-    {
-        action_output = sendCommandToServer("cmd=get-library-url-suffix", null);
-    }   
-    }
-    
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    CHECKING IF A FILE/FOLDER EXISTS ON SERVER SIDE
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerExistsAction 
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File collection_file;
-    
-    public RemoteGreenstoneServerExistsAction(String collection_name, File collection_file)
-    {
-        this.collection_name = collection_name;
-        this.collection_file = collection_file;
-    }
-    
-    public void perform()
-        throws Exception
-    {
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String collection_file_relative_path = getPathRelativeToDirectory(collection_file, collection_directory_path);
-        collection_file_relative_path = collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        File file = new File(collection_directory_path, collection_file_relative_path);
-
-        String file_exists_command = "cmd=file-exists";
-        file_exists_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        file_exists_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
-        // returns either "File <filename> exists" or "File <filename> does not exist"
-        // for the file/folder collection_file
-        action_output = sendCommandToServer(file_exists_command, null);
-    }   
-    }
-    
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DOWNLOAD COLLECTION FILE
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDownloadCollectionFileAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File collection_file;
-
-    public RemoteGreenstoneServerDownloadCollectionFileAction(String collection_name, File collection_file)
-    {
-        this.collection_name = collection_name;
-        this.collection_file = collection_file;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String collection_file_relative_path = getPathRelativeToDirectory(collection_file, collection_directory_path);
-        collection_file_relative_path = collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        progress_bar.setAction("Downloading collection file " + collection_file_relative_path + "...");
-
-        String download_collection_file_command = "cmd=download-collection-file";
-        download_collection_file_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        download_collection_file_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
-        String zip_file_name = collection_name + "-" + collection_file.getName() + ".zip";
-        String zip_file_path = collection_directory_path + zip_file_name;
-        action_output = downloadFile(download_collection_file_command, zip_file_path);
-
-        // Unzip the collection file just downloaded
-        UnzipTools.unzipFile(zip_file_path, collection_directory_path);
-    }
-    }
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    DOWNLOAD web.xml FILE --for a remote GS3
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerDownloadWebXMLFileAction
-    extends RemoteGreenstoneServerAction
-    {
-    public RemoteGreenstoneServerDownloadWebXMLFileAction()
-    {}
-
-    public void perform()
-        throws Exception
-    {
-        String web_xml_directory_path=(Configuration.gli_user_directory_path);
-        String download_web_xml_file_command = "cmd=download-web-xml-file";
-        download_web_xml_file_command += "&file=" + URLEncoder.encode("web.xml", "UTF-8");
-        String zip_file_name = "web-xml.zip";
-        String zip_file_path = web_xml_directory_path + zip_file_name;
-        action_output = downloadFile(download_web_xml_file_command, zip_file_path);
-
-        // Unzip the web.xml file just downloaded
-        UnzipTools.unzipFile(zip_file_path,web_xml_directory_path);
-    }
-    }
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    GET SCRIPT OPTIONS
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerGetScriptOptionsAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String script_name;
-    private String script_arguments;
-
-    public RemoteGreenstoneServerGetScriptOptionsAction(String script_name, String script_arguments)
-    {
-        this.script_name = script_name;
-        this.script_arguments = script_arguments;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Getting options for " + script_name + "...");
-
-        String get_script_options_command = "cmd=get-script-options";
-        get_script_options_command += "&script=" + script_name;
-        get_script_options_command += "&xml=";
-        get_script_options_command += "&language=" + Configuration.getLanguage();
-        get_script_options_command += script_arguments;
-        action_output = sendCommandToServer(get_script_options_command, null);
-    }
-    }
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    GET ALL NAMES OF SITES // for a remote GS3 
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerGetSiteNamesAction
-    extends RemoteGreenstoneServerAction
-    {
-    public RemoteGreenstoneServerGetSiteNamesAction()
-    {}
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Getting names of sites ...");
-
-        String get_script_options_command = "cmd=get-site-names";
-        action_output = sendCommandToServer(get_script_options_command, null);
-    }
-    }
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    MOVE COLLECTION FILE
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerMoveCollectionFileAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File source_collection_file;
-    private File target_collection_file;
-
-    public RemoteGreenstoneServerMoveCollectionFileAction(String collection_name, File source_collection_file, File target_collection_file)
-    {
-        this.collection_name = collection_name;
-        this.source_collection_file = source_collection_file;
-        this.target_collection_file = target_collection_file;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String source_collection_file_relative_path = getPathRelativeToDirectory(source_collection_file, collection_directory_path);
-        source_collection_file_relative_path = source_collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        String target_collection_file_relative_path = getPathRelativeToDirectory(target_collection_file, collection_directory_path);
-        target_collection_file_relative_path = target_collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        progress_bar.setAction("Moving file " + source_collection_file_relative_path + " -> " + target_collection_file_relative_path + "...");
-
-        String move_collection_file_command = "cmd=move-collection-file";
-        move_collection_file_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        move_collection_file_command += "&source=" + URLEncoder.encode(source_collection_file_relative_path, "UTF-8");
-        move_collection_file_command += "&target=" + URLEncoder.encode(target_collection_file_relative_path, "UTF-8");
-        action_output = sendCommandToServer(move_collection_file_command, null);
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    NEW COLLECTION DIRECTORY
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerNewCollectionDirectoryAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File new_collection_directory;
-
-    public RemoteGreenstoneServerNewCollectionDirectoryAction(String collection_name, File new_collection_directory)
-    {
-        this.collection_name = collection_name;
-        this.new_collection_directory = new_collection_directory;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String new_collection_directory_relative_path = getPathRelativeToDirectory(new_collection_directory, collection_directory_path);
-        new_collection_directory_relative_path = new_collection_directory_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        progress_bar.setAction("Creating new directory " + new_collection_directory_relative_path + "...");
-
-        String new_collection_directory_command = "cmd=new-collection-directory";
-        new_collection_directory_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        new_collection_directory_command += "&directory=" + URLEncoder.encode(new_collection_directory_relative_path, "UTF-8");
-        action_output = sendCommandToServer(new_collection_directory_command, null);
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    RUN SCRIPT
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerRunScriptAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private String script_name;
-    private String script_arguments;
-    private GShell shell;
-
-    public RemoteGreenstoneServerRunScriptAction(String collection_name, String script_name, String script_arguments, GShell shell)
-    {
-        this.collection_name = collection_name;
-        this.script_name = script_name;
-        this.script_arguments = script_arguments;
-        this.shell = shell;
-    }
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Running " + script_name + "...");
-
-        String run_script_command = "cmd=run-script";
-        run_script_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        run_script_command += "&script=" + script_name;
-        run_script_command += "&language=" + Configuration.getLanguage();
-        run_script_command += script_arguments;
-        action_output = sendCommandToServer(run_script_command, shell);
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    UPLOAD COLLECTION FILE
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerUploadCollectionFilesAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File[] collection_files;
-
-
-    public RemoteGreenstoneServerUploadCollectionFilesAction(String collection_name, File[] collection_files)
-    {
-        this.collection_name = collection_name;
-        this.collection_files = collection_files;
-    }
-
-
-    public void perform()
-        throws Exception
-    {
-        progress_bar.setAction("Uploading collection files...");
-
-        // Determine the file paths relative to the collection directory
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String[] collection_file_relative_paths = new String[collection_files.length];
-        for (int i = 0; i < collection_files.length; i++) {
-        collection_file_relative_paths[i] = getPathRelativeToDirectory(collection_files[i], collection_directory_path);
-        }
-
-        // Zip up the files to send to the server
-        String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
-        String zip_file_path = collection_directory_path + zip_file_name;
-        ZipTools.zipFiles(zip_file_path, collection_directory_path, collection_file_relative_paths);
-        
-        // Upload the zip file
-        String upload_collection_file_command = "cmd=upload-collection-file";
-        upload_collection_file_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        upload_collection_file_command += "&file=" + URLEncoder.encode(zip_file_name, "UTF-8");
-        upload_collection_file_command += "&directory=";
-        upload_collection_file_command += "&zip=true";
-        action_output = uploadFile(upload_collection_file_command, zip_file_path);
-    }
-    }
-
-
-    /**
-     * --------------------------------------------------------------------------------------------
-     *    UPLOAD FILES INTO COLLECTION
-     * --------------------------------------------------------------------------------------------
-     */
-    static private class RemoteGreenstoneServerUploadFilesIntoCollectionAction
-    extends RemoteGreenstoneServerAction
-    {
-    private String collection_name;
-    private File[] source_files;
-    private File target_collection_directory;
-
-
-    public RemoteGreenstoneServerUploadFilesIntoCollectionAction(String collection_name, File[] source_files, File target_collection_directory)
-    {
-        this.collection_name = collection_name;
-        this.source_files = source_files;
-        this.target_collection_directory = target_collection_directory;
-    }
-
-
-    public void perform()
-        throws Exception
-    {
-        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String target_collection_directory_relative_path = getPathRelativeToDirectory(target_collection_directory, collection_directory_path);
-        target_collection_directory_relative_path = target_collection_directory_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-        progress_bar.setAction("Uploading files into collection...");
-       
-        String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
-        String zip_file_path = Gatherer.getCollectDirectoryPath() + zip_file_name;
-        DebugStream.println("Zip file path: " + zip_file_path);
-
-        String base_directory_path = source_files[0].getParentFile().getAbsolutePath();
-        DebugStream.println("Base directory path: " + base_directory_path);
-        String[] source_file_relative_paths = new String[source_files.length];
-        for (int i = 0; i < source_files.length; i++) {
-        DebugStream.println("Source file path: " + source_files[i]);
-        source_file_relative_paths[i] = getPathRelativeToDirectory(source_files[i], base_directory_path);
-        }
-        
-        ZipTools.zipFiles(zip_file_path, base_directory_path, source_file_relative_paths);
-
-        String upload_collection_file_command = "cmd=upload-collection-file";
-        upload_collection_file_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        upload_collection_file_command += "&file=" + URLEncoder.encode(zip_file_name, "UTF-8");
-        upload_collection_file_command += "&directory=" + URLEncoder.encode(target_collection_directory_relative_path, "UTF-8");
-        upload_collection_file_command += "&zip=true";
-        action_output = uploadFile(upload_collection_file_command, zip_file_path);
-    }
-    }
-
-
-    // ----------------------------------------------------------------------------------------------------
     //   AUTHENTICATION LAYER
     // ----------------------------------------------------------------------------------------------------
-
-
-    static private PasswordAuthentication remote_greenstone_server_authentication = null;
-    // static private PasswordAuthentication remote_greenstone_server_authentication = new PasswordAuthentication(System.getProperty("user.name"), new char[] { });
-
-    static public void set_remote_greenstone_server_authentication_to_null(){
-    remote_greenstone_server_authentication = null;
-    }
 
     static private class RemoteGreenstoneServerAuthenticateTask
@@ -1018 +351 @@
     }
     }
-
-
-    static private void authenticateUser()
-    throws RemoteGreenstoneServerActionCancelledException
+    
+    public void set_remote_greenstone_server_authentication_to_null() {
+    remote_greenstone_server_authentication = null;
+    }
+
+    private void authenticateUser()
+    throws RemoteGreenstoneServerAction.ActionCancelledException
     {
     // If we don't have any authentication information then ask for it now
@@ -1035 +371 @@
         // If it is still null then the user has cancelled the authentication, so the action is cancelled
         if (remote_greenstone_server_authentication == null) {
-        throw new RemoteGreenstoneServerActionCancelledException();
-        }
-    }
-    }
-
-
-    static public String getUsername()
+        throw new RemoteGreenstoneServerAction.ActionCancelledException();
+        }
+    }
+    }
+
+
+    public String getUsername()
     {
     if (remote_greenstone_server_authentication != null) {
@@ -1057 +393 @@
 
     /** Returns the command output if the action completed, throws some kind of exception otherwise. */
-    static private String downloadFile(String gliserver_args, String file_path)
+    String downloadFile(String gliserver_args, String file_path)
     throws Exception
     {
@@ -1081 +417 @@
         if (JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Steal_Lock_Message", command_output.substring("ERROR: Collection is locked by: ".length())), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
             // The user has decided to cancel the action
-            throw new RemoteGreenstoneServerActionCancelledException();
+            throw new RemoteGreenstoneServerAction.ActionCancelledException();
         }
 
@@ -1101 +437 @@
      * string embedded in the given gliserver_args. No authentication is required for either 
      * of the commands greenstone-server-version and get-library-url-suffix. */
-    static private boolean isAuthenticationRequired(String gliserver_args) {
+    private boolean isAuthenticationRequired(String gliserver_args) {
     return ((gliserver_args.indexOf("greenstone-server-version") == -1) 
         && (gliserver_args.indexOf("get-library-url-suffix") == -1));
@@ -1107 +443 @@
 
 
-    /** Returns the command output if the action completed, throws some kind of exception otherwise. */
-    static private String sendCommandToServer(String gliserver_args, GShell shell)
+    /** Returns the command output if the action completed, throws some kind of exception otherwise. 
+     *  Package access, so that RemoteGreenstoneServerAction.java can call this.
+     */
+    String sendCommandToServer(String gliserver_args, GShell shell)
     throws Exception
     {
@@ -1135 +473 @@
         if (JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Steal_Lock_Message", command_output.substring("ERROR: Collection is locked by: ".length())), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
             // The user has decided to cancel the action
-            throw new RemoteGreenstoneServerActionCancelledException();
+            throw new RemoteGreenstoneServerAction.ActionCancelledException();
         }
 
@@ -1157 +495 @@
 
     /** Returns the command output if the action completed, throws some kind of exception otherwise. */
-    static private String uploadFile(String gliserver_args, String file_path)
+    String uploadFile(String gliserver_args, String file_path)
     throws Exception
     {
@@ -1182 +520 @@
         if (JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Steal_Lock_Message", command_output.substring("ERROR: Collection is locked by: ".length())), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
             // The user has decided to cancel the action
-            throw new RemoteGreenstoneServerActionCancelledException();
+            throw new RemoteGreenstoneServerAction.ActionCancelledException();
         }
 
@@ -1206 +544 @@
 
     /** Returns the command output if the action completed, throws some kind of exception otherwise. */
-    static private String downloadFileInternal(String download_cgi, String cgi_args, String file_path)
+    private String downloadFileInternal(String download_cgi, String cgi_args, String file_path)
     throws Exception
     {
@@ -1262 +600 @@
 
     /** Returns the command output if the action completed, throws some kind of exception otherwise. */
-    static private String sendCommandToServerInternal(String gliserver_url_string, String cgi_args, GShell shell)
+    private String sendCommandToServerInternal(String gliserver_url_string, String cgi_args, GShell shell)
     throws Exception
     {
@@ -1290 +628 @@
         shell.fireMessage(gliserver_output_line);
         if (shell.hasSignalledStop()) {
-            throw new RemoteGreenstoneServerActionCancelledException();
+            throw new RemoteGreenstoneServerAction.ActionCancelledException();
         }
         }
@@ -1303 +641 @@
            
     /** Returns the command output if the action completed, throws some kind of exception otherwise. */
-    static private String uploadFileInternal(String upload_cgi, String cgi_args, String file_path)
+    private String uploadFileInternal(String upload_cgi, String cgi_args, String file_path)
     throws Exception
     {
@@ -1433 +771 @@
 
 
-    static public String getPathRelativeToDirectory(File file, String directory_path)
+    public String getPathRelativeToDirectory(File file, String directory_path)
     {
     String file_path = file.getAbsolutePath();

gli/trunk/src/org/greenstone/gatherer/shell/GShell.java

@@ -217 +217 @@
         System.err.println("Script args: " + script_args);
         buffered_output_stream = bos;
-        String command_output = RemoteGreenstoneServer.runScript(collection_name, script_name, script_args, this);
+        String command_output = Gatherer.remoteGreenstoneServer.runScript(collection_name, script_name, script_args, this);
         status = (command_output.equals("") ? CANCELLED : OK);
     }
@@ -383 +383 @@
         if (type == NEW) {
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.downloadCollection(col_name);
+            Gatherer.remoteGreenstoneServer.downloadCollection(col_name);
         }
         }
@@ -395 +395 @@
             }
 
-            RemoteGreenstoneServer.downloadCollectionArchives(col_name);
+            Gatherer.remoteGreenstoneServer.downloadCollectionArchives(col_name);
 
             if (progress!=null) {
@@ -428 +428 @@
             // Only need to download build.cfg file
             File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg");
-            RemoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
             }else{
             // Only need to download buildConfig.xml file
             File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml");
-            RemoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
             }