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

Timestamp:

2012-10-04T18:33:06+13:00 (12 years ago)

Author:

ak19

Message:

GSearch works again with the latest version of Fedora and FedoraGSearch (3.6.1 and 2.5 respectively).

Location:

other-projects/gs3-webservices-java-client/trunk

Files:

• lib/fedoraGS3.jar (modified) ( previous)
• src/GS3Fedora/org/greenstone/fedora/services/FedoraConnection.java (modified) (2 diffs)
• src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (6 diffs)
• src/GS3Fedora/org/greenstone/fedora/services/GSearchConnection.java (modified) (4 diffs)

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

@@ -95 +95 @@
         protected static final String SUPPORTED_VERSION = "3.3"; //"2.2.1";
                                      // 3.3 works with genericSearch version 2.2
+                                     // 3.6.1 works with genericSearch version 2.5
 
     /* Some fixed strings of known literals */
@@ -545 +546 @@
                 "default", isUserSpecifiedPortAddressSuffix);
         }
-        
     }
     

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

@@ -50 +50 @@
 import java.io.IOException;
 import javax.net.ssl.SSLHandshakeException;
+import java.net.Authenticator;
 import java.net.ConnectException;
 import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
 import java.rmi.RemoteException;
 import javax.xml.parsers.ParserConfigurationException;
@@ -73 +75 @@
     
     /** 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
+    private static final String DEFAULT_FEDORA_INDEX = "FgsIndex"; //"BasicIndex" for older versions of GSearch
+    
+    /** Complete list of services that our FedoraGS3 would support
+     * if everything goes well. If a connection to FedoraGSearch
      * cannot be established, the query services will no longer be
      * available. The actual services supported are given by member
@@ -182 +184 @@
      * - name of the index into which the GS3 documents have been indexed 
      * and which FedoraGenericSearch should use to perform searches. If none is
-     * given in the properties file, then the index name defaults to "FedoraIndex".
+     * given in the properties file, then the index name defaults to "FgsIndex" 
+     * (no longer BasicIndex  or FedoraIndex).
      * @param properties is the Properties Map loaded from a properties file
      * (if there was any) which specifies such things as host and port of the
@@ -220 +223 @@
     */
     protected void init(String protocol, String host, String port, 
-            String fedoraServerUsername, String fedoraServerPassword) 
+            final String fedoraServerUsername, final String fedoraServerPassword) 
         throws ParserConfigurationException, MalformedURLException, 
             AuthenticationFailedException, RemoteException, Exception
@@ -228 +231 @@
         this.gSearchWSDLURL = this.baseURL + this.gSearchWSDLSuffix;
         this.gSearchIndexName = DEFAULT_FEDORA_INDEX;
+        
+        // Now need to set username and password for accessing WSDL (after GSearch 2.2)
+        // http://stackoverflow.com/questions/3037221/401-error-when-consuming-a-web-service-with-http-basic-authentication-using-cxf
+        
+        // The java.net.Authenticator can be used to send user credentials when needed.
+        Authenticator.setDefault(new Authenticator() {
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication() {
+            return new PasswordAuthentication(
+                              fedoraServerUsername,
+                              fedoraServerPassword.toCharArray());
+            }
+        });
+        
         initSearchFunctionality();
     }    
@@ -246 +263 @@
         } catch(Exception e){
             LOG.error("Cannot connect to FedoraGSearch's web services at "
-                + gSearchWSDLURL + "\nQuery services will not be available.");
+                  + gSearchWSDLURL + "\nQuery services will not be available.", e);
+            // Exception, e, as parameter prints the stacktrace of the exception to the log
+
             // If an exception occurs, something has gone wrong when
             // trying to connect to FedoraGSearch's web services. This

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

@@ -92 +92 @@
     /** A DocumentBuilder object used to construct and parse XML */
     protected final DocumentBuilder builder;
-    
 
     
@@ -138 +137 @@
         builder = factory.newDocumentBuilder(); // to create XML docs
     }
-        
-    
+
     /**
      * Method to invoke gfindObjects operation of Fedora Generic Search
@@ -210 +208 @@
         // for debugging
         //javax.swing.JOptionPane.showMessageDialog(null, "GSearchConnection.gFindObjects:" + valueFound);
-            
+        
         return valueFound;
     }
@@ -292 +290 @@
         // and put quotes around phrases, then combine all the terms
         // together again with spaces to separate them.
-        allfields = formatSearchTermsInField(allfields, ALL_FIELDS); 
+        allfields = formatSearchTermsInField(allfields, ALL_FIELDS); // search foxml.all.text
             // ALL_FIELDS has no field name
         titles = formatSearchTermsInField(titles, DC_TITLE_FIELD);