Changeset 13947

Timestamp:

2007-02-26T11:46:27+13:00 (17 years ago)

Author:

kjdon

Message:

allow specification of full package name for serviceRacks in buildConfig.xml - custom ones may not be in org.greenstone.gsdl3.service package

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -274 +274 @@
         String servicetype = n.getAttribute(GSXML.NAME_ATT);
         
+        ServiceRack s = null;
+        
         try {
-        ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+servicetype).newInstance();
-
-        s.setSiteHome(this.site_home);
-        s.setSiteAddress(this.site_http_address);
-        s.setClusterName(this.cluster_name);
-        s.setMessageRouter(this.router);
-        // pass the xml node to the service for configuration
-        if (s.configure(n, extra_info)) {
-            
-            // find out the supported service types for this service module
-            Node types = s.process(message);
-            NodeList typenodes = ((Element)types).getElementsByTagName(GSXML.SERVICE_ELEM);    
-            
-            for (int j=0; j<typenodes.getLength();j++) {
-            String service = ((Element) typenodes.item(j)).getAttribute(GSXML.NAME_ATT);       
-            if (service_map.get(service)!=null) {
-                char extra = '0';
-                String new_service = service+extra;    
-
-                while (service_map.get(new_service)!=null) {
-                extra++;
-                new_service = service+extra;
-                }
-                this.service_name_map.put(new_service, service);
-                service=new_service;
-                ((Element) typenodes.item(j)).setAttribute(GSXML.NAME_ATT, service);
+        // try for a default service in standard package
+        s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+servicetype).newInstance();
+        
+        } catch (Exception e) {}
+        if (s == null) {
+        try {
+            // name as is, in case package is already specified
+            s = (ServiceRack)Class.forName(servicetype).newInstance();
+        } catch (Exception e) {}
+        }
+
+        if (s == null) {
+        logger.error("Couldn't get an instance of class "+servicetype+", or org.greenstone.gsdl3.service."+servicetype);
+        continue;
+        }
+
+        
+        s.setSiteHome(this.site_home);
+        s.setSiteAddress(this.site_http_address);
+        s.setClusterName(this.cluster_name);
+        s.setMessageRouter(this.router);
+        // pass the xml node to the service for configuration
+        if (s.configure(n, extra_info)) {
+        
+        // find out the supported service types for this service module
+        Node types = s.process(message);
+        NodeList typenodes = ((Element)types).getElementsByTagName(GSXML.SERVICE_ELEM);    
+        
+        for (int j=0; j<typenodes.getLength();j++) {
+            String service = ((Element) typenodes.item(j)).getAttribute(GSXML.NAME_ATT);       
+            if (service_map.get(service)!=null) {
+            char extra = '0';
+            String new_service = service+extra;    
+            
+            while (service_map.get(new_service)!=null) {
+                extra++;
+                new_service = service+extra;
             }
-            this.service_map.put(service, s);
-            // also add info to the ServiceInfo XML element
-            this.service_list.appendChild(this.doc.importNode(typenodes.item(j), true));
+            this.service_name_map.put(new_service, service);
+            service=new_service;
+            ((Element) typenodes.item(j)).setAttribute(GSXML.NAME_ATT, service);
             }
-        }
-        } catch (Exception e) {
-        logger.error("configure exception: couldn't create service module:org.greenstone.gsdl3.service."+servicetype+"\n"+e.getMessage() + e.getClass() );
-        e.printStackTrace();
-        //return false;
-        }
-        
-    }
+            this.service_map.put(service, s);
+            // also add info to the ServiceInfo XML element
+            this.service_list.appendChild(this.doc.importNode(typenodes.item(j), true));
+        }
+        }
+    } 
+    
     return true;