From f78281e3c83687e89c212d1cd412e6153c3cb089 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 23 Feb 2015 13:23:33 -0800
Subject: [PATCH] GUAC-1101: Migrate to recent API changes on batch-directory
 branch.

---
 .../net/auth/mysql/MySQLUserContext.java      | 21 ++++++++++++++++---
 .../net/auth/mysql/UserDirectory.java         |  6 ------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
index c756fc4b1..6de6b66bf 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
@@ -26,6 +26,7 @@ package net.sourceforge.guacamole.net.auth.mysql;
 import com.google.inject.Inject;
 import java.util.Collections;
 import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.auth.Connection;
 import org.glyptodon.guacamole.net.auth.ConnectionGroup;
 import org.glyptodon.guacamole.net.auth.Directory;
 import org.glyptodon.guacamole.net.auth.User;
@@ -73,12 +74,26 @@ public class MySQLUserContext implements UserContext {
         return userDirectory;
     }
 
+    @Override
+    public Directory<Connection> getConnectionDirectory() throws GuacamoleException {
+        /* STUB */
+        return new SimpleConnectionDirectory(Collections.EMPTY_LIST);
+    }
+
+    @Override
+    public Directory<ConnectionGroup> getConnectionGroupDirectory() throws GuacamoleException {
+        /* STUB */
+        return new SimpleConnectionGroupDirectory(Collections.EMPTY_LIST);
+    }
+
     @Override
     public ConnectionGroup getRootConnectionGroup() throws GuacamoleException {
         /* STUB */
-        return new SimpleConnectionGroup("ROOT", "ROOT",
-            new SimpleConnectionDirectory(Collections.EMPTY_MAP),
-            new SimpleConnectionGroupDirectory(Collections.EMPTY_LIST)
+        return new SimpleConnectionGroup(
+            MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER, 
+            MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER, 
+            Collections.EMPTY_LIST,
+            Collections.EMPTY_LIST
         );
     }
 
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
index 542f5e8d8..406d33747 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
@@ -65,12 +65,6 @@ public class UserDirectory implements Directory<User> {
         this.currentUser = currentUser;
     }
     
-    @Override
-    public void move(String identifier, Directory<User> groupIdentifier) 
-            throws GuacamoleException {
-        throw new GuacamoleSecurityException("Permission denied.");
-    }
-
     @Override
     public User get(String identifier) throws GuacamoleException {
         return userService.retrieveObject(currentUser, identifier);