Changeset 22366 for main

Timestamp:

2010-07-07T16:09:28+12:00 (14 years ago)

Author:

ak19

Message:

Fixed GS3 host and port used for testing connecting to Fedora now replaced with reading these values from global.properties

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

@@ -41 +41 @@
 import java.io.File;
 import java.util.HashMap;
+import java.util.Locale;
+import java.util.Properties;
 import java.util.ResourceBundle;
-import java.util.Locale;
 import java.lang.reflect.Method;
 
@@ -111 +112 @@
         //final File propertiesFile = new File("gs3fedora.properties");
         //fedoraServicesAPIA = new FedoraServicesAPIA(propertiesFile);
-
-        fedoraServicesAPIA = new FedoraServicesAPIA("http", "localhost", 8383, "fedoraIntCallUser", "changeme");//"fedoraAdmin", "pounamu"
+        
+        // Defaults. Read host and port from global.properties
+        Properties globalProperties = new Properties();
+        globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties"));
+        String host = globalProperties.getProperty("tomcat.server", "localhost");
+        String port = globalProperties.getProperty("tomcat.port", "8383");
+        String protocol = "http";
+        String username = "fedoraIntCallUser"; //"fedoraAdmin"
+        String password = "changeme"; //"pounamu"
+
+        fedoraServicesAPIA = new FedoraServicesAPIA(protocol, host, Integer.parseInt(port), username, password); //"fedoraAdmin", "pounamu"
     } catch(org.greenstone.fedora.services.FedoraGS3Exception.CancelledException e) {
         // The user pressed cancel in the fedora services instantiation dlg