From 50355ab3538ec83ae3cbad32a6065a18a08a8f04 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Tue, 21 Sep 2010 19:58:13 +0000
Subject: [PATCH] Hostname/port configuration options

---
 .../guacamole/net/GuacamoleConfiguration.java | 29 +++++--------------
 .../guacamole/net/GuacamoleSession.java       |  4 +--
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
index 02b588f10..b357bb57c 100644
--- a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
+++ b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
@@ -24,36 +24,23 @@ import net.sourceforge.guacamole.GuacamoleException;
 
 public class GuacamoleConfiguration extends Configuration {
 
-    private String password;
-    private int outputBPP;
-    private boolean compressStream;
-    private boolean swapRedAndBlue;
+    private String hostname;
+    private int port;
 
     public GuacamoleConfiguration(ServletContext context) throws GuacamoleException {
 
         super(context);
 
-        password       = context.getInitParameter("password");
-        outputBPP      = readIntParameter("output-bpp", 8, 8, 24);
-        compressStream = readBooleanParameter("compress-stream", false);
-        swapRedAndBlue = readBooleanParameter("swap-red-blue", false);
+        hostname       = context.getInitParameter("hostname");
+        port           = readIntParameter("port", null);
 
     }
 
-    public int getOutputBPP() {
-        return outputBPP;
+    public int getPort() {
+        return port;
     }
 
-    public String getPassword() {
-        return password;
+    public String getHostname() {
+        return hostname;
     }
-
-    public boolean getCompressStream() {
-        return compressStream;
-    }
-
-    public boolean getSwapRedAndBlue() {
-        return swapRedAndBlue;
-    }
-
 }
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
index 681b455e7..d00f4037a 100644
--- a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
+++ b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
@@ -98,8 +98,8 @@ public class GuacamoleSession {
 
             client = new SessionClient(
                     new GuacamoleClient (
-                        "localhost", // Temporarily hard coded
-                        1234
+                        config.getHostname(),
+                        config.getPort()
                     )
             );