From 8a00f611c5de9a64707e7a99f0bd0a89659831a0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sat, 2 Oct 2010 17:12:04 +0000
Subject: [PATCH] Updated license comment, changed VNCClient -> GuacamoleClient

---
 .../web-client/doc/example/guacamole.xml      | 54 ++-----------------
 guacamole/web-client/web/WEB-INF/web.xml      |  2 +-
 guacamole/web-client/web/guacamole.css        |  2 +-
 guacamole/web-client/web/index.html           |  4 +-
 .../web-client/web/javascript/guacamole.js    |  6 +--
 .../web-client/web/javascript/keyboard.js     |  2 +-
 guacamole/web-client/web/javascript/keymap.js |  2 +-
 guacamole/web-client/web/javascript/layer.js  |  2 +-
 .../web-client/web/javascript/message.js      |  2 +-
 guacamole/web-client/web/javascript/mouse.js  |  2 +-
 .../web-client/web/javascript/oskeyboard.js   |  2 +-
 guacamole/web-client/web/keyboard.css         |  2 +-
 .../web-client/web/layouts/en-us-qwerty.xml   |  2 +-
 13 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/guacamole/web-client/doc/example/guacamole.xml b/guacamole/web-client/doc/example/guacamole.xml
index 1c005f4da..7499ca2ff 100644
--- a/guacamole/web-client/doc/example/guacamole.xml
+++ b/guacamole/web-client/doc/example/guacamole.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Guacamole - Pure JavaScript/HTML VNC Client
+    Guacamole - Clientless Remote Desktop
     Copyright (C) 2010  Michael Jumper
 
     This program is free software: you can redistribute it and/or modify
@@ -20,55 +20,9 @@
 
 <Context antiJARLocking="true" path="/guacamole" docBase="/var/lib/guacamole/guacamole.war">
 
-    <!-- Change the lines below to match your VNC server -->
-    <Parameter name="host" value="localhost"/>
-    <Parameter name="port" value="5900"/>
-
-
-    <!-- Password (VNC Authentication)
-
-         Uncomment and change the line below if your VNC server is
-         password protected. -->
-
-    <!--
-    <Parameter name="password" value="PASSWORD"/>
-    -->
-
-
-    <!-- Bits-per-pixel
-
-         This parameter controls what color depth should be
-         requested from the VNC server.
-
-         Valid values are "8", "16", or "24". -->
-
-    <!--
-    <Parameter name="bpp" value="24"/>
-    -->
-
-
-    <!-- Output (to web client) bits-per-pixel.
-
-         This parameter controls what color depth will be used
-         in the images sent to the web-based client.
-
-         Valid values are "8" or "24". -->
-
-    <!--
-    <Parameter name="output-bpp" value="24"/>
-    -->
-
-
-    <!-- Swap red and blue components. Some VNC servers may not honor
-         the client's request for certain pixel formats, instead
-         returning RGB as BGR.
-
-         If colors look strange (blues look red or brown) when using
-         Guacamole, uncomment and set this parameter to true. -->
-
-    <!--
-    <Parameter name="swap-red-blue" value="false"/>
-    -->
+    <!-- Change the lines below to match your Guacamole proxy -->
+    <Parameter name="hostname" value="localhost"/>
+    <Parameter name="port" value="1234"/>
 
     <Realm className="org.apache.catalina.realm.MemoryRealm" pathname="conf/guacamole-users.xml"/>
 </Context>
diff --git a/guacamole/web-client/web/WEB-INF/web.xml b/guacamole/web-client/web/WEB-INF/web.xml
index c61e6b842..147eb1462 100644
--- a/guacamole/web-client/web/WEB-INF/web.xml
+++ b/guacamole/web-client/web/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Guacamole - Pure JavaScript/HTML VNC Client
+    Guacamole - Clientless Remote Desktop
     Copyright (C) 2010  Michael Jumper
 
     This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/guacamole.css b/guacamole/web-client/web/guacamole.css
