Changeset 9824

Timestamp:

2005-05-05T15:55:27+12:00 (19 years ago)

Author:

kjdon

Message:

when a collection (using gdbm) is opened by tomcat, windows holds a lock on the gdbm file, so you can't rebuild it. modified ModuleInterface to have a cleanUp method, so all modules need to implement this. for mg/mgpp and gdbm modules, they now unload the index data or close the connection to the database. so cleanUp should be called whenever you deactivate a module

Location:

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3

Files:

• collection/ServiceCluster.java (modified) (2 diffs)
• comms/Communicator.java (modified) (1 diff)
• core/MessageRouter.java (modified) (2 diffs)
• core/ModuleInterface.java (modified) (1 diff)
• core/Receptionist.java (modified) (1 diff)
• service/AbstractGS2DocumentRetrieve.java (modified) (1 diff)
• service/AbstractGS3DocumentRetrieve.java (modified) (1 diff)
• service/AbstractMGPPSearch.java (modified) (1 diff)
• service/AbstractMGSearch.java (modified) (1 diff)
• service/GS2Browse.java (modified) (1 diff)
• service/GS2MGPPRetrieve.java (modified) (1 diff)
• service/GS2MGPPSearch.java (modified) (1 diff)
• service/GS2MGRetrieve.java (modified) (1 diff)
• service/GS2MGSearch.java (modified) (1 diff)
• service/GS3Browse.java (modified) (1 diff)
• service/GS3MGPPRetrieve.java (modified) (1 diff)
• service/GS3MGPPSearch.java (modified) (1 diff)
• service/GS3MGRetrieve.java (modified) (1 diff)
• service/GS3MGSearch.java (modified) (1 diff)
• service/ModuleWrapper.java (modified) (1 diff)
• service/PhindPhraseBrowse.java (modified) (1 diff)
• service/ServiceRack.java (modified) (1 diff)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -34 +34 @@
 import java.io.File;
 import java.util.HashMap;
+import java.util.Iterator;
 
 /* ServiceCluster - a groups of services that are related in some way
@@ -91 +92 @@
     }
 
+    public void cleanUp() {
+    Iterator i = this.service_map.values().iterator();
+    while (i.hasNext()) {
+        ServiceRack s = (ServiceRack)i.next();
+        s.cleanUp();
+    }
+    }
     public void setClusterName(String name) {
     this.cluster_name = name;   

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/comms/Communicator.java

@@ -48 +48 @@
     converter_ = new XMLConverter();
     }
+    public void cleanUp() {}
 
     public void setLocalSiteName(String name) {

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -98 +98 @@
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
-    
-    
-    }
-
+    }
+
+    public void cleanUp() {
+    if (this.module_map != null) {
+        Iterator i = this.module_map.values().iterator();
+        while (i.hasNext()) {
+        ((ModuleInterface)i.next()).cleanUp();
+        }
+    }
+    }
     /** site_home must be set before configure called */
     public void setSiteHome(String home) {
@@ -807 +813 @@
 
         System.out.println("MessageRouter: deactivating "+name);
-        this.module_map.remove(name);
-
+        ModuleInterface m = (ModuleInterface)this.module_map.remove(name);
+        m.cleanUp(); // clean up any open files/connections etc - can cause trouble on windows
         // also remove the xml bit from description list
         if (type.equals(GSXML.COLLECTION_ELEM)) {

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/core/ModuleInterface.java

@@ -52 +52 @@
    */
     abstract public Element process(Element xml_in);
+
+    /** 
+     * Do any clean up necessary for deactivating the module, eg
+     * close any open file handles (gdbm in particular) or windows
+     * holds locks on them.
+     */
+    abstract public void cleanUp();
 }    
                                                                            

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -50 +50 @@
     }
     
+    public void cleanUp() {}
     public void setParams(GSParams params) {
     this.params = params;

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -67 +67 @@
     }
 
-
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }
     /** configure this service */
     public boolean configure(Element info, Element extra_info)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS3DocumentRetrieve.java

@@ -63 +63 @@
     // set up a macro resolver
     }
-
+    
+    public void cleanUp() {
+    super.cleanUp();
+    this.database.closeConnection();
+    }
 
     /** configure this service */

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGPPSearch.java

@@ -112 +112 @@
     {
     this.mgpp_src = new MGPPWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGSearch.java

@@ -77 +77 @@
     }
 
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
+    }
     public boolean configure(Element info, Element extra_info)
     {

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

@@ -56 +56 @@
     }
 
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }
+
     public boolean configure(Element info, Element extra_info)
     {

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

@@ -48 +48 @@
     public GS2MGPPRetrieve() {
     this.mgpp_src = new MGPPWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -42 +42 @@
     {
     this.gdbm_src = new GDBMWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

@@ -45 +45 @@
     public GS2MGRetrieve() {
     this.mg_src = new MGWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

@@ -42 +42 @@
     {
     this.gdbm_src = new GDBMWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS3Browse.java

@@ -52 +52 @@
     }
 
+    public void cleanUp() {
+    super.cleanUp();
+    this.database.closeConnection();
+    }
+    
     public boolean configure(Element info, Element extra_info)
     {

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGPPRetrieve.java

@@ -46 +46 @@
     public GS3MGPPRetrieve() {
     this.mgpp_src = new MGPPWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGPPSearch.java

@@ -50 +50 @@
     {
     this.database = new SQLQuery();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.database.closeConnection();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGRetrieve.java

@@ -43 +43 @@
     private String mg_textdir = null;
     private String default_index = null;
+    
     public GS3MGRetrieve() {
     this.mg_src = new MGWrapper();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGSearch.java

@@ -50 +50 @@
     {
     this.database = new SQLQuery();
+    }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.database.closeConnection();
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/ModuleWrapper.java

@@ -100 +100 @@
 
   }
+  
+  public void cleanUp() {}
+  
   /** The all-args constructor */
   public ModuleWrapper(String in,String out, ModuleInterface inner){

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -56 +56 @@
     this.mgpp_src.setCase(true);
     }
+
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
+    }
+
     /** configure the service module
      *

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -95 +95 @@
     setClusterName(coll_name);
     }
+
+    public void cleanUp() {}
     
     /** sets the site home */