From e715e99509c2c568ed8a9d9d6a31716f943baa8f Mon Sep 17 00:00:00 2001
From: James Muehlner <james.muehlner@guac-dev.org>
Date: Wed, 7 Aug 2013 22:48:36 -0700
Subject: [PATCH] Ticket #263: Added parentID for created connections and
 groups.

---
 .../guacamole/net/auth/mysql/ConnectionDirectory.java        | 2 +-
 .../guacamole/net/auth/mysql/ConnectionGroupDirectory.java   | 2 +-
 .../net/auth/mysql/service/ConnectionGroupService.java       | 4 +++-
 .../guacamole/net/auth/mysql/service/ConnectionService.java  | 5 ++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
index c4410da52..de7f71ec3 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
@@ -179,7 +179,7 @@ public class ConnectionDirectory implements Directory<String, Connection>{
 
         // Create connection
         MySQLConnection connection = connectionService.createConnection(
-                name, object.getConfiguration().getProtocol(), user_id);
+                name, object.getConfiguration().getProtocol(), user_id, parentID);
 
         // Add connection parameters
         createConfigurationValues(connection.getConnectionID(),
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
index b92e800a6..0cd4e39ee 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
@@ -162,7 +162,7 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
 
         // Create connection group
         MySQLConnectionGroup connectionGroup = connectionGroupService
-                .createConnectionGroup(name, user_id);
+                .createConnectionGroup(name, user_id, parentID);
 
         // Finally, give the current user full access to the newly created
         // connection group.
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
index a804c49fe..96a95276f 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
@@ -276,11 +276,13 @@ public class ConnectionGroupService {
      * @return A new MySQLConnectionGroup containing the data of the newly created
      *         connection group.
      */
-    public MySQLConnectionGroup createConnectionGroup(String name, int userID) {
+    public MySQLConnectionGroup createConnectionGroup(String name, int userID, 
+            Integer parentID) {
 
         // Initialize database connection
         ConnectionGroup connectionGroup = new ConnectionGroup();
         connectionGroup.setConnection_group_name(name);
+        connectionGroup.setParent_id(parentID);
 
         // Create connection
         connectionGroupDAO.insert(connectionGroup);
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
index b82c20cc0..e20ae736d 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
@@ -376,15 +376,18 @@ public class ConnectionService {
      * @param name The name to assign to the new connection.
      * @param protocol The protocol to assign to the new connection.
      * @param userID The ID of the user who created this connection.
+     * @param parentID The ID of the parent connection group.
      * @return A new MySQLConnection containing the data of the newly created
      *         connection.
      */
-    public MySQLConnection createConnection(String name, String protocol, int userID) {
+    public MySQLConnection createConnection(String name, String protocol,
+            int userID, Integer parentID) {
 
         // Initialize database connection
         Connection connection = new Connection();
         connection.setConnection_name(name);
         connection.setProtocol(protocol);
+        connection.setParent_id(parentID);
 
         // Create connection
         connectionDAO.insert(connection);