Remove central guac-dev repo reference. Refactor net.sourceforge.guacamole to org.glyptodon.guacamole. Extensions are remaining with their classes in net.sourceforge.guacamole for compatibility's sake until we have a better system for extensions.

doc/guacamole-example/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-example</artifactId>
     <packaging>war</packaging>
     <version>0.8.0</version>
@@ -33,7 +33,7 @@
                 <configuration>
                     <overlays>
                         <overlay>
-                            <groupId>net.sourceforge.guacamole</groupId>
+                            <groupId>org.glyptodon.guacamole</groupId>
                             <artifactId>guacamole-common-js</artifactId>
                             <type>zip</type>
                         </overlay>
@@ -57,7 +57,7 @@
 
         <!-- Main Guacamole library -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.8.0</version>
             <scope>compile</scope>
@@ -65,23 +65,13 @@
 
         <!-- Guacamole JavaScript library -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
-            <version>0.7.2</version>
+            <version>0.7.3</version>
             <type>zip</type>
             <scope>runtime</scope>
         </dependency>
 
     </dependencies>
 
-    <repositories>
-
-        <!-- Main Guacamole repository -->
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-
-    </repositories>
-
 </project>

doc/guacamole-example/src/main/java/org/glyptodon/guacamole/net/example/DummyGuacamoleTunnelServlet.java

@@ -1,16 +1,16 @@
 
-package net.sourceforge.guacamole.net.example;
+package org.glyptodon.guacamole.net.example;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import net.sourceforge.guacamole.net.InetGuacamoleSocket;
+import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import net.sourceforge.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
-import net.sourceforge.guacamole.servlet.GuacamoleSession;
+import org.glyptodon.guacamole.servlet.GuacamoleSession;
 
 /*
  *  Guacamole - Clientless Remote Desktop

doc/guacamole-example/src/main/webapp/WEB-INF/web.xml

@@ -32,7 +32,7 @@
     <servlet>
         <description>Tunnel servlet.</description>
         <servlet-name>Tunnel</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.example.DummyGuacamoleTunnelServlet</servlet-class>
+        <servlet-class>org.glyptodon.guacamole.net.example.DummyGuacamoleTunnelServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Tunnel</servlet-name>

extensions/guacamole-auth-ldap/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-auth-ldap</artifactId>
     <packaging>jar</packaging>
     <version>0.8.0</version>
@@ -55,14 +55,14 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.8.0</version>
         </dependency>
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.8.1</version>
         </dependency>
@@ -76,14 +76,4 @@
 
     </dependencies>
 
-    <repositories>
-        
-        <!-- Central Guacamole repository -->
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-        
-    </repositories>
-
 </project>

extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java

@@ -46,12 +46,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Enumeration;
 import java.util.Map;
 import java.util.TreeMap;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
 import net.sourceforge.guacamole.net.auth.ldap.properties.LDAPGuacamoleProperties;
-import net.sourceforge.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java

@@ -1,8 +1,8 @@
 
 package net.sourceforge.guacamole.net.auth.ldap.properties;
 
-import net.sourceforge.guacamole.properties.IntegerGuacamoleProperty;
+import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import net.sourceforge.guacamole.properties.StringGuacamoleProperty;
+import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

extensions/guacamole-auth-mysql/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-auth-mysql</artifactId>
     <packaging>jar</packaging>
     <version>0.8.2</version>
@@ -81,14 +81,14 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.8.0</version>
         </dependency>
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.8.1</version>
         </dependency>
@@ -128,14 +128,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        
-        <!-- Central Guacamole repository -->
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-        
-    </repositories>
-
 </project>

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ActiveConnectionMap.java

@@ -42,7 +42,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionHistoryMapper;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory;
 

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java

@@ -39,10 +39,10 @@ package net.sourceforge.guacamole.net.auth.mysql;
 
 import com.google.inject.Inject;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleClientException;
+import org.glyptodon.guacamole.GuacamoleClientException;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.Connection;
+import org.glyptodon.guacamole.net.auth.Connection;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter;
@@ -51,7 +51,7 @@ import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
 import net.sourceforge.guacamole.net.auth.mysql.service.PermissionCheckService;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.mybatis.guice.transactional.Transactional;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java

@@ -39,11 +39,11 @@ package net.sourceforge.guacamole.net.auth.mysql;
 
 import com.google.inject.Inject;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleClientException;
+import org.glyptodon.guacamole.GuacamoleClientException;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup.Type;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup.Type;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupPermissionKey;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java

@@ -43,10 +43,10 @@ import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import java.util.Properties;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
+import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionHistoryMapper;
@@ -65,7 +65,7 @@ import net.sourceforge.guacamole.net.auth.mysql.service.SHA256PasswordEncryption
 import net.sourceforge.guacamole.net.auth.mysql.service.SaltService;
 import net.sourceforge.guacamole.net.auth.mysql.service.SecureRandomSaltService;
 import net.sourceforge.guacamole.net.auth.mysql.service.UserService;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.mybatis.guice.MyBatisModule;
 import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider;

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java

@@ -41,13 +41,13 @@ import com.google.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.auth.AbstractConnection;
+import org.glyptodon.guacamole.net.auth.AbstractConnection;
-import net.sourceforge.guacamole.net.auth.ConnectionRecord;
+import org.glyptodon.guacamole.net.auth.ConnectionRecord;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * A MySQL based implementation of the Connection object.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java

@@ -39,15 +39,15 @@ package net.sourceforge.guacamole.net.auth.mysql;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.auth.AbstractConnectionGroup;
+import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Connection;
+import org.glyptodon.guacamole.net.auth.Connection;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
 import net.sourceforge.guacamole.net.auth.mysql.service.PermissionCheckService;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * A MySQL based implementation of the ConnectionGroup object.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java

@@ -38,7 +38,7 @@ package net.sourceforge.guacamole.net.auth.mysql;
  * ***** END LICENSE BLOCK ***** */
 
 import java.util.Date;