index 2ce139d6c..274435511 100644
--- a/guacamole/web-client/web/guacamole.css
+++ b/guacamole/web-client/web/guacamole.css
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/index.html b/guacamole/web-client/web/index.html
index 733e67af1..8530d5734 100644
--- a/guacamole/web-client/web/index.html
+++ b/guacamole/web-client/web/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 
 <!--
-    Guacamole - Pure JavaScript/HTML VNC Client
+    Guacamole - Clientless Remote Desktop
     Copyright (C) 2010  Michael Jumper
 
     This program is free software: you can redistribute it and/or modify
@@ -99,7 +99,7 @@
             window.onresize();
 
             // Instantiate client
-            var vncClient = new VNCClient(display);
+            var vncClient = new GuacamoleClient(display);
 
             var state = document.getElementById("state");
             vncClient.setOnStateChangeHandler(function(clientState) {
diff --git a/guacamole/web-client/web/javascript/guacamole.js b/guacamole/web-client/web/javascript/guacamole.js
index f82fa58e6..58800dc7c 100644
--- a/guacamole/web-client/web/javascript/guacamole.js
+++ b/guacamole/web-client/web/javascript/guacamole.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-function VNCClient(display) {
+function GuacamoleClient(display) {
 
     var STATE_IDLE          = 0;
     var STATE_CONNECTING    = 1;
@@ -445,7 +445,7 @@ function VNCClient(display) {
         },
 
         "name": function(parameters) {
-            document.title = "Guacamole (" + unescapeGuacamoleString(parameters[0]) + ")";
+            document.title = unescapeGuacamoleString(parameters[0]);
         },
 
         "clipboard": function(parameters) {
diff --git a/guacamole/web-client/web/javascript/keyboard.js b/guacamole/web-client/web/javascript/keyboard.js
index dee702ef3..b5e6e935c 100644
--- a/guacamole/web-client/web/javascript/keyboard.js
+++ b/guacamole/web-client/web/javascript/keyboard.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/javascript/keymap.js b/guacamole/web-client/web/javascript/keymap.js
index 22f49992e..016bf5939 100644
--- a/guacamole/web-client/web/javascript/keymap.js
+++ b/guacamole/web-client/web/javascript/keymap.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/javascript/layer.js b/guacamole/web-client/web/javascript/layer.js
index 2074010e7..79080fe15 100644
--- a/guacamole/web-client/web/javascript/layer.js
+++ b/guacamole/web-client/web/javascript/layer.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/javascript/message.js b/guacamole/web-client/web/javascript/message.js
index c573109c8..bafbb447d 100644
--- a/guacamole/web-client/web/javascript/message.js
+++ b/guacamole/web-client/web/javascript/message.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/javascript/mouse.js b/guacamole/web-client/web/javascript/mouse.js
index c9e86633a..3a1234a0d 100644
--- a/guacamole/web-client/web/javascript/mouse.js
+++ b/guacamole/web-client/web/javascript/mouse.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/javascript/oskeyboard.js b/guacamole/web-client/web/javascript/oskeyboard.js
index 21f1df13e..872bac223 100644
--- a/guacamole/web-client/web/javascript/oskeyboard.js
+++ b/guacamole/web-client/web/javascript/oskeyboard.js
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/keyboard.css b/guacamole/web-client/web/keyboard.css
index a4131d197..690c14fb5 100644
--- a/guacamole/web-client/web/keyboard.css
+++ b/guacamole/web-client/web/keyboard.css
@@ -1,6 +1,6 @@
 
 /*
- *  Guacamole - Pure JavaScript/HTML VNC Client
+ *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/guacamole/web-client/web/layouts/en-us-qwerty.xml b/guacamole/web-client/web/layouts/en-us-qwerty.xml
index 7f3cbced1..2223de996 100644
--- a/guacamole/web-client/web/layouts/en-us-qwerty.xml
+++ b/guacamole/web-client/web/layouts/en-us-qwerty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Guacamole - Pure JavaScript/HTML VNC Client
+    Guacamole - Clientless Remote Desktop
     Copyright (C) 2010  Michael Jumper
 
     This program is free software: you can redistribute it and/or modify