From 11f34645e46481491a781d6305a5f9cd0c8fb561 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sat, 9 Feb 2013 01:42:15 -0800
Subject: [PATCH] #268: Refactor list servlets.

---
 .../{ConnectionList.java => crud/connections/List.java}      | 5 +++--
 .../{PermissionList.java => crud/permissions/List.java}      | 5 +++--
 .../net/basic/{UserList.java => crud/users/List.java}        | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename guacamole/src/main/java/net/sourceforge/guacamole/net/basic/{ConnectionList.java => crud/connections/List.java} (97%)
 rename guacamole/src/main/java/net/sourceforge/guacamole/net/basic/{PermissionList.java => crud/permissions/List.java} (97%)
 rename guacamole/src/main/java/net/sourceforge/guacamole/net/basic/{UserList.java => crud/users/List.java} (97%)

diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConnectionList.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java
similarity index 97%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConnectionList.java
rename to guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java
index fdddce40e..622bc9548 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConnectionList.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package net.sourceforge.guacamole.net.basic.crud.connections;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -36,6 +36,7 @@ import net.sourceforge.guacamole.net.auth.permission.ConnectionPermission;
 import net.sourceforge.guacamole.net.auth.permission.ObjectPermission;
 import net.sourceforge.guacamole.net.auth.permission.Permission;
 import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
 
 /**
  * Simple HttpServlet which outputs XML containing a list of all authorized
@@ -43,7 +44,7 @@ import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
  *
  * @author Michael Jumper
  */
-public class ConnectionList extends AuthenticatingHttpServlet {
+public class List extends AuthenticatingHttpServlet {
 
     /**
      * Checks whether the given user has permission to perform the given
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/PermissionList.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java
similarity index 97%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/PermissionList.java
rename to guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java
index b80d20a9b..cce46b2d7 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/PermissionList.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package net.sourceforge.guacamole.net.basic.crud.permissions;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -37,6 +37,7 @@ import net.sourceforge.guacamole.net.auth.permission.Permission;
 import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
 import net.sourceforge.guacamole.net.auth.permission.UserDirectoryPermission;
 import net.sourceforge.guacamole.net.auth.permission.UserPermission;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
 
 /**
  * Simple HttpServlet which outputs XML containing a list of all visible
@@ -44,7 +45,7 @@ import net.sourceforge.guacamole.net.auth.permission.UserPermission;
  *
  * @author Michael Jumper
  */
-public class PermissionList extends AuthenticatingHttpServlet {
+public class List extends AuthenticatingHttpServlet {
     
     /**
      * Returns the XML attribute value representation of the given
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/List.java
similarity index 97%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java
rename to guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/List.java
index 885321aa8..1cc529a2b 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/List.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package net.sourceforge.guacamole.net.basic.crud.users;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -36,13 +36,14 @@ import net.sourceforge.guacamole.net.auth.permission.Permission;
 import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
 import net.sourceforge.guacamole.net.auth.permission.UserDirectoryPermission;
 import net.sourceforge.guacamole.net.auth.permission.UserPermission;
+import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
 
 /**
  * Simple HttpServlet which outputs XML containing a list of all visible users.
  *
  * @author Michael Jumper
  */
-public class UserList extends AuthenticatingHttpServlet {
+public class List extends AuthenticatingHttpServlet {
 
     /**
      * Checks whether the given user has permission to perform the given