-import net.sourceforge.guacamole.net.auth.ConnectionRecord;
+import org.glyptodon.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A ConnectionRecord which is based on data stored in MySQL.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java

@@ -1,9 +1,9 @@
 
 package net.sourceforge.guacamole.net.auth.mysql;
 
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.permission.ObjectPermission;
+import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
+import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java

@@ -38,10 +38,10 @@ package net.sourceforge.guacamole.net.auth.mysql;
  * ***** END LICENSE BLOCK ***** */
 
 import com.google.inject.Inject;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
 
 /**
  * A MySQL specific wrapper around a ConfiguredGuacamoleSocket.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java

@@ -38,10 +38,10 @@ package net.sourceforge.guacamole.net.auth.mysql;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.AbstractUser;
+import org.glyptodon.guacamole.net.auth.AbstractUser;
-import net.sourceforge.guacamole.net.auth.User;
+import org.glyptodon.guacamole.net.auth.User;
-import net.sourceforge.guacamole.net.auth.permission.Permission;
+import org.glyptodon.guacamole.net.auth.permission.Permission;
 
 /**
  * A MySQL based implementation of the User object.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java

@@ -38,11 +38,11 @@ package net.sourceforge.guacamole.net.auth.mysql;
  * ***** END LICENSE BLOCK ***** */
 
 import com.google.inject.Inject;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
-import net.sourceforge.guacamole.net.auth.User;
+import org.glyptodon.guacamole.net.auth.User;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
 import net.sourceforge.guacamole.net.auth.mysql.service.UserService;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java

@@ -45,11 +45,11 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleClientException;
+import org.glyptodon.guacamole.GuacamoleClientException;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
-import net.sourceforge.guacamole.net.auth.User;
+import org.glyptodon.guacamole.net.auth.User;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper;
@@ -66,11 +66,11 @@ import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
 import net.sourceforge.guacamole.net.auth.mysql.service.PermissionCheckService;
 import net.sourceforge.guacamole.net.auth.mysql.service.UserService;
-import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission;
+import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission;
-import net.sourceforge.guacamole.net.auth.permission.ConnectionPermission;
+import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission;
-import net.sourceforge.guacamole.net.auth.permission.Permission;
+import org.glyptodon.guacamole.net.auth.permission.Permission;
-import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
+import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import net.sourceforge.guacamole.net.auth.permission.UserPermission;
+import org.glyptodon.guacamole.net.auth.permission.UserPermission;
 import org.mybatis.guice.transactional.Transactional;
 
 /**
@@ -145,7 +145,7 @@ public class UserDirectory implements Directory<String, User> {
 
     @Transactional
     @Override
-    public net.sourceforge.guacamole.net.auth.User get(String identifier)
+    public org.glyptodon.guacamole.net.auth.User get(String identifier)
             throws GuacamoleException {
 
         // Get user
@@ -170,7 +170,7 @@ public class UserDirectory implements Directory<String, User> {
 
     @Override
     @Transactional
-    public void add(net.sourceforge.guacamole.net.auth.User object)
+    public void add(org.glyptodon.guacamole.net.auth.User object)
             throws GuacamoleException {
 
         String username = object.getUsername().trim();
@@ -663,7 +663,7 @@ public class UserDirectory implements Directory<String, User> {
 
     @Override
     @Transactional
-    public void update(net.sourceforge.guacamole.net.auth.User object)
+    public void update(org.glyptodon.guacamole.net.auth.User object)
             throws GuacamoleException {
 
         // If user not actually from this auth provider, we can't handle updated

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java

@@ -35,9 +35,9 @@
  * ***** END LICENSE BLOCK ***** */
 package net.sourceforge.guacamole.net.auth.mysql.properties;
 
-import net.sourceforge.guacamole.properties.BooleanGuacamoleProperty;
+import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
-import net.sourceforge.guacamole.properties.IntegerGuacamoleProperty;
+import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import net.sourceforge.guacamole.properties.StringGuacamoleProperty;
+import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the MySQL Authentication plugin.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java

@@ -43,9 +43,9 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleClientException;
+import org.glyptodon.guacamole.GuacamoleClientException;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
 import net.sourceforge.guacamole.net.auth.mysql.ActiveConnectionMap;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup;
@@ -55,8 +55,8 @@ import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroup;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupExample;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupExample.Criteria;
 import net.sourceforge.guacamole.net.auth.mysql.properties.MySQLGuacamoleProperties;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
@@ -168,7 +168,7 @@ public class ConnectionGroupService {
             connectionGroup.init(null, null, 
                     MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER, 
                     MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER, 
-                    net.sourceforge.guacamole.net.auth.ConnectionGroup.Type.ORGANIZATIONAL, 
+                    org.glyptodon.guacamole.net.auth.ConnectionGroup.Type.ORGANIZATIONAL, 
                     userID);
             
             return connectionGroup;
@@ -307,12 +307,12 @@ public class ConnectionGroupService {
         MySQLConnectionGroup mySQLConnectionGroup = mysqlConnectionGroupProvider.get();
         
         String mySqlType = connectionGroup.getType();
-        net.sourceforge.guacamole.net.auth.ConnectionGroup.Type authType;
+        org.glyptodon.guacamole.net.auth.ConnectionGroup.Type authType;
         
         if(mySqlType.equals(MySQLConstants.CONNECTION_GROUP_ORGANIZATIONAL))
-            authType = net.sourceforge.guacamole.net.auth.ConnectionGroup.Type.ORGANIZATIONAL;
+            authType = org.glyptodon.guacamole.net.auth.ConnectionGroup.Type.ORGANIZATIONAL;
         else
-            authType = net.sourceforge.guacamole.net.auth.ConnectionGroup.Type.BALANCING;
+            authType = org.glyptodon.guacamole.net.auth.ConnectionGroup.Type.BALANCING;
         
         mySQLConnectionGroup.init(
             connectionGroup.getConnection_group_id(),

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java

@@ -45,11 +45,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleClientException;
+import org.glyptodon.guacamole.GuacamoleClientException;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.InetGuacamoleSocket;
+import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import net.sourceforge.guacamole.net.SSLGuacamoleSocket;
+import org.glyptodon.guacamole.net.SSLGuacamoleSocket;
 import net.sourceforge.guacamole.net.auth.mysql.ActiveConnectionMap;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionRecord;
@@ -65,10 +65,10 @@ import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample;
 import net.sourceforge.guacamole.net.auth.mysql.properties.MySQLGuacamoleProperties;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.apache.ibatis.session.RowBounds;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java

@@ -42,7 +42,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLConstants;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMapper;
@@ -58,11 +58,11 @@ import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample;
 import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey;
 import net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample;
 import net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey;
-import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission;
+import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission;
-import net.sourceforge.guacamole.net.auth.permission.ConnectionPermission;
+import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission;
-import net.sourceforge.guacamole.net.auth.permission.Permission;
+import org.glyptodon.guacamole.net.auth.permission.Permission;
-import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
+import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import net.sourceforge.guacamole.net.auth.permission.UserPermission;
+import org.glyptodon.guacamole.net.auth.permission.UserPermission;
 
 /**
  * A service to retrieve information about what objects a user has permission to.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java

@@ -48,8 +48,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
 import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
 import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
 import net.sourceforge.guacamole.net.auth.mysql.model.User;
@@ -105,7 +105,7 @@ public class UserService {
      * @throws GuacamoleException If an error occurs while reading the data
      *                            of the provided User.
      */
-    public MySQLUser toMySQLUser(net.sourceforge.guacamole.net.auth.User user) throws GuacamoleException {
+    public MySQLUser toMySQLUser(org.glyptodon.guacamole.net.auth.User user) throws GuacamoleException {
         MySQLUser mySQLUser = mySQLUserProvider.get();
         mySQLUser.init(user);
         return mySQLUser;

extensions/guacamole-auth-noauth/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-auth-noauth</artifactId>
     <packaging>jar</packaging>
     <version>0.8.0</version>
@@ -43,25 +43,17 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.8.0</version>
         </dependency>
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.8.1</version>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <!-- Central Guacamole repository -->
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-    </repositories>
-
 </project>

extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java

@@ -40,7 +40,7 @@ package net.sourceforge.guacamole.net.auth.noauth;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java

@@ -43,13 +43,13 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
-import net.sourceforge.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.properties.FileGuacamoleProperty;
+import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 import org.xml.sax.InputSource;

guacamole-common-js/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-common-js</artifactId>
     <packaging>pom</packaging>
     <version>0.7.3</version>

guacamole-common/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-common</artifactId>
     <packaging>jar</packaging>
     <version>0.8.0</version>

guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole;
+package org.glyptodon.guacamole;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole;
+package org.glyptodon.guacamole;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole;
+package org.glyptodon.guacamole;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole;
+package org.glyptodon.guacamole;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole;
+package org.glyptodon.guacamole;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.io;
+package org.glyptodon.guacamole.io;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,8 +37,8 @@ package net.sourceforge.guacamole.io;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
+import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * Provides abstract and raw character read access to a stream of Guacamole

guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.io;
+package org.glyptodon.guacamole.io;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,8 +37,8 @@ package net.sourceforge.guacamole.io;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
+import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * Provides abstract and raw character write access to a stream of Guacamole

guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.io;
+package org.glyptodon.guacamole.io;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -41,9 +41,9 @@ import java.io.IOException;
 import java.io.Reader;
 import java.util.Deque;
 import java.util.LinkedList;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
-import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
+import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * A GuacamoleReader which wraps a standard Java Reader, using that Reader as

guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.io;
+package org.glyptodon.guacamole.io;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -39,9 +39,9 @@ package net.sourceforge.guacamole.io;
 
 import java.io.IOException;
 import java.io.Writer;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
-import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
+import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * A GuacamoleWriter which wraps a standard Java Writer, using that Writer as

guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java

@@ -2,5 +2,5 @@
 /**
  * All classes relating directly to data input or output.
  */
-package net.sourceforge.guacamole.io;
+package org.glyptodon.guacamole.io;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net;
+package org.glyptodon.guacamole.net;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,9 +37,9 @@ package net.sourceforge.guacamole.net;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
 
 /**
  * Provides abstract socket-like access to a Guacamole connection.

guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net;
+package org.glyptodon.guacamole.net;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -39,9 +39,9 @@ package net.sourceforge.guacamole.net;
 
 import java.util.UUID;
 import java.util.concurrent.locks.ReentrantLock;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
 
 /**
  * Provides a unique identifier and synchronized access to the GuacamoleReader

guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net;
+package org.glyptodon.guacamole.net;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,10 +37,10 @@ package net.sourceforge.guacamole.net;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.ReaderGuacamoleReader;
+import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
-import net.sourceforge.guacamole.io.WriterGuacamoleWriter;
+import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -50,8 +50,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net;
+package org.glyptodon.guacamole.net;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -46,12 +46,12 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
-import net.sourceforge.guacamole.io.ReaderGuacamoleReader;
+import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
-import net.sourceforge.guacamole.io.WriterGuacamoleWriter;
+import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java

@@ -3,5 +3,5 @@
  * Classes which apply to network-specific concepts, such as low-level sockets
  * and tunnels.
  */
-package net.sourceforge.guacamole.net;
+package org.glyptodon.guacamole.net;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java

@@ -4,5 +4,5 @@
  * and all other web applications which use the API provided by the
  * Guacamole project.
  */
-package net.sourceforge.guacamole;
+package org.glyptodon.guacamole;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.protocol;
+package org.glyptodon.guacamole.protocol;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -38,11 +38,11 @@ package net.sourceforge.guacamole.protocol;
  * ***** END LICENSE BLOCK ***** */
 
 import java.util.List;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
 
 /**
  * A GuacamoleSocket which pre-configures the connection based on a given

guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.protocol;
+package org.glyptodon.guacamole.protocol;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.protocol;
+package org.glyptodon.guacamole.protocol;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.protocol;
+package org.glyptodon.guacamole.protocol;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java

@@ -2,5 +2,5 @@
 /**
  * Classes relating directly to the Guacamole protocol.
  */
-package net.sourceforge.guacamole.protocol;
+package org.glyptodon.guacamole.protocol;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.servlet;
+package org.glyptodon.guacamole.servlet;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -47,14 +47,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleClientException;
+import org.glyptodon.guacamole.GuacamoleClientException;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleResourceNotFoundException;
+import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
-import net.sourceforge.guacamole.io.GuacamoleReader;
+import org.glyptodon.guacamole.io.GuacamoleReader;
-import net.sourceforge.guacamole.io.GuacamoleWriter;
+import org.glyptodon.guacamole.io.GuacamoleWriter;
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.servlet;
+package org.glyptodon.guacamole.servlet;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -40,9 +40,9 @@ package net.sourceforge.guacamole.servlet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java

@@ -3,5 +3,5 @@
  * Classes which build upon the Java Servlet API, providing an HTTP-based
  * tunnel and session management.
  */
-package net.sourceforge.guacamole.servlet;
+package org.glyptodon.guacamole.servlet;
 

guacamole-ext/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole-ext</artifactId>
     <packaging>jar</packaging>
     <version>0.8.1</version>
@@ -41,7 +41,7 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.8.0</version>
             <scope>compile</scope>
@@ -49,14 +49,4 @@
 
     </dependencies>
 
-    <repositories>
-        
-        <!-- Central Guacamole repository -->
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-        
-    </repositories>
-
 </project>

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnection.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,7 +37,7 @@ package net.sourceforge.guacamole.net.auth;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnectionGroup.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractUser.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticationProvider.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,7 +37,7 @@ package net.sourceforge.guacamole.net.auth;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connection.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -38,10 +38,10 @@ package net.sourceforge.guacamole.net.auth;
  * ***** END LICENSE BLOCK ***** */
 
 import java.util.List;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionGroup.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,9 +37,9 @@ package net.sourceforge.guacamole.net.auth;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Credentials.java

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 import java.io.Serializable;
 import javax.servlet.http.HttpServletRequest;

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Directory.java

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,7 +37,7 @@ package net.sourceforge.guacamole.net.auth;
  * ***** END LICENSE BLOCK ***** */
 
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/User.java

@@ -1,9 +1,9 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.permission.Permission;
+import org.glyptodon.guacamole.net.auth.permission.Permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,7 +37,7 @@ package net.sourceforge.guacamole.net.auth;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 
 /**
  * The context of an active user. The functions of this class enforce all

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/package-info.java

@@ -3,5 +3,5 @@
  * Provides classes which can be used to extend or replace the authentication
  * functionality of the Guacamole web application.
  */
-package net.sourceforge.guacamole.net.auth;
+package org.glyptodon.guacamole.net.auth;
 

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ConnectionGroupPermission.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ConnectionPermission.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermission.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/Permission.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermission.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/UserPermission.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/package-info.java

@@ -3,5 +3,5 @@
  * Provides classes which describe the various permissions a Guacamole user
  * can be granted.
  */
-package net.sourceforge.guacamole.net.auth.permission;
+package org.glyptodon.guacamole.net.auth.permission;
 

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -38,11 +38,11 @@ package net.sourceforge.guacamole.net.auth.simple;
  * ***** END LICENSE BLOCK ***** */
 
 import java.util.Map;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
+import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnection.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -39,16 +39,16 @@ package net.sourceforge.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.List;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.InetGuacamoleSocket;
+import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import net.sourceforge.guacamole.net.SSLGuacamoleSocket;
+import org.glyptodon.guacamole.net.SSLGuacamoleSocket;
-import net.sourceforge.guacamole.net.auth.AbstractConnection;
+import org.glyptodon.guacamole.net.auth.AbstractConnection;
-import net.sourceforge.guacamole.net.auth.ConnectionRecord;
+import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionDirectory.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -41,11 +41,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.auth.Connection;
+import org.glyptodon.guacamole.net.auth.Connection;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroup.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,14 +37,14 @@ package net.sourceforge.guacamole.net.auth.simple;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.auth.AbstractConnectionGroup;
+import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Connection;
+import org.glyptodon.guacamole.net.auth.Connection;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
-import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
+import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -41,10 +41,10 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUser.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -41,15 +41,15 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.auth.AbstractUser;
+import org.glyptodon.guacamole.net.auth.AbstractUser;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission;
+import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission;
-import net.sourceforge.guacamole.net.auth.permission.ConnectionPermission;
+import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission;
-import net.sourceforge.guacamole.net.auth.permission.ObjectPermission;
+import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import net.sourceforge.guacamole.net.auth.permission.Permission;
+import org.glyptodon.guacamole.net.auth.permission.Permission;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -39,12 +39,12 @@ package net.sourceforge.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.Map;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.ConnectionGroup;
+import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
-import net.sourceforge.guacamole.net.auth.User;
+import org.glyptodon.guacamole.net.auth.User;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * An extremely simple UserContext implementation which provides access to

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserDirectory.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -39,10 +39,10 @@ package net.sourceforge.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.Set;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.auth.Directory;
+import org.glyptodon.guacamole.net.auth.Directory;
-import net.sourceforge.guacamole.net.auth.User;
+import org.glyptodon.guacamole.net.auth.User;
 
 
 /**

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/package-info.java

@@ -4,5 +4,5 @@
  * simple AuthenticationProviders in the same way allowed by the old
  * authentication API.
  */
-package net.sourceforge.guacamole.net.auth.simple;
+package org.glyptodon.guacamole.net.auth.simple;
 

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationFailureEvent.java

@@ -1,6 +1,6 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
 
 /**
  * An event which is triggered whenever a user's credentials fail to be

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationSuccessEvent.java

@@ -1,7 +1,7 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a user's credentials pass

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/CredentialEvent.java

@@ -1,6 +1,6 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
 
 /**
  * Abstract basis for events which may have associated user credentials when

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelCloseEvent.java

@@ -1,8 +1,8 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a tunnel is being closed. The tunnel

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelConnectEvent.java

@@ -1,8 +1,8 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import net.sourceforge.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a tunnel is being connected. The tunnel

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelEvent.java

@@ -1,6 +1,6 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
 
 /**
  * Abstract basis for events associated with tunnels.

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/UserEvent.java

@@ -1,6 +1,6 @@
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 
-import net.sourceforge.guacamole.net.auth.UserContext;
+import org.glyptodon.guacamole.net.auth.UserContext;
 
 /**
  * Abstract basis for events which may have an associated UserContext when

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationFailureListener.java

@@ -1,7 +1,7 @@
-package net.sourceforge.guacamole.net.event.listener;
+package org.glyptodon.guacamole.net.event.listener;
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.event.AuthenticationFailureEvent;
+import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent;
 
 /**
  * A listener whose authenticationFailed() hook will fire immediately

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationSuccessListener.java

@@ -1,7 +1,7 @@
-package net.sourceforge.guacamole.net.event.listener;
+package org.glyptodon.guacamole.net.event.listener;
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.event.AuthenticationSuccessEvent;
+import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent;
 
 /**
  * A listener whose hooks will fire immediately before and after a user's

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelCloseListener.java

@@ -1,7 +1,7 @@
-package net.sourceforge.guacamole.net.event.listener;
+package org.glyptodon.guacamole.net.event.listener;
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.event.TunnelCloseEvent;
+import org.glyptodon.guacamole.net.event.TunnelCloseEvent;
 
 /**
  * A listener whose tunnelClosed() hook will fire immediately after an

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelConnectListener.java

@@ -1,7 +1,7 @@
-package net.sourceforge.guacamole.net.event.listener;
+package org.glyptodon.guacamole.net.event.listener;
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.event.TunnelConnectEvent;
+import org.glyptodon.guacamole.net.event.TunnelConnectEvent;
 
 /**
  * A listener whose tunnelConnected() hook will fire immediately after a new

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/package-info.java

@@ -6,5 +6,5 @@
  * in some cases, prevent the web application from allowing the
  * event to continue for the user that triggered it.
  */
-package net.sourceforge.guacamole.net.event.listener;
+package org.glyptodon.guacamole.net.event.listener;
 

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/package-info.java

@@ -5,7 +5,7 @@
  * These event classes are most useful when used with hooks implemented
  * using listener classes.
  *
- * @see net.sourceforge.guacamole.net.event.listener
+ * @see org.glyptodon.guacamole.net.event.listener
  */
-package net.sourceforge.guacamole.net.event;
+package org.glyptodon.guacamole.net.event;
 

guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/BooleanGuacamoleProperty.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.properties;
+package org.glyptodon.guacamole.properties;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,8 +37,8 @@ package net.sourceforge.guacamole.properties;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an boolean. Legal true values are "true",

guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/FileGuacamoleProperty.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.properties;
+package org.glyptodon.guacamole.properties;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -38,7 +38,7 @@ package net.sourceforge.guacamole.properties;
  * ***** END LICENSE BLOCK ***** */
 
 import java.io.File;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a filename.

guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleHome.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.properties;
+package org.glyptodon.guacamole.properties;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1

guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperties.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.properties;
+package org.glyptodon.guacamole.properties;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -42,8 +42,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleServerException;
+import org.glyptodon.guacamole.GuacamoleServerException;
 
 /**
  * Simple utility class for reading properties from the guacamole.properties

guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperty.java

@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.properties;
+package org.glyptodon.guacamole.properties;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,7 +37,7 @@ package net.sourceforge.guacamole.properties;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 
 /**
  * An abstract representation of a property in the guacamole.properties file,