Changeset 21859 for other-projects/gs3-webservices-java-client

Timestamp:

2010-04-01T17:10:36+13:00 (14 years ago)

Author:

ak19

Message:

Overriding init() method to work with recently modified (previously unused) additional constructor.

File:

• other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (2 diffs)

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java

@@ -70 +70 @@
     private static final Logger LOG = Logger.getLogger(
             FedoraGS3Connection.class.getName());
-        
+    
+    /** Default name of Fedora index */
+    private static final String DEFAULT_FEDORA_INDEX = "BasicIndex";
+    
     /** Complete list of services that are supported our FedoraGS3 would  
      * support if everything goes well. If a connection to FedoraGSearch
@@ -214 +217 @@
         // when performing searches for GS3 docs stored in Fedora's repository.
         this.gSearchIndexName = properties.getProperty(
-                "gsearch.indexName", "FedoraIndex"); // default to FedoraIndex
+                "gsearch.indexName", DEFAULT_FEDORA_INDEX); // default to FedoraIndex
         properties.setProperty("gsearch.indexName", this.gSearchIndexName);
         // Create a connection to FedoraGSearch's web services:
         initSearchFunctionality();
     }
+    
+    /** Overridden init method to work with the 5 argument constructor, so that we can
+     * bypass using setInitialisationProperties() which works with a Properties map.
+    */
+    protected void init(String protocol, String host, String port, 
+            String fedoraServerUsername, String fedoraServerPassword) 
+        throws ParserConfigurationException, MalformedURLException, 
+            AuthenticationFailedException, RemoteException, Exception
+    {
+        super.init(protocol, host, port, fedoraServerUsername, fedoraServerPassword);
+        this.gSearchWSDLSuffix = "gsearch/services/FgsOperations?wsdl";
+        this.gSearchWSDLURL = this.baseURL + this.gSearchWSDLSuffix;
+        this.gSearchIndexName = DEFAULT_FEDORA_INDEX;
+        initSearchFunctionality();
+    }    
+
 
     /** Init method that instantiates a GSearchConnection object used