From: erickson Date: Wed, 19 Mar 2008 14:10:08 +0000 (+0000) Subject: updated to match new opensrf_core.xml domain layout X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fb4bda0747f12868691631eec922516a26528dad;p=working%2FOpenSRF.git updated to match new opensrf_core.xml domain layout git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1287 9efc2488-bf62-4759-914b-345cdb29e865 --- diff --git a/src/java/org/opensrf/ClientSession.java b/src/java/org/opensrf/ClientSession.java index bc3b8e2..385fdbf 100644 --- a/src/java/org/opensrf/ClientSession.java +++ b/src/java/org/opensrf/ClientSession.java @@ -42,7 +42,7 @@ public class ClientSession extends Session { 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(); diff --git a/src/java/org/opensrf/Sys.java b/src/java/org/opensrf/Sys.java index 77cf4f7..d65f8a4 100644 --- a/src/java/org/opensrf/Sys.java +++ b/src/java/org/opensrf/Sys.java @@ -49,7 +49,7 @@ public class Sys { /** 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"); diff --git a/src/java/org/opensrf/util/SettingsClient.java b/src/java/org/opensrf/util/SettingsClient.java index cd70ebb..71e570a 100644 --- a/src/java/org/opensrf/util/SettingsClient.java +++ b/src/java/org/opensrf/util/SettingsClient.java @@ -34,7 +34,7 @@ public class SettingsClient extends Config { 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) {