[Opensrf-commits] r1287 - in trunk/src/java/org/opensrf: . util

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-03-19 10:10:08 -0400 (Wed, 19 Mar 2008)
New Revision: 1287

Modified:
   trunk/src/java/org/opensrf/ClientSession.java
   trunk/src/java/org/opensrf/Sys.java
   trunk/src/java/org/opensrf/util/SettingsClient.java
Log:
updated to match new opensrf_core.xml domain layout

Modified: trunk/src/java/org/opensrf/ClientSession.java
===================================================================
--- trunk/src/java/org/opensrf/ClientSession.java	2008-03-18 17:52:43 UTC (rev 1286)
+++ trunk/src/java/org/opensrf/ClientSession.java	2008-03-19 14:10:08 UTC (rev 1287)
@@ -42,7 +42,7 @@
         this.service = service;
 
         /** generate the remote node string */
-        domain = (String) Config.global().getFirst("/domains/domain");
+        domain = (String) Config.global().getFirst("/domain");
         router = Config.global().getString("/router_name");
         setRemoteNode(router + "@" + domain + "/" + service);
         origRemoteNode = getRemoteNode();

Modified: trunk/src/java/org/opensrf/Sys.java
===================================================================
--- trunk/src/java/org/opensrf/Sys.java	2008-03-18 17:52:43 UTC (rev 1286)
+++ trunk/src/java/org/opensrf/Sys.java	2008-03-19 14:10:08 UTC (rev 1287)
@@ -49,7 +49,7 @@
         /** Collect the network connection info from the config */
         String username = config.getString("/username");
         String passwd = config.getString("/passwd");
-        String host = (String) config.getFirst("/domains/domain");
+        String host = (String) config.getFirst("/domain");
         int port = config.getInt("/port");
 
 

Modified: trunk/src/java/org/opensrf/util/SettingsClient.java
===================================================================
--- trunk/src/java/org/opensrf/util/SettingsClient.java	2008-03-18 17:52:43 UTC (rev 1286)
+++ trunk/src/java/org/opensrf/util/SettingsClient.java	2008-03-19 14:10:08 UTC (rev 1287)
@@ -34,7 +34,7 @@
 
             Request req = ses.request(
                 "opensrf.settings.host_config.get", 
-                new String[]{(String)Config.global().getFirst("/domains/domain")});
+                new String[]{(String)Config.global().getFirst("/domain")});
     
             Result res = req.recv(12000);
             if(res == null) {