From 7341826547c2980aa0c470df8565d895af37787f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 8 Dec 2010 13:14:04 -0800 Subject: [PATCH] More renaming --- guacamole/{native => server}/guacd/.gitignore | 0 guacamole/{native => server}/guacd/AUTHORS | 0 guacamole/{java => server/guacd}/COPYING | 0 guacamole/{native => server}/guacd/ChangeLog | 0 guacamole/{native => server}/guacd/INSTALL | 0 guacamole/{native => server}/guacd/Makefile.am | 0 guacamole/{native => server}/guacd/NEWS | 0 guacamole/{native => server}/guacd/README | 0 guacamole/{native => server}/guacd/configure.in | 0 guacamole/{native => server}/guacd/src/daemon.c | 0 .../{native => server}/libguac-clients/vnc/AUTHORS | 0 .../guacd => server/libguac-clients/vnc}/COPYING | 0 .../libguac-clients/vnc/ChangeLog | 0 .../{native => server}/libguac-clients/vnc/INSTALL | 0 .../libguac-clients/vnc/Makefile.am | 0 .../{native => server}/libguac-clients/vnc/NEWS | 0 .../{native => server}/libguac-clients/vnc/README | 0 .../libguac-clients/vnc/configure.in | 0 .../libguac-clients/vnc/src/vnc_client.c | 0 guacamole/{native => server}/libguac/AUTHORS | 0 .../libguac-clients/vnc => server/libguac}/COPYING | 0 guacamole/{native => server}/libguac/ChangeLog | 0 guacamole/{native => server}/libguac/Doxyfile | 0 guacamole/{native => server}/libguac/INSTALL | 0 guacamole/{native => server}/libguac/Makefile.am | 0 guacamole/{native => server}/libguac/NEWS | 0 guacamole/{native => server}/libguac/README | 0 guacamole/{native => server}/libguac/configure.in | 0 .../{native => server}/libguac/include/client.h | 0 .../{native => server}/libguac/include/guacio.h | 0 .../{native => server}/libguac/include/protocol.h | 0 guacamole/{native => server}/libguac/src/client.c | 0 guacamole/{native => server}/libguac/src/guacio.c | 0 guacamole/{native => server}/libguac/src/protocol.c | 0 guacamole/{java => web}/.gitignore | 0 guacamole/{native/libguac => web}/COPYING | 0 .../{java => web}/doc/example/guacamole.properties | 0 .../{java => web}/doc/example/user-mapping.xml | 0 guacamole/{java => web}/guacamole-common/pom.xml | 0 .../main/java/net/sourceforge/guacamole/Client.java | 0 .../net/sourceforge/guacamole/GuacamoleClient.java | 0 .../sourceforge/guacamole/GuacamoleException.java | 0 .../sourceforge/guacamole/net/Configuration.java | 0 .../guacamole/net/GuacamoleConfiguration.java | 0 .../guacamole/net/GuacamoleProperties.java | 0 .../sourceforge/guacamole/net/GuacamoleServlet.java | 0 .../sourceforge/guacamole/net/GuacamoleSession.java | 0 .../authentication/GuacamoleSessionProvider.java | 0 .../NullGuacamoleSessionProvider.java | 0 .../basic/BasicFileAuthenticationProvider.java | 0 .../basic/BasicGuacamoleSessionProvider.java | 0 .../net/authentication/basic/BasicLogin.java | 0 .../sourceforge/guacamole/net/tunnel/Connect.java | 0 .../sourceforge/guacamole/net/tunnel/Inbound.java | 0 .../sourceforge/guacamole/net/tunnel/Outbound.java | 0 .../{java => web}/guacamole-default-webapp/pom.xml | 0 .../src/main/webapp/META-INF/context.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/agpl-3.0-standalone.html | 0 .../src/main/webapp/guac-web-lib/css/guacamole.css | 0 .../main/webapp/guac-web-lib/images/mouse/blank.cur | Bin .../main/webapp/guac-web-lib/images/mouse/blank.gif | Bin .../main/webapp/guac-web-lib/images/mouse/dot.gif | Bin .../main/webapp/guac-web-lib/images/noimage92.png | Bin .../main/webapp/guac-web-lib/images/spinner92.gif | Bin .../webapp/guac-web-lib/javascript/guacamole.js | 0 .../main/webapp/guac-web-lib/javascript/keyboard.js | 0 .../main/webapp/guac-web-lib/javascript/keymap.js | 0 .../main/webapp/guac-web-lib/javascript/layer.js | 0 .../main/webapp/guac-web-lib/javascript/mouse.js | 0 .../webapp/guac-web-lib/javascript/oskeyboard.js | 0 .../src/main/webapp/guacamole.css | 0 .../src/main/webapp/images/agpl-logo.png | Bin .../src/main/webapp/images/checker.png | Bin .../src/main/webapp/images/guacamole-64-icon.png | Bin .../src/main/webapp/images/guacamole-icon-64.png | Bin .../src/main/webapp/images/guacamole-logo.png | Bin .../src/main/webapp/images/login-logo.png | Bin .../src/main/webapp/images/noguacamole-logo.png | Bin .../src/main/webapp/index.html | 0 .../src/main/webapp/keyboard.css | 0 .../src/main/webapp/layouts/en-us-qwerty.xml | 0 82 files changed, 0 insertions(+), 0 deletions(-) rename guacamole/{native => server}/guacd/.gitignore (100%) rename guacamole/{native => server}/guacd/AUTHORS (100%) rename guacamole/{java => server/guacd}/COPYING (100%) rename guacamole/{native => server}/guacd/ChangeLog (100%) rename guacamole/{native => server}/guacd/INSTALL (100%) rename guacamole/{native => server}/guacd/Makefile.am (100%) rename guacamole/{native => server}/guacd/NEWS (100%) rename guacamole/{native => server}/guacd/README (100%) rename guacamole/{native => server}/guacd/configure.in (100%) rename guacamole/{native => server}/guacd/src/daemon.c (100%) rename guacamole/{native => server}/libguac-clients/vnc/AUTHORS (100%) rename guacamole/{native/guacd => server/libguac-clients/vnc}/COPYING (100%) rename guacamole/{native => server}/libguac-clients/vnc/ChangeLog (100%) rename guacamole/{native => server}/libguac-clients/vnc/INSTALL (100%) rename guacamole/{native => server}/libguac-clients/vnc/Makefile.am (100%) rename guacamole/{native => server}/libguac-clients/vnc/NEWS (100%) rename guacamole/{native => server}/libguac-clients/vnc/README (100%) rename guacamole/{native => server}/libguac-clients/vnc/configure.in (100%) rename guacamole/{native => server}/libguac-clients/vnc/src/vnc_client.c (100%) rename guacamole/{native => server}/libguac/AUTHORS (100%) rename guacamole/{native/libguac-clients/vnc => server/libguac}/COPYING (100%) rename guacamole/{native => server}/libguac/ChangeLog (100%) rename guacamole/{native => server}/libguac/Doxyfile (100%) rename guacamole/{native => server}/libguac/INSTALL (100%) rename guacamole/{native => server}/libguac/Makefile.am (100%) rename guacamole/{native => server}/libguac/NEWS (100%) rename guacamole/{native => server}/libguac/README (100%) rename guacamole/{native => server}/libguac/configure.in (100%) rename guacamole/{native => server}/libguac/include/client.h (100%) rename guacamole/{native => server}/libguac/include/guacio.h (100%) rename guacamole/{native => server}/libguac/include/protocol.h (100%) rename guacamole/{native => server}/libguac/src/client.c (100%) rename guacamole/{native => server}/libguac/src/guacio.c (100%) rename guacamole/{native => server}/libguac/src/protocol.c (100%) rename guacamole/{java => web}/.gitignore (100%) rename guacamole/{native/libguac => web}/COPYING (100%) rename guacamole/{java => web}/doc/example/guacamole.properties (100%) rename guacamole/{java => web}/doc/example/user-mapping.xml (100%) rename guacamole/{java => web}/guacamole-common/pom.xml (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java (100%) rename guacamole/{java => web}/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java (100%) rename guacamole/{java => web}/guacamole-default-webapp/pom.xml (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/META-INF/context.xml (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/guacamole.css (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/checker.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/login-logo.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/index.html (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/keyboard.css (100%) rename guacamole/{java => web}/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml (100%) diff --git a/guacamole/native/guacd/.gitignore b/guacamole/server/guacd/.gitignore similarity index 100% rename from guacamole/native/guacd/.gitignore rename to guacamole/server/guacd/.gitignore diff --git a/guacamole/native/guacd/AUTHORS b/guacamole/server/guacd/AUTHORS similarity index 100% rename from guacamole/native/guacd/AUTHORS rename to guacamole/server/guacd/AUTHORS diff --git a/guacamole/java/COPYING b/guacamole/server/guacd/COPYING similarity index 100% rename from guacamole/java/COPYING rename to guacamole/server/guacd/COPYING diff --git a/guacamole/native/guacd/ChangeLog b/guacamole/server/guacd/ChangeLog similarity index 100% rename from guacamole/native/guacd/ChangeLog rename to guacamole/server/guacd/ChangeLog diff --git a/guacamole/native/guacd/INSTALL b/guacamole/server/guacd/INSTALL similarity index 100% rename from guacamole/native/guacd/INSTALL rename to guacamole/server/guacd/INSTALL diff --git a/guacamole/native/guacd/Makefile.am b/guacamole/server/guacd/Makefile.am similarity index 100% rename from guacamole/native/guacd/Makefile.am rename to guacamole/server/guacd/Makefile.am diff --git a/guacamole/native/guacd/NEWS b/guacamole/server/guacd/NEWS similarity index 100% rename from guacamole/native/guacd/NEWS rename to guacamole/server/guacd/NEWS diff --git a/guacamole/native/guacd/README b/guacamole/server/guacd/README similarity index 100% rename from guacamole/native/guacd/README rename to guacamole/server/guacd/README diff --git a/guacamole/native/guacd/configure.in b/guacamole/server/guacd/configure.in similarity index 100% rename from guacamole/native/guacd/configure.in rename to guacamole/server/guacd/configure.in diff --git a/guacamole/native/guacd/src/daemon.c b/guacamole/server/guacd/src/daemon.c similarity index 100% rename from guacamole/native/guacd/src/daemon.c rename to guacamole/server/guacd/src/daemon.c diff --git a/guacamole/native/libguac-clients/vnc/AUTHORS b/guacamole/server/libguac-clients/vnc/AUTHORS similarity index 100% rename from guacamole/native/libguac-clients/vnc/AUTHORS rename to guacamole/server/libguac-clients/vnc/AUTHORS diff --git a/guacamole/native/guacd/COPYING b/guacamole/server/libguac-clients/vnc/COPYING similarity index 100% rename from guacamole/native/guacd/COPYING rename to guacamole/server/libguac-clients/vnc/COPYING diff --git a/guacamole/native/libguac-clients/vnc/ChangeLog b/guacamole/server/libguac-clients/vnc/ChangeLog similarity index 100% rename from guacamole/native/libguac-clients/vnc/ChangeLog rename to guacamole/server/libguac-clients/vnc/ChangeLog diff --git a/guacamole/native/libguac-clients/vnc/INSTALL b/guacamole/server/libguac-clients/vnc/INSTALL similarity index 100% rename from guacamole/native/libguac-clients/vnc/INSTALL rename to guacamole/server/libguac-clients/vnc/INSTALL diff --git a/guacamole/native/libguac-clients/vnc/Makefile.am b/guacamole/server/libguac-clients/vnc/Makefile.am similarity index 100% rename from guacamole/native/libguac-clients/vnc/Makefile.am rename to guacamole/server/libguac-clients/vnc/Makefile.am diff --git a/guacamole/native/libguac-clients/vnc/NEWS b/guacamole/server/libguac-clients/vnc/NEWS similarity index 100% rename from guacamole/native/libguac-clients/vnc/NEWS rename to guacamole/server/libguac-clients/vnc/NEWS diff --git a/guacamole/native/libguac-clients/vnc/README b/guacamole/server/libguac-clients/vnc/README similarity index 100% rename from guacamole/native/libguac-clients/vnc/README rename to guacamole/server/libguac-clients/vnc/README diff --git a/guacamole/native/libguac-clients/vnc/configure.in b/guacamole/server/libguac-clients/vnc/configure.in similarity index 100% rename from guacamole/native/libguac-clients/vnc/configure.in rename to guacamole/server/libguac-clients/vnc/configure.in diff --git a/guacamole/native/libguac-clients/vnc/src/vnc_client.c b/guacamole/server/libguac-clients/vnc/src/vnc_client.c similarity index 100% rename from guacamole/native/libguac-clients/vnc/src/vnc_client.c rename to guacamole/server/libguac-clients/vnc/src/vnc_client.c diff --git a/guacamole/native/libguac/AUTHORS b/guacamole/server/libguac/AUTHORS similarity index 100% rename from guacamole/native/libguac/AUTHORS rename to guacamole/server/libguac/AUTHORS diff --git a/guacamole/native/libguac-clients/vnc/COPYING b/guacamole/server/libguac/COPYING similarity index 100% rename from guacamole/native/libguac-clients/vnc/COPYING rename to guacamole/server/libguac/COPYING diff --git a/guacamole/native/libguac/ChangeLog b/guacamole/server/libguac/ChangeLog similarity index 100% rename from guacamole/native/libguac/ChangeLog rename to guacamole/server/libguac/ChangeLog diff --git a/guacamole/native/libguac/Doxyfile b/guacamole/server/libguac/Doxyfile similarity index 100% rename from guacamole/native/libguac/Doxyfile rename to guacamole/server/libguac/Doxyfile diff --git a/guacamole/native/libguac/INSTALL b/guacamole/server/libguac/INSTALL similarity index 100% rename from guacamole/native/libguac/INSTALL rename to guacamole/server/libguac/INSTALL diff --git a/guacamole/native/libguac/Makefile.am b/guacamole/server/libguac/Makefile.am similarity index 100% rename from guacamole/native/libguac/Makefile.am rename to guacamole/server/libguac/Makefile.am diff --git a/guacamole/native/libguac/NEWS b/guacamole/server/libguac/NEWS similarity index 100% rename from guacamole/native/libguac/NEWS rename to guacamole/server/libguac/NEWS diff --git a/guacamole/native/libguac/README b/guacamole/server/libguac/README similarity index 100% rename from guacamole/native/libguac/README rename to guacamole/server/libguac/README diff --git a/guacamole/native/libguac/configure.in b/guacamole/server/libguac/configure.in similarity index 100% rename from guacamole/native/libguac/configure.in rename to guacamole/server/libguac/configure.in diff --git a/guacamole/native/libguac/include/client.h b/guacamole/server/libguac/include/client.h similarity index 100% rename from guacamole/native/libguac/include/client.h rename to guacamole/server/libguac/include/client.h diff --git a/guacamole/native/libguac/include/guacio.h b/guacamole/server/libguac/include/guacio.h similarity index 100% rename from guacamole/native/libguac/include/guacio.h rename to guacamole/server/libguac/include/guacio.h diff --git a/guacamole/native/libguac/include/protocol.h b/guacamole/server/libguac/include/protocol.h similarity index 100% rename from guacamole/native/libguac/include/protocol.h rename to guacamole/server/libguac/include/protocol.h diff --git a/guacamole/native/libguac/src/client.c b/guacamole/server/libguac/src/client.c similarity index 100% rename from guacamole/native/libguac/src/client.c rename to guacamole/server/libguac/src/client.c diff --git a/guacamole/native/libguac/src/guacio.c b/guacamole/server/libguac/src/guacio.c similarity index 100% rename from guacamole/native/libguac/src/guacio.c rename to guacamole/server/libguac/src/guacio.c diff --git a/guacamole/native/libguac/src/protocol.c b/guacamole/server/libguac/src/protocol.c similarity index 100% rename from guacamole/native/libguac/src/protocol.c rename to guacamole/server/libguac/src/protocol.c diff --git a/guacamole/java/.gitignore b/guacamole/web/.gitignore similarity index 100% rename from guacamole/java/.gitignore rename to guacamole/web/.gitignore diff --git a/guacamole/native/libguac/COPYING b/guacamole/web/COPYING similarity index 100% rename from guacamole/native/libguac/COPYING rename to guacamole/web/COPYING diff --git a/guacamole/java/doc/example/guacamole.properties b/guacamole/web/doc/example/guacamole.properties similarity index 100% rename from guacamole/java/doc/example/guacamole.properties rename to guacamole/web/doc/example/guacamole.properties diff --git a/guacamole/java/doc/example/user-mapping.xml b/guacamole/web/doc/example/user-mapping.xml similarity index 100% rename from guacamole/java/doc/example/user-mapping.xml rename to guacamole/web/doc/example/user-mapping.xml diff --git a/guacamole/java/guacamole-common/pom.xml b/guacamole/web/guacamole-common/pom.xml similarity index 100% rename from guacamole/java/guacamole-common/pom.xml rename to guacamole/web/guacamole-common/pom.xml diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java diff --git a/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java b/guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java similarity index 100% rename from guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java rename to guacamole/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java diff --git a/guacamole/java/guacamole-default-webapp/pom.xml b/guacamole/web/guacamole-default-webapp/pom.xml similarity index 100% rename from guacamole/java/guacamole-default-webapp/pom.xml rename to guacamole/web/guacamole-default-webapp/pom.xml diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/META-INF/context.xml b/guacamole/web/guacamole-default-webapp/src/main/webapp/META-INF/context.xml similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/META-INF/context.xml rename to guacamole/web/guacamole-default-webapp/src/main/webapp/META-INF/context.xml diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml b/guacamole/web/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml rename to guacamole/web/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html b/guacamole/web/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html rename to guacamole/web/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js b/guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/guacamole.css b/guacamole/web/guacamole-default-webapp/src/main/webapp/guacamole.css similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/guacamole.css rename to guacamole/web/guacamole-default-webapp/src/main/webapp/guacamole.css diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/checker.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/checker.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/checker.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/checker.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/login-logo.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/login-logo.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/login-logo.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/login-logo.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png b/guacamole/web/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png rename to guacamole/web/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/index.html b/guacamole/web/guacamole-default-webapp/src/main/webapp/index.html similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/index.html rename to guacamole/web/guacamole-default-webapp/src/main/webapp/index.html diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/keyboard.css b/guacamole/web/guacamole-default-webapp/src/main/webapp/keyboard.css similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/keyboard.css rename to guacamole/web/guacamole-default-webapp/src/main/webapp/keyboard.css diff --git a/guacamole/java/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml b/guacamole/web/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml similarity index 100% rename from guacamole/java/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml rename to guacamole/web/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml