diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index 55d61e0b9..97ae6e816 100644 --- a/doc/guacamole-example/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-example war 0.8.0 @@ -33,7 +33,7 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common-js zip @@ -57,7 +57,7 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common 0.8.0 compile @@ -65,23 +65,13 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common-js - 0.7.2 + 0.7.3 zip runtime - - - - - guac-dev - http://guac-dev.org/repo - - - - diff --git a/doc/guacamole-example/src/main/java/net/sourceforge/guacamole/net/example/DummyGuacamoleTunnelServlet.java b/doc/guacamole-example/src/main/java/org/glyptodon/guacamole/net/example/DummyGuacamoleTunnelServlet.java similarity index 79% rename from doc/guacamole-example/src/main/java/net/sourceforge/guacamole/net/example/DummyGuacamoleTunnelServlet.java rename to doc/guacamole-example/src/main/java/org/glyptodon/guacamole/net/example/DummyGuacamoleTunnelServlet.java index 72a4d05d3..8f2a1e40c 100644 --- a/doc/guacamole-example/src/main/java/net/sourceforge/guacamole/net/example/DummyGuacamoleTunnelServlet.java +++ b/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 net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.GuacamoleTunnel; -import net.sourceforge.guacamole.net.InetGuacamoleSocket; -import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; -import net.sourceforge.guacamole.servlet.GuacamoleHTTPTunnelServlet; -import net.sourceforge.guacamole.servlet.GuacamoleSession; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.GuacamoleTunnel; +import org.glyptodon.guacamole.net.InetGuacamoleSocket; +import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet; +import org.glyptodon.guacamole.servlet.GuacamoleSession; /* * Guacamole - Clientless Remote Desktop diff --git a/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml b/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml index 4e823dfd5..77d4324cb 100644 --- a/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml +++ b/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml @@ -32,7 +32,7 @@ Tunnel servlet. Tunnel - net.sourceforge.guacamole.net.example.DummyGuacamoleTunnelServlet + org.glyptodon.guacamole.net.example.DummyGuacamoleTunnelServlet Tunnel diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 9563dab2e..046c895f2 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-auth-ldap jar 0.8.0 @@ -55,14 +55,14 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common 0.8.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-ext 0.8.1 @@ -76,14 +76,4 @@ - - - - - guac-dev - http://guac-dev.org/repo - - - - diff --git a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java index 41e4c24d8..5fe6ef90d 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java +++ b/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 net.sourceforge.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.GuacamoleException; +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 net.sourceforge.guacamole.properties.GuacamoleProperties; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider; +import org.glyptodon.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java index 1b7c88d84..a523da894 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java +++ b/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 net.sourceforge.guacamole.properties.StringGuacamoleProperty; +import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty; +import org.glyptodon.guacamole.properties.StringGuacamoleProperty; /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/extensions/guacamole-auth-mysql/pom.xml b/extensions/guacamole-auth-mysql/pom.xml index 1ec8233fd..00dc72917 100644 --- a/extensions/guacamole-auth-mysql/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-auth-mysql jar 0.8.2 @@ -81,14 +81,14 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common 0.8.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-ext 0.8.1 @@ -128,14 +128,4 @@ - - - - - guac-dev - http://guac-dev.org/repo - - - - diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ActiveConnectionMap.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ActiveConnectionMap.java index 3a60f8c02..06965ebe5 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ActiveConnectionMap.java +++ b/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; 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 89f354170..232cdd169 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 @@ -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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Connection; +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; /** 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 48787da23..fdcb862aa 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 @@ -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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.ConnectionGroup.Type; -import net.sourceforge.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.ConnectionGroup.Type; +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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java index 67bc3ba3c..6877ca3b7 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java +++ b/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 net.sourceforge.guacamole.net.auth.AuthenticationProvider; -import net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.AuthenticationProvider; +import org.glyptodon.guacamole.net.auth.Credentials; +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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java index a51d2536e..96258aa79 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java +++ b/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 net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.auth.AbstractConnection; -import net.sourceforge.guacamole.net.auth.ConnectionRecord; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.auth.AbstractConnection; +import org.glyptodon.guacamole.net.auth.ConnectionRecord; import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** * A MySQL based implementation of the Connection object. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java index cda8bff7e..bba1ef1ce 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java +++ b/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 net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.auth.AbstractConnectionGroup; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +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. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java index bee0917a0..c7903adcf 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java +++ b/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. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java index 09aa8a7ef..144936a60 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java +++ b/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 net.sourceforge.guacamole.net.auth.permission.ObjectPermission; -import net.sourceforge.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java index 84bf57efd..340160fd0 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java +++ b/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 net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; -import net.sourceforge.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.net.GuacamoleSocket; /** * A MySQL specific wrapper around a ConfiguredGuacamoleSocket. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java index e969a61b2..37f8f074e 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java +++ b/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 net.sourceforge.guacamole.net.auth.AbstractUser; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.AbstractUser; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.permission.Permission; /** * A MySQL based implementation of the User object. 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 54c5895e6..83231483b 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 @@ -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 net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; import net.sourceforge.guacamole.net.auth.mysql.service.UserService; /** 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 063027bb7..a37742e3b 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 @@ -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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.auth.Directory; +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 net.sourceforge.guacamole.net.auth.permission.ConnectionPermission; -import net.sourceforge.guacamole.net.auth.permission.Permission; -import net.sourceforge.guacamole.net.auth.permission.SystemPermission; -import net.sourceforge.guacamole.net.auth.permission.UserPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.auth.permission.UserPermission; import org.mybatis.guice.transactional.Transactional; /** @@ -145,7 +145,7 @@ public class UserDirectory implements Directory { @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 { @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 { @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 diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java index 873e46da2..6f457a134 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java +++ b/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 net.sourceforge.guacamole.properties.IntegerGuacamoleProperty; -import net.sourceforge.guacamole.properties.StringGuacamoleProperty; +import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty; +import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty; +import org.glyptodon.guacamole.properties.StringGuacamoleProperty; /** * Properties used by the MySQL Authentication plugin. 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 f6e9a26c3..f4954cb32 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 @@ -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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +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 net.sourceforge.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.properties.GuacamoleProperties; +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(), 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 7b3aec2a0..e1c0b5c53 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 @@ -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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.InetGuacamoleSocket; -import net.sourceforge.guacamole.net.SSLGuacamoleSocket; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.InetGuacamoleSocket; +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 net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.apache.ibatis.session.RowBounds; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java index c4884127b..ddf74ab11 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java +++ b/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 net.sourceforge.guacamole.net.auth.permission.ConnectionPermission; -import net.sourceforge.guacamole.net.auth.permission.Permission; -import net.sourceforge.guacamole.net.auth.permission.SystemPermission; -import net.sourceforge.guacamole.net.auth.permission.UserPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.auth.permission.UserPermission; /** * A service to retrieve information about what objects a user has permission to. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java index fe3fa8b34..b988983a2 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java +++ b/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 net.sourceforge.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.GuacamoleException; +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; diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml index 674989444..49327d4e1 100644 --- a/extensions/guacamole-auth-noauth/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-auth-noauth jar 0.8.0 @@ -43,25 +43,17 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common 0.8.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-ext 0.8.1 - - - - guac-dev - http://guac-dev.org/repo - - - diff --git a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java index 55e5b1883..b1f4b926d 100644 --- a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java +++ b/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; diff --git a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java index d96d9b4a9..7d5ded91f 100644 --- a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.net.auth.simple.SimpleAuthenticationProvider; -import net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.properties.FileGuacamoleProperty; -import net.sourceforge.guacamole.properties.GuacamoleProperties; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.properties.FileGuacamoleProperty; +import org.glyptodon.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.slf4j.LoggerFactory; import org.slf4j.Logger; import org.xml.sax.InputSource; diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml index 5d3dd1d16..28d460828 100644 --- a/guacamole-common-js/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common-js pom 0.7.3 diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index 0e03c342d..552d2096d 100644 --- a/guacamole-common/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common jar 0.8.0 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClientException.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClientException.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java index d162344cb..bf98aa334 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClientException.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java index 9859f4ecd..a2eb28a1f 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java index c6aec4a86..cb90a41c2 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java index f7cbe4c2e..e40bcff43 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleServerException.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleServerException.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java index 7d64f0099..24057ba95 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleServerException.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/GuacamoleReader.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java similarity index 95% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/io/GuacamoleReader.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java index c77e186fc..23fca3d22 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/GuacamoleReader.java +++ b/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 net.sourceforge.guacamole.protocol.GuacamoleInstruction; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.protocol.GuacamoleInstruction; /** * Provides abstract and raw character read access to a stream of Guacamole diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/GuacamoleWriter.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java similarity index 95% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/io/GuacamoleWriter.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java index cb685b72d..ad8029683 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/GuacamoleWriter.java +++ b/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 net.sourceforge.guacamole.protocol.GuacamoleInstruction; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.protocol.GuacamoleInstruction; /** * Provides abstract and raw character write access to a stream of Guacamole diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java similarity index 97% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java index 257c8ba96..d525f6810 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.protocol.GuacamoleInstruction; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.protocol.GuacamoleInstruction; /** * A GuacamoleReader which wraps a standard Java Reader, using that Reader as diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java similarity index 93% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java index fb0bddc53..169159a9d 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.protocol.GuacamoleInstruction; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.protocol.GuacamoleInstruction; /** * A GuacamoleWriter which wraps a standard Java Writer, using that Writer as diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/package-info.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java similarity index 64% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/io/package-info.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java index d903211ba..531531a33 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/package-info.java +++ b/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; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSocket.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java similarity index 93% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSocket.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java index 2d800fc0e..0d4d38994 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSocket.java +++ b/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 net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.GuacamoleWriter; /** * Provides abstract socket-like access to a Guacamole connection. diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleTunnel.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java similarity index 96% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleTunnel.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java index 93577ae81..d2e3c3897 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleTunnel.java +++ b/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 net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.GuacamoleWriter; /** * Provides a unique identifier and synchronized access to the GuacamoleReader diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java similarity index 92% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java index 113148192..df28f4e3e 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java +++ b/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 net.sourceforge.guacamole.io.ReaderGuacamoleReader; -import net.sourceforge.guacamole.io.WriterGuacamoleWriter; -import net.sourceforge.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.ReaderGuacamoleReader; +import org.glyptodon.guacamole.io.WriterGuacamoleWriter; +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 net.sourceforge.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/SSLGuacamoleSocket.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java similarity index 93% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/net/SSLGuacamoleSocket.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java index 1f1f250db..44c2f3f1a 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/SSLGuacamoleSocket.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; -import net.sourceforge.guacamole.io.ReaderGuacamoleReader; -import net.sourceforge.guacamole.io.WriterGuacamoleWriter; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.io.ReaderGuacamoleReader; +import org.glyptodon.guacamole.io.WriterGuacamoleWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/package-info.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java similarity index 72% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/net/package-info.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java index 97ddc99d2..ae1a8d0a1 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/package-info.java +++ b/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; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/package-info.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java similarity index 83% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/package-info.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java index 2d895938d..d947b5cef 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/package-info.java +++ b/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; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java similarity index 95% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java index 99d68643f..06308f401 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; -import net.sourceforge.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.net.GuacamoleSocket; /** * A GuacamoleSocket which pre-configures the connection based on a given diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java index 78f9f031b..6cb10a275 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java index ac56fb315..5b15a25b6 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleInstruction.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java similarity index 98% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleInstruction.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java index d3d10a74e..8b94fa189 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleInstruction.java +++ b/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 diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/package-info.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java similarity index 60% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/package-info.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java index fc1e627e9..7b2b9623d 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/package-info.java +++ b/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; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java similarity index 97% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java index 039e91565..05e778145 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java +++ b/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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleResourceNotFoundException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; -import net.sourceforge.guacamole.net.GuacamoleTunnel; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleResourceNotFoundException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.io.GuacamoleReader; +import org.glyptodon.guacamole.io.GuacamoleWriter; +import org.glyptodon.guacamole.net.GuacamoleTunnel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleSession.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java similarity index 95% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleSession.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java index ef049e8c9..1d8641fbe 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleSession.java +++ b/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 net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.GuacamoleTunnel; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.GuacamoleTunnel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/package-info.java b/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java similarity index 73% rename from guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/package-info.java rename to guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java index 979a04dd5..21e25a61c 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/package-info.java +++ b/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; diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index 91f7f604c..ba85f36db 100644 --- a/guacamole-ext/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-ext jar 0.8.1 @@ -41,7 +41,7 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common 0.8.0 compile @@ -49,14 +49,4 @@ - - - - - guac-dev - http://guac-dev.org/repo - - - - diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractConnection.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnection.java similarity index 96% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractConnection.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnection.java index 4dfdfa77e..e08bdc65e 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractConnection.java +++ b/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; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractConnectionGroup.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnectionGroup.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractConnectionGroup.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnectionGroup.java index 8ba59f929..c9b3d31b1 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractConnectionGroup.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractUser.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractUser.java index 3cebd0f25..04d0f2f5a 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticationProvider.java similarity index 97% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticationProvider.java index 794a107ef..547628ed6 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java +++ b/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; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Connection.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connection.java similarity index 94% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Connection.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connection.java index d2acb5e1f..42bdd39b9 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Connection.java +++ b/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 net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/ConnectionGroup.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionGroup.java similarity index 95% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/ConnectionGroup.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionGroup.java index b8d42293a..35bc4b92e 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/ConnectionGroup.java +++ b/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 net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/ConnectionRecord.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/ConnectionRecord.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java index b9f28ed40..52845608d 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/ConnectionRecord.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Credentials.java similarity index 99% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Credentials.java index 36a2e0afa..63b5e89f0 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java +++ b/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; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Directory.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Directory.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Directory.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Directory.java index 910a096d1..95866e86a 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Directory.java +++ b/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; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/User.java similarity index 96% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/User.java index cb2d9572c..6e792c630 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java +++ b/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 net.sourceforge.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.permission.Permission; /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/UserContext.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java similarity index 97% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/UserContext.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java index 20f4e72d9..efb743107 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/UserContext.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/package-info.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/package-info.java similarity index 75% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/package-info.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/package-info.java index 5c42c725a..7633ebb36 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/package-info.java +++ b/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; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionGroupPermission.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ConnectionGroupPermission.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionGroupPermission.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ConnectionGroupPermission.java index 9436421f8..377cdbcac 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionGroupPermission.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionPermission.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ConnectionPermission.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionPermission.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ConnectionPermission.java index b171fa605..7b0c26748 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionPermission.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ObjectPermission.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermission.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ObjectPermission.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermission.java index 0325ca0d3..045f1c475 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ObjectPermission.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/Permission.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/Permission.java similarity index 97% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/Permission.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/Permission.java index af855df9d..dcd18dd83 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/Permission.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/SystemPermission.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermission.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/SystemPermission.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermission.java index c4d356306..bc6478543 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/SystemPermission.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/UserPermission.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/UserPermission.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/UserPermission.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/UserPermission.java index 7d18c2b63..5266d4031 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/UserPermission.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/package-info.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/package-info.java similarity index 65% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/package-info.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/package-info.java index 242edc24c..aed305981 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/package-info.java +++ b/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; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleAuthenticationProvider.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java similarity index 91% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleAuthenticationProvider.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java index a4169a1f2..548713aeb 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleAuthenticationProvider.java +++ b/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 net.sourceforge.guacamole.net.auth.AuthenticationProvider; -import net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.AuthenticationProvider; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnection.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnection.java similarity index 84% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnection.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnection.java index b9c1debf2..231bd57cd 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnection.java +++ b/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 net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.InetGuacamoleSocket; -import net.sourceforge.guacamole.net.SSLGuacamoleSocket; -import net.sourceforge.guacamole.net.auth.AbstractConnection; -import net.sourceforge.guacamole.net.auth.ConnectionRecord; -import net.sourceforge.guacamole.properties.GuacamoleProperties; -import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.InetGuacamoleSocket; +import org.glyptodon.guacamole.net.SSLGuacamoleSocket; +import org.glyptodon.guacamole.net.auth.AbstractConnection; +import org.glyptodon.guacamole.net.auth.ConnectionRecord; +import org.glyptodon.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionDirectory.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionDirectory.java similarity index 93% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionDirectory.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionDirectory.java index 11d9b6256..af3af8b37 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionDirectory.java +++ b/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 net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionGroup.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroup.java similarity index 88% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionGroup.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroup.java index 1f8361e27..6afd28fff 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionGroup.java +++ b/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 net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.auth.AbstractConnectionGroup; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup; +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.protocol.GuacamoleClientInformation; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java similarity index 94% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java index 9f252f1a3..ce46428d1 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java +++ b/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 net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUser.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUser.java similarity index 86% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUser.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUser.java index be228efc3..4568e0ffd 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUser.java +++ b/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 net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.auth.AbstractUser; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission; -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.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.auth.AbstractUser; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUserContext.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java similarity index 90% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUserContext.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java index f310d6691..dd4d0dd1c 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUserContext.java +++ b/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 net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** * An extremely simple UserContext implementation which provides access to diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUserDirectory.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserDirectory.java similarity index 92% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUserDirectory.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserDirectory.java index d1c71b68b..793724720 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/SimpleUserDirectory.java +++ b/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 net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; /** diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/package-info.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/package-info.java similarity index 78% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/package-info.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/package-info.java index 7066da16d..3da06ac8d 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/simple/package-info.java +++ b/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; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationFailureEvent.java similarity index 89% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationFailureEvent.java index 6ce8b5c3a..ddd520242 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationSuccessEvent.java similarity index 89% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationSuccessEvent.java index 467e888bd..5a989f758 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java +++ b/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 net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.UserContext; /** * An event which is triggered whenever a user's credentials pass diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/CredentialEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/CredentialEvent.java similarity index 82% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/CredentialEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/CredentialEvent.java index e106ab448..b9c0b5108 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/CredentialEvent.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelCloseEvent.java similarity index 88% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelCloseEvent.java index d820eb22a..36f0bab1a 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java +++ b/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 net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.GuacamoleTunnel; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.UserContext; /** * An event which is triggered whenever a tunnel is being closed. The tunnel diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelConnectEvent.java similarity index 89% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelConnectEvent.java index 75ece170c..43f10578a 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java +++ b/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 net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.GuacamoleTunnel; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.UserContext; /** * An event which is triggered whenever a tunnel is being connected. The tunnel diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelEvent.java similarity index 79% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelEvent.java index e2bc96b1f..cad9bac0b 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelEvent.java +++ b/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. diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/UserEvent.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/UserEvent.java similarity index 81% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/UserEvent.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/UserEvent.java index 8b3578c27..f5983b153 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/UserEvent.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/AuthenticationFailureListener.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationFailureListener.java similarity index 83% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/AuthenticationFailureListener.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationFailureListener.java index cc00cbfdf..2d9868272 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/AuthenticationFailureListener.java +++ b/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 net.sourceforge.guacamole.net.event.AuthenticationFailureEvent; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent; /** * A listener whose authenticationFailed() hook will fire immediately diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/AuthenticationSuccessListener.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationSuccessListener.java similarity index 87% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/AuthenticationSuccessListener.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationSuccessListener.java index 342200635..64330a3fe 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/AuthenticationSuccessListener.java +++ b/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 net.sourceforge.guacamole.net.event.AuthenticationSuccessEvent; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent; /** * A listener whose hooks will fire immediately before and after a user's diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/TunnelCloseListener.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelCloseListener.java similarity index 85% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/TunnelCloseListener.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelCloseListener.java index c80e98473..ea2ff9b44 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/TunnelCloseListener.java +++ b/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 net.sourceforge.guacamole.net.event.TunnelCloseEvent; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.event.TunnelCloseEvent; /** * A listener whose tunnelClosed() hook will fire immediately after an diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/TunnelConnectListener.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelConnectListener.java similarity index 86% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/TunnelConnectListener.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelConnectListener.java index 3eaa0eebc..831cdb0db 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/TunnelConnectListener.java +++ b/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 net.sourceforge.guacamole.net.event.TunnelConnectEvent; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.event.TunnelConnectEvent; /** * A listener whose tunnelConnected() hook will fire immediately after a new diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/package-info.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/package-info.java similarity index 86% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/package-info.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/package-info.java index 83545510c..612272651 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/listener/package-info.java +++ b/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; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/package-info.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/package-info.java similarity index 71% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/package-info.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/package-info.java index c5bd8683e..b0110160e 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/package-info.java +++ b/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; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/BooleanGuacamoleProperty.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/BooleanGuacamoleProperty.java similarity index 94% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/BooleanGuacamoleProperty.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/BooleanGuacamoleProperty.java index add1d7e45..829e44ba9 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/BooleanGuacamoleProperty.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; /** * A GuacamoleProperty whose value is an boolean. Legal true values are "true", diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/FileGuacamoleProperty.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/FileGuacamoleProperty.java similarity index 95% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/FileGuacamoleProperty.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/FileGuacamoleProperty.java index 9b2a4ceb4..aa7563e8c 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/FileGuacamoleProperty.java +++ b/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. diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleHome.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleHome.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleHome.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleHome.java index e7583c349..438316ec9 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleHome.java +++ b/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 diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperties.java similarity index 98% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperties.java index ac593a05d..f50264277 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java +++ b/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 net.sourceforge.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; /** * Simple utility class for reading properties from the guacamole.properties diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperty.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperty.java similarity index 96% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperty.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperty.java index aae793623..ddbe6d6d2 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperty.java +++ b/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, diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/IntegerGuacamoleProperty.java similarity index 93% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/IntegerGuacamoleProperty.java index 479d2bd5b..6289bb9a8 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java +++ b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/IntegerGuacamoleProperty.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 net.sourceforge.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; /** * A GuacamoleProperty whose value is an integer. diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/StringGuacamoleProperty.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/StringGuacamoleProperty.java similarity index 95% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/StringGuacamoleProperty.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/StringGuacamoleProperty.java index 74fc97e6d..a8ebef8cd 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/StringGuacamoleProperty.java +++ b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/StringGuacamoleProperty.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; /** * A GuacamoleProperty whose value is a simple string. diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/package-info.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/package-info.java similarity index 71% rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/package-info.java rename to guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/package-info.java index 1c01c62c4..5dbd06fe4 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/properties/package-info.java +++ b/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/package-info.java @@ -3,5 +3,5 @@ * Provides classes for reading properties from the web-application-wide * guacamole.properties file. */ -package net.sourceforge.guacamole.properties; +package org.glyptodon.guacamole.properties; diff --git a/guacamole/pom.xml b/guacamole/pom.xml index e18f343d2..09d8cb496 100644 --- a/guacamole/pom.xml +++ b/guacamole/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole war 0.8.3 @@ -42,7 +42,7 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common-js zip @@ -79,21 +79,21 @@ - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common 0.8.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-ext 0.8.1 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-common-js 0.7.3 zip @@ -102,14 +102,4 @@ - - - - - guac-dev - http://guac-dev.org/repo - - - - diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java similarity index 92% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java index 96205d701..f42d88b19 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop @@ -27,20 +27,20 @@ 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 net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleResourceNotFoundException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.auth.AuthenticationProvider; -import net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.event.SessionListenerCollection; -import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; -import net.sourceforge.guacamole.net.event.AuthenticationFailureEvent; -import net.sourceforge.guacamole.net.event.AuthenticationSuccessEvent; -import net.sourceforge.guacamole.net.event.listener.AuthenticationFailureListener; -import net.sourceforge.guacamole.net.event.listener.AuthenticationSuccessListener; -import net.sourceforge.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleResourceNotFoundException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.auth.AuthenticationProvider; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.event.SessionListenerCollection; +import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties; +import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent; +import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent; +import org.glyptodon.guacamole.net.event.listener.AuthenticationFailureListener; +import org.glyptodon.guacamole.net.event.listener.AuthenticationSuccessListener; +import org.glyptodon.guacamole.properties.GuacamoleProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java similarity index 87% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java index 46345e00b..974d977f1 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop @@ -25,16 +25,16 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Map; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.simple.SimpleAuthenticationProvider; -import net.sourceforge.guacamole.net.basic.auth.Authorization; -import net.sourceforge.guacamole.net.basic.auth.UserMapping; -import net.sourceforge.guacamole.net.basic.xml.DocumentHandler; -import net.sourceforge.guacamole.net.basic.xml.user_mapping.UserMappingTagHandler; -import net.sourceforge.guacamole.properties.FileGuacamoleProperty; -import net.sourceforge.guacamole.properties.GuacamoleProperties; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider; +import org.glyptodon.guacamole.net.basic.auth.Authorization; +import org.glyptodon.guacamole.net.basic.auth.UserMapping; +import org.glyptodon.guacamole.net.basic.xml.DocumentHandler; +import org.glyptodon.guacamole.net.basic.xml.user_mapping.UserMappingTagHandler; +import org.glyptodon.guacamole.properties.FileGuacamoleProperty; +import org.glyptodon.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java similarity index 92% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java index 41ece93bf..015a01cab 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop @@ -25,23 +25,23 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import net.sourceforge.guacamole.GuacamoleClientException; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.GuacamoleTunnel; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.event.SessionListenerCollection; -import net.sourceforge.guacamole.net.event.TunnelCloseEvent; -import net.sourceforge.guacamole.net.event.TunnelConnectEvent; -import net.sourceforge.guacamole.net.event.listener.TunnelCloseListener; -import net.sourceforge.guacamole.net.event.listener.TunnelConnectListener; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; -import net.sourceforge.guacamole.servlet.GuacamoleHTTPTunnelServlet; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.GuacamoleTunnel; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.event.SessionListenerCollection; +import org.glyptodon.guacamole.net.event.TunnelCloseEvent; +import org.glyptodon.guacamole.net.event.TunnelConnectEvent; +import org.glyptodon.guacamole.net.event.listener.TunnelCloseListener; +import org.glyptodon.guacamole.net.event.listener.TunnelConnectListener; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java similarity index 93% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java index f2a56de9d..af9d22f13 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop @@ -20,7 +20,7 @@ package net.sourceforge.guacamole.net.basic; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.auth.UserContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java similarity index 97% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java index 6188daa04..6a5ab2009 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java similarity index 95% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java index 6be2950e5..547431fd8 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop @@ -29,9 +29,9 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Collection; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; -import net.sourceforge.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties; +import org.glyptodon.guacamole.properties.GuacamoleProperties; /** * A ClassLoader implementation which finds classes within a configurable diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolInfo.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolInfo.java similarity index 98% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolInfo.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolInfo.java index 088056717..149190d9c 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolInfo.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolInfo.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolParameter.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameter.java similarity index 99% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolParameter.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameter.java index 4c162f318..4b2319ea6 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolParameter.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameter.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolParameterOption.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameterOption.java similarity index 97% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolParameterOption.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameterOption.java index 5a99d575c..5e7231e6b 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ProtocolParameterOption.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameterOption.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java similarity index 95% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java index 7b40534eb..ecf88c24b 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; /* * Guacamole - Clientless Remote Desktop @@ -24,7 +24,7 @@ import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import net.sourceforge.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ public class WebSocketSupportLoader implements ServletContextListener { // Attempt to find WebSocket servlet Class servlet = (Class) GuacamoleClassLoader.getInstance().findClass( - "net.sourceforge.guacamole.net.basic.BasicGuacamoleWebSocketTunnelServlet" + "org.glyptodon.guacamole.net.basic.BasicGuacamoleWebSocketTunnelServlet" ); // Dynamically add servlet IF SERVLET 3.0 API AVAILABLE! diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/Authorization.java similarity index 98% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/Authorization.java index 241e571d1..4293f0851 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/Authorization.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.auth; +package org.glyptodon.guacamole.net.basic.auth; /* * Guacamole - Clientless Remote Desktop @@ -23,7 +23,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Map; import java.util.TreeMap; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** * Mapping of username/password pair to configuration set. In addition to basic diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/UserMapping.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/UserMapping.java similarity index 97% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/UserMapping.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/UserMapping.java index e21cdc9a4..f130f2e22 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/UserMapping.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/UserMapping.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.auth; +package org.glyptodon.guacamole.net.basic.auth; import java.util.HashMap; import java.util.Map; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/package-info.java similarity index 67% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/package-info.java index 733b1f50c..df9a3765e 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/package-info.java @@ -3,5 +3,5 @@ * Classes which drive the default, basic authentication of the Guacamole * web application. */ -package net.sourceforge.guacamole.net.basic.auth; +package org.glyptodon.guacamole.net.basic.auth; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/ConnectionGroupUtility.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/ConnectionGroupUtility.java similarity index 88% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/ConnectionGroupUtility.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/ConnectionGroupUtility.java index 9ea13973a..f1a6c8e28 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/ConnectionGroupUtility.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/ConnectionGroupUtility.java @@ -16,12 +16,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; /** * A class that provides helper methods for the ConnectionGroup CRUD servlets. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Create.java similarity index 86% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Create.java index 3483576a4..514b64658 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Create.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.connectiongroups; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles connection group creation. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Delete.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Delete.java similarity index 81% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Delete.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Delete.java index d2f9f3ac5..f8a9dbaec 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Delete.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Delete.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.connectiongroups; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles connection group deletion. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/DummyConnectionGroup.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/DummyConnectionGroup.java similarity index 72% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/DummyConnectionGroup.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/DummyConnectionGroup.java index abc0cf202..19a93d460 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/DummyConnectionGroup.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/DummyConnectionGroup.java @@ -1,13 +1,13 @@ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.auth.AbstractConnectionGroup; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup; +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.protocol.GuacamoleClientInformation; /** * Basic ConnectionGroup skeleton, providing a means of storing Connection data diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/List.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/List.java similarity index 89% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/List.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/List.java index 5d75991af..cbce89662 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/List.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/List.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; /* * Guacamole - Clientless Remote Desktop @@ -25,18 +25,18 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -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; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which outputs XML containing a list of all authorized diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Move.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Move.java similarity index 84% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Move.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Move.java index 86cf1a262..51df4b1bd 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Move.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Move.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.connectiongroups; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles moving connection groups. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Update.java similarity index 85% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Update.java index a9f708249..7eeb18425 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/Update.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.connectiongroups; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles connection group update. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/package-info.java similarity index 54% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/package-info.java index 6cb070963..af319d449 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connectiongroups/package-info.java @@ -2,5 +2,5 @@ /** * Servlets dedicated to CRUD operations related to ConnectionGroups. */ -package net.sourceforge.guacamole.net.basic.crud.connectiongroups; +package org.glyptodon.guacamole.net.basic.crud.connectiongroups; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/ConnectionUtility.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/ConnectionUtility.java similarity index 86% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/ConnectionUtility.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/ConnectionUtility.java index 63ff3f42a..0b3f8dd17 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/ConnectionUtility.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/ConnectionUtility.java @@ -16,13 +16,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; +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.UserContext; /** * A class that provides helper methods for the Connection CRUD servlets. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Create.java similarity index 87% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Create.java index 69b424d8f..e01972ef5 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Create.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; /* * Guacamole - Clientless Remote Desktop @@ -21,12 +21,12 @@ package net.sourceforge.guacamole.net.basic.crud.connections; import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** * Simple HttpServlet which handles connection creation. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Delete.java similarity index 81% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Delete.java index 6a6abf96e..5383346b4 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Delete.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.connections; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles connection deletion. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/DummyConnection.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/DummyConnection.java similarity index 72% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/DummyConnection.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/DummyConnection.java index a9f9d8a83..10218faeb 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/DummyConnection.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/DummyConnection.java @@ -1,12 +1,12 @@ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; import java.util.List; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.GuacamoleSocket; -import net.sourceforge.guacamole.net.auth.AbstractConnection; -import net.sourceforge.guacamole.net.auth.ConnectionRecord; -import net.sourceforge.guacamole.protocol.GuacamoleClientInformation; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.GuacamoleSocket; +import org.glyptodon.guacamole.net.auth.AbstractConnection; +import org.glyptodon.guacamole.net.auth.ConnectionRecord; +import org.glyptodon.guacamole.protocol.GuacamoleClientInformation; /** * Basic Connection skeleton, providing a means of storing Connection data diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/List.java similarity index 91% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/List.java index 49eda14e3..e8f20c9fa 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/List.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; /* * Guacamole - Clientless Remote Desktop @@ -25,22 +25,22 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.ConnectionGroup; -import net.sourceforge.guacamole.net.auth.ConnectionRecord; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission; -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; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.ConnectionGroup; +import org.glyptodon.guacamole.net.auth.ConnectionRecord; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** * Simple HttpServlet which outputs XML containing a list of all authorized diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Move.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Move.java similarity index 84% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Move.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Move.java index 03b44090c..6db6ec81e 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Move.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Move.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.connections; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles moving connections. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Update.java similarity index 86% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Update.java index 461a94492..631e20aa5 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/Update.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; /* * Guacamole - Clientless Remote Desktop @@ -21,12 +21,12 @@ package net.sourceforge.guacamole.net.basic.crud.connections; import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Connection; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Connection; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** * Simple HttpServlet which handles connection update. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/package-info.java similarity index 54% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/package-info.java index c52fecb83..1c67b019c 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/connections/package-info.java @@ -2,5 +2,5 @@ /** * Servlets dedicated to CRUD operations related to Connections. */ -package net.sourceforge.guacamole.net.basic.crud.connections; +package org.glyptodon.guacamole.net.basic.crud.connections; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/permissions/List.java similarity index 87% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/permissions/List.java index 355aee7ea..a8aaeae94 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/permissions/List.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.permissions; +package org.glyptodon.guacamole.net.basic.crud.permissions; /* * Guacamole - Clientless Remote Desktop @@ -24,20 +24,20 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import net.sourceforge.guacamole.GuacamoleClientException; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleSecurityException; -import net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission; -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.auth.permission.UserPermission; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleSecurityException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.auth.permission.UserPermission; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which outputs XML containing a list of all visible diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/permissions/package-info.java similarity index 54% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/permissions/package-info.java index b4a22cee0..39b9c68dc 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/permissions/package-info.java @@ -2,5 +2,5 @@ /** * Servlets dedicated to CRUD operations related to Permissions. */ -package net.sourceforge.guacamole.net.basic.crud.permissions; +package org.glyptodon.guacamole.net.basic.crud.permissions; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/protocols/List.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/List.java similarity index 93% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/protocols/List.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/List.java index 38fdd7b17..f219cb42e 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/protocols/List.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/List.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.protocols; +package org.glyptodon.guacamole.net.basic.crud.protocols; /* * Guacamole - Clientless Remote Desktop @@ -31,16 +31,16 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; -import net.sourceforge.guacamole.net.basic.ProtocolInfo; -import net.sourceforge.guacamole.net.basic.ProtocolParameter; -import net.sourceforge.guacamole.net.basic.ProtocolParameterOption; -import net.sourceforge.guacamole.net.basic.xml.DocumentHandler; -import net.sourceforge.guacamole.net.basic.xml.protocol.ProtocolTagHandler; -import net.sourceforge.guacamole.properties.GuacamoleHome; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.net.basic.ProtocolInfo; +import org.glyptodon.guacamole.net.basic.ProtocolParameter; +import org.glyptodon.guacamole.net.basic.ProtocolParameterOption; +import org.glyptodon.guacamole.net.basic.xml.DocumentHandler; +import org.glyptodon.guacamole.net.basic.xml.protocol.ProtocolTagHandler; +import org.glyptodon.guacamole.properties.GuacamoleHome; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/protocols/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/package-info.java similarity index 54% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/protocols/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/package-info.java index db244170f..1d81e17a2 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/protocols/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/package-info.java @@ -2,5 +2,5 @@ /** * Servlets dedicated to CRUD operations related to protocols. */ -package net.sourceforge.guacamole.net.basic.crud.protocols; +package org.glyptodon.guacamole.net.basic.crud.protocols; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Create.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Create.java similarity index 83% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Create.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Create.java index 0d930b72b..e7859c9ce 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Create.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Create.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.users; +package org.glyptodon.guacamole.net.basic.crud.users; /* * Guacamole - Clientless Remote Desktop @@ -21,11 +21,11 @@ package net.sourceforge.guacamole.net.basic.crud.users; import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles user creation. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Delete.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Delete.java similarity index 81% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Delete.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Delete.java index c71faf902..bb42740f7 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Delete.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Delete.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.users; +package org.glyptodon.guacamole.net.basic.crud.users; /* * Guacamole - Clientless Remote Desktop @@ -20,11 +20,11 @@ package net.sourceforge.guacamole.net.basic.crud.users; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles user deletion. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/DummyUser.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/DummyUser.java similarity index 83% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/DummyUser.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/DummyUser.java index ef5302816..8e6bbc5a6 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/DummyUser.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/DummyUser.java @@ -1,11 +1,11 @@ -package net.sourceforge.guacamole.net.basic.crud.users; +package org.glyptodon.guacamole.net.basic.crud.users; import java.util.HashSet; import java.util.Set; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.AbstractUser; -import net.sourceforge.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.AbstractUser; +import org.glyptodon.guacamole.net.auth.permission.Permission; /** * Basic User skeleton, providing a means of storing User data prior to CRUD diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/List.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/List.java similarity index 88% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/List.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/List.java index 15c0a3137..18a7eb1d2 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/List.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/List.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.users; +package org.glyptodon.guacamole.net.basic.crud.users; /* * Guacamole - Clientless Remote Desktop @@ -25,12 +25,12 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.GuacamoleServerException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.GuacamoleServerException; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which outputs XML containing a list of all visible users. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Update.java similarity index 92% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Update.java index 0dd1bed4a..10868b3ae 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/Update.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.crud.users; +package org.glyptodon.guacamole.net.basic.crud.users; /* * Guacamole - Clientless Remote Desktop @@ -20,18 +20,18 @@ package net.sourceforge.guacamole.net.basic.crud.users; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.guacamole.GuacamoleClientException; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.Directory; -import net.sourceforge.guacamole.net.auth.User; -import net.sourceforge.guacamole.net.auth.UserContext; -import net.sourceforge.guacamole.net.auth.permission.ConnectionGroupPermission; -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.auth.permission.UserPermission; -import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet; +import org.glyptodon.guacamole.GuacamoleClientException; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.Directory; +import org.glyptodon.guacamole.net.auth.User; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.net.auth.permission.ConnectionGroupPermission; +import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; +import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; +import org.glyptodon.guacamole.net.auth.permission.Permission; +import org.glyptodon.guacamole.net.auth.permission.SystemPermission; +import org.glyptodon.guacamole.net.auth.permission.UserPermission; +import org.glyptodon.guacamole.net.basic.AuthenticatingHttpServlet; /** * Simple HttpServlet which handles user update. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/package-info.java similarity index 55% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/package-info.java index 53f11c332..12fdcd6e5 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/users/package-info.java @@ -2,5 +2,5 @@ /** * Servlets dedicated to CRUD operations related to Users. */ -package net.sourceforge.guacamole.net.basic.crud.users; +package org.glyptodon.guacamole.net.basic.crud.users; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java similarity index 94% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java index fb89465ee..f354acf0a 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.event; +package org.glyptodon.guacamole.net.basic.event; /* * Guacamole - Clientless Remote Desktop @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import javax.servlet.http.HttpSession; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; -import net.sourceforge.guacamole.properties.GuacamoleProperties; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties; +import org.glyptodon.guacamole.properties.GuacamoleProperties; /** * A collection which iterates over instances of all listeners defined in diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/package-info.java similarity index 61% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/package-info.java index 759cdd739..ec5fc9276 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/package-info.java @@ -2,5 +2,5 @@ /** * Classes used by the Guacamole web application to broadcast events. */ -package net.sourceforge.guacamole.net.basic.event; +package org.glyptodon.guacamole.net.basic.event; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/package-info.java similarity index 75% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/package-info.java index b903d3d80..69ccee980 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/package-info.java @@ -3,5 +3,5 @@ * Classes specific to the general-purpose web application implemented by * the Guacamole project using the Guacamole APIs. */ -package net.sourceforge.guacamole.net.basic; +package org.glyptodon.guacamole.net.basic; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java similarity index 90% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java index 05d3c1bca..8711baa80 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.properties; +package org.glyptodon.guacamole.net.basic.properties; /* * Guacamole - Clientless Remote Desktop @@ -19,10 +19,10 @@ package net.sourceforge.guacamole.net.basic.properties; */ import java.lang.reflect.InvocationTargetException; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.auth.AuthenticationProvider; -import net.sourceforge.guacamole.net.basic.GuacamoleClassLoader; -import net.sourceforge.guacamole.properties.GuacamoleProperty; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.AuthenticationProvider; +import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader; +import org.glyptodon.guacamole.properties.GuacamoleProperty; /** * A GuacamoleProperty whose value is the name of a class to use to diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java similarity index 93% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java index 549a00b76..91e1d384e 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java @@ -1,5 +1,5 @@ -package net.sourceforge.guacamole.net.basic.properties; +package org.glyptodon.guacamole.net.basic.properties; /* * Guacamole - Clientless Remote Desktop @@ -19,7 +19,7 @@ package net.sourceforge.guacamole.net.basic.properties; * along with this program. If not, see . */ -import net.sourceforge.guacamole.properties.FileGuacamoleProperty; +import org.glyptodon.guacamole.properties.FileGuacamoleProperty; /** * Properties used by the default Guacamole web application. diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java similarity index 89% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java index 3f68b7428..5a987eef6 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.properties; +package org.glyptodon.guacamole.net.basic.properties; /* * Guacamole - Clientless Remote Desktop @@ -20,9 +20,9 @@ package net.sourceforge.guacamole.net.basic.properties; import java.util.ArrayList; import java.util.Collection; -import net.sourceforge.guacamole.GuacamoleException; -import net.sourceforge.guacamole.net.basic.GuacamoleClassLoader; -import net.sourceforge.guacamole.properties.GuacamoleProperty; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader; +import org.glyptodon.guacamole.properties.GuacamoleProperty; /** * A GuacamoleProperty whose value is a comma-separated list of class names, diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/package-info.java similarity index 71% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/package-info.java index b349e8ee7..732428038 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/package-info.java @@ -3,5 +3,5 @@ * Classes related to the properties which the Guacamole web application * (and stock parts of it) read from guacamole.properties. */ -package net.sourceforge.guacamole.net.basic.properties; +package org.glyptodon.guacamole.net.basic.properties; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/DocumentHandler.java similarity index 99% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/DocumentHandler.java index 9da30db98..8bbe4b069 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/DocumentHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml; +package org.glyptodon.guacamole.net.basic.xml; /* * Guacamole - Clientless Remote Desktop diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/TagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/TagHandler.java similarity index 98% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/TagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/TagHandler.java index 9dcef32be..08b7ad1f4 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/TagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/TagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml; +package org.glyptodon.guacamole.net.basic.xml; /* * Guacamole - Clientless Remote Desktop diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/package-info.java similarity index 66% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/package-info.java index eebbc6ef4..082fb4cf5 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/package-info.java @@ -3,5 +3,5 @@ * Classes driving the SAX-based XML parser used by the Guacamole web * application. */ -package net.sourceforge.guacamole.net.basic.xml; +package org.glyptodon.guacamole.net.basic.xml; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/OptionTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/OptionTagHandler.java similarity index 90% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/OptionTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/OptionTagHandler.java index d2921a197..8c3f7a422 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/OptionTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/OptionTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.protocol; +package org.glyptodon.guacamole.net.basic.xml.protocol; /* * Guacamole - Clientless Remote Desktop @@ -18,8 +18,8 @@ package net.sourceforge.guacamole.net.basic.xml.protocol; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.ProtocolParameterOption; -import net.sourceforge.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.net.basic.ProtocolParameterOption; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/ParamTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ParamTagHandler.java similarity index 94% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/ParamTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ParamTagHandler.java index 38df58bee..b4223f72f 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/ParamTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ParamTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.protocol; +package org.glyptodon.guacamole.net.basic.xml.protocol; /* * Guacamole - Clientless Remote Desktop @@ -18,8 +18,8 @@ package net.sourceforge.guacamole.net.basic.xml.protocol; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.ProtocolParameter; -import net.sourceforge.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.net.basic.ProtocolParameter; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/ProtocolTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ProtocolTagHandler.java similarity index 92% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/ProtocolTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ProtocolTagHandler.java index 374e8e609..e532b3a03 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/ProtocolTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ProtocolTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.protocol; +package org.glyptodon.guacamole.net.basic.xml.protocol; /* * Guacamole - Clientless Remote Desktop @@ -18,8 +18,8 @@ package net.sourceforge.guacamole.net.basic.xml.protocol; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.ProtocolInfo; -import net.sourceforge.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.net.basic.ProtocolInfo; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/package-info.java similarity index 62% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/package-info.java index 245d1c6d4..dbf78627f 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/protocol/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/package-info.java @@ -3,5 +3,5 @@ * Classes related to parsing XML files which describe the parameters of a * protocol. */ -package net.sourceforge.guacamole.net.basic.xml.protocol; +package org.glyptodon.guacamole.net.basic.xml.protocol; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/AuthorizeTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/AuthorizeTagHandler.java similarity index 93% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/AuthorizeTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/AuthorizeTagHandler.java index 6e7363e45..3e0d0591c 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/AuthorizeTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/AuthorizeTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.user_mapping; +package org.glyptodon.guacamole.net.basic.xml.user_mapping; /* * Guacamole - Clientless Remote Desktop @@ -18,10 +18,10 @@ package net.sourceforge.guacamole.net.basic.xml.user_mapping; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.auth.Authorization; -import net.sourceforge.guacamole.net.basic.auth.UserMapping; -import net.sourceforge.guacamole.net.basic.xml.TagHandler; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.net.basic.auth.Authorization; +import org.glyptodon.guacamole.net.basic.auth.UserMapping; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ConnectionTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ConnectionTagHandler.java similarity index 92% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ConnectionTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ConnectionTagHandler.java index e4d214519..ef30ddb7d 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ConnectionTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ConnectionTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.user_mapping; +package org.glyptodon.guacamole.net.basic.xml.user_mapping; /* * Guacamole - Clientless Remote Desktop @@ -18,9 +18,9 @@ package net.sourceforge.guacamole.net.basic.xml.user_mapping; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.auth.Authorization; -import net.sourceforge.guacamole.net.basic.xml.TagHandler; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.net.basic.auth.Authorization; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ParamTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ParamTagHandler.java similarity index 91% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ParamTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ParamTagHandler.java index d55c72bb6..1e65e2ceb 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ParamTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ParamTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.user_mapping; +package org.glyptodon.guacamole.net.basic.xml.user_mapping; /* * Guacamole - Clientless Remote Desktop @@ -18,8 +18,8 @@ package net.sourceforge.guacamole.net.basic.xml.user_mapping; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.xml.TagHandler; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ProtocolTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ProtocolTagHandler.java similarity index 91% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ProtocolTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ProtocolTagHandler.java index bbffc5df8..14f0753ca 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/ProtocolTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/ProtocolTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.user_mapping; +package org.glyptodon.guacamole.net.basic.xml.user_mapping; /* * Guacamole - Clientless Remote Desktop @@ -18,8 +18,8 @@ package net.sourceforge.guacamole.net.basic.xml.user_mapping; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.xml.TagHandler; -import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/UserMappingTagHandler.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/UserMappingTagHandler.java similarity index 92% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/UserMappingTagHandler.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/UserMappingTagHandler.java index 16d26edde..8160a58f3 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/UserMappingTagHandler.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/UserMappingTagHandler.java @@ -1,4 +1,4 @@ -package net.sourceforge.guacamole.net.basic.xml.user_mapping; +package org.glyptodon.guacamole.net.basic.xml.user_mapping; /* * Guacamole - Clientless Remote Desktop @@ -18,8 +18,8 @@ package net.sourceforge.guacamole.net.basic.xml.user_mapping; * along with this program. If not, see . */ -import net.sourceforge.guacamole.net.basic.auth.UserMapping; -import net.sourceforge.guacamole.net.basic.xml.TagHandler; +import org.glyptodon.guacamole.net.basic.auth.UserMapping; +import org.glyptodon.guacamole.net.basic.xml.TagHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/package-info.java similarity index 51% rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/package-info.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/package-info.java index 2a7a70949..ae85ac7e6 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/user_mapping/package-info.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/user_mapping/package-info.java @@ -2,5 +2,5 @@ /** * Classes related to parsing the user-mapping.xml file. */ -package net.sourceforge.guacamole.net.basic.xml.user_mapping; +package org.glyptodon.guacamole.net.basic.xml.user_mapping; diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml index fd0e8bcda..728d5e699 100644 --- a/guacamole/src/main/webapp/WEB-INF/web.xml +++ b/guacamole/src/main/webapp/WEB-INF/web.xml @@ -30,14 +30,14 @@ - net.sourceforge.guacamole.net.basic.WebSocketSupportLoader + org.glyptodon.guacamole.net.basic.WebSocketSupportLoader Login servlet. Login - net.sourceforge.guacamole.net.basic.BasicLogin + org.glyptodon.guacamole.net.basic.BasicLogin Login @@ -48,7 +48,7 @@ Logout servlet. Logout - net.sourceforge.guacamole.net.basic.BasicLogout + org.glyptodon.guacamole.net.basic.BasicLogout Logout @@ -59,7 +59,7 @@ Connection creation servlet. ConnectionCreate - net.sourceforge.guacamole.net.basic.crud.connections.Create + org.glyptodon.guacamole.net.basic.crud.connections.Create ConnectionCreate @@ -70,7 +70,7 @@ Connection list servlet. Connections - net.sourceforge.guacamole.net.basic.crud.connections.List + org.glyptodon.guacamole.net.basic.crud.connections.List Connections @@ -81,7 +81,7 @@ Connection update servlet. ConnectionUpdate - net.sourceforge.guacamole.net.basic.crud.connections.Update + org.glyptodon.guacamole.net.basic.crud.connections.Update ConnectionUpdate @@ -92,7 +92,7 @@ Connection move servlet. ConnectionMove - net.sourceforge.guacamole.net.basic.crud.connections.Move + org.glyptodon.guacamole.net.basic.crud.connections.Move ConnectionMove @@ -103,7 +103,7 @@ Connection deletion servlet. ConnectionDelete - net.sourceforge.guacamole.net.basic.crud.connections.Delete + org.glyptodon.guacamole.net.basic.crud.connections.Delete ConnectionDelete @@ -114,7 +114,7 @@ ConnectionGroup creation servlet. ConnectionGroupCreate - net.sourceforge.guacamole.net.basic.crud.connectiongroups.Create + org.glyptodon.guacamole.net.basic.crud.connectiongroups.Create ConnectionGroupCreate @@ -125,7 +125,7 @@ ConnectionGroup list servlet. ConnectionGroups - net.sourceforge.guacamole.net.basic.crud.connectiongroups.List + org.glyptodon.guacamole.net.basic.crud.connectiongroups.List ConnectionGroups @@ -136,7 +136,7 @@ ConnectionGroup update servlet. ConnectionGroupUpdate - net.sourceforge.guacamole.net.basic.crud.connectiongroups.Update + org.glyptodon.guacamole.net.basic.crud.connectiongroups.Update ConnectionGroupUpdate @@ -147,7 +147,7 @@ ConnectionGroup move servlet. ConnectionGroupMove - net.sourceforge.guacamole.net.basic.crud.connectiongroups.Move + org.glyptodon.guacamole.net.basic.crud.connectiongroups.Move ConnectionGroupMove @@ -158,7 +158,7 @@ ConnectionGroup deletion servlet. ConnectionGroupDelete - net.sourceforge.guacamole.net.basic.crud.connectiongroups.Delete + org.glyptodon.guacamole.net.basic.crud.connectiongroups.Delete ConnectionGroupDelete @@ -169,7 +169,7 @@ User creation servlet. UserCreate - net.sourceforge.guacamole.net.basic.crud.users.Create + org.glyptodon.guacamole.net.basic.crud.users.Create UserCreate @@ -180,7 +180,7 @@ User list servlet. Users - net.sourceforge.guacamole.net.basic.crud.users.List + org.glyptodon.guacamole.net.basic.crud.users.List Users @@ -191,7 +191,7 @@ User update servlet. UserUpdate - net.sourceforge.guacamole.net.basic.crud.users.Update + org.glyptodon.guacamole.net.basic.crud.users.Update UserUpdate @@ -202,7 +202,7 @@ User deletion servlet. UserDelete - net.sourceforge.guacamole.net.basic.crud.users.Delete + org.glyptodon.guacamole.net.basic.crud.users.Delete UserDelete @@ -213,7 +213,7 @@ Permission list servlet. Permissions - net.sourceforge.guacamole.net.basic.crud.permissions.List + org.glyptodon.guacamole.net.basic.crud.permissions.List Permissions @@ -224,7 +224,7 @@ Protocol list servlet. Protocols - net.sourceforge.guacamole.net.basic.crud.protocols.List + org.glyptodon.guacamole.net.basic.crud.protocols.List Protocols @@ -235,7 +235,7 @@ Tunnel servlet. Tunnel - net.sourceforge.guacamole.net.basic.BasicGuacamoleTunnelServlet + org.glyptodon.guacamole.net.basic.BasicGuacamoleTunnelServlet Tunnel diff --git a/pom.xml b/pom.xml index 5892c47f9..4c7e6efce 100644 --- a/pom.xml +++ b/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"> 4.0.0 - net.sourceforge.guacamole + org.glyptodon.guacamole guacamole-client pom 0.8.2