From 4198c33df6d9edf781e14bff2d2d7a7996396cfc Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 22 Mar 2016 14:27:16 -0700
Subject: [PATCH] GUACAMOLE-1: Refactor old net.sourceforge package to
 org.apache.

---
 .../guacamole}/auth/mysql/MySQLAuthenticationProvider.java      | 2 +-
 .../auth/mysql/MySQLAuthenticationProviderModule.java           | 2 +-
 .../apache/guacamole}/auth/mysql/MySQLEnvironment.java          | 2 +-
 .../apache/guacamole}/auth/mysql/MySQLGuacamoleProperties.java  | 2 +-
 .../net => org/apache/guacamole}/auth/mysql/package-info.java   | 2 +-
 .../src/main/resources/guac-manifest.json                       | 2 +-
 .../apache/guacamole}/auth/ldap/LDAPAuthenticationProvider.java | 2 +-
 .../guacamole/auth/ldap/connection/ConnectionService.java       | 2 +-
 .../java/org/apache/guacamole/auth/ldap/user/UserContext.java   | 2 +-
 .../guacamole-auth-ldap/src/main/resources/guac-manifest.json   | 2 +-
 .../guacamole}/auth/noauth/NoAuthConfigContentHandler.java      | 2 +-
 .../apache/guacamole}/auth/noauth/NoAuthenticationProvider.java | 2 +-
 .../guacamole-auth-noauth/src/main/resources/guac-manifest.json | 2 +-
 .../guacamole/net/basic/BasicFileAuthenticationProvider.java    | 2 +-
 .../apache/guacamole/net/basic/extension/ExtensionModule.java   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
 rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/mysql/MySQLAuthenticationProvider.java (98%)
 rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/mysql/MySQLAuthenticationProviderModule.java (98%)
 rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/mysql/MySQLEnvironment.java (99%)
 rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/mysql/MySQLGuacamoleProperties.java (99%)
 rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/mysql/package-info.java (96%)
 rename extensions/guacamole-auth-ldap/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/ldap/LDAPAuthenticationProvider.java (98%)
 rename extensions/guacamole-auth-noauth/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/noauth/NoAuthConfigContentHandler.java (98%)
 rename extensions/guacamole-auth-noauth/src/main/java/{net/sourceforge/guacamole/net => org/apache/guacamole}/auth/noauth/NoAuthenticationProvider.java (99%)
 rename guacamole/src/main/java/{net/sourceforge => org/apache}/guacamole/net/basic/BasicFileAuthenticationProvider.java (99%)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java
index e1c3bc8b5..7ea12841e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.apache.guacamole.auth.mysql;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
index 3f1f11a6b..4da003cfa 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.apache.guacamole.auth.mysql;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
similarity index 99%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
index c81212d44..dbcf9dfe5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.apache.guacamole.auth.mysql;
 
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
similarity index 99%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
index 549b07945..47f2a44ce 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.apache.guacamole.auth.mysql;
 
 import org.apache.guacamole.properties.BooleanGuacamoleProperty;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/package-info.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/package-info.java
index dc06ee67a..a915e5b37 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/package-info.java
@@ -24,4 +24,4 @@
  * The MySQL authentication provider. This package exists outside of
  * org.apache for backwards-compatibility.
  */
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.apache.guacamole.auth.mysql;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
index d219fb692..30f968ad5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
@@ -6,7 +6,7 @@
     "namespace" : "guac-mysql",
 
     "authProviders" : [
-        "net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider"
+        "org.apache.guacamole.auth.mysql.MySQLAuthenticationProvider"
     ],
 
     "translations" : [
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/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java
similarity index 98%
rename from extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java
index ae1722c23..72c1f76e1 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/org/apache/guacamole/auth/ldap/LDAPAuthenticationProvider.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 
 import org.apache.guacamole.auth.ldap.AuthenticationProviderService;
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
index 651ec4fed..7de461990 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
@@ -32,7 +32,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider;
+import org.apache.guacamole.auth.ldap.LDAPAuthenticationProvider;
 import org.apache.guacamole.auth.ldap.ConfigurationService;
 import org.apache.guacamole.auth.ldap.EscapingService;
 import org.apache.guacamole.GuacamoleException;
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
index 32d800a17..ee6543552 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
@@ -26,7 +26,7 @@ import com.google.inject.Inject;
 import com.novell.ldap.LDAPConnection;
 import java.util.Collection;
 import java.util.Collections;
-import net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider;
+import org.apache.guacamole.auth.ldap.LDAPAuthenticationProvider;
 import org.apache.guacamole.auth.ldap.connection.ConnectionService;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.form.Form;
diff --git a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
index e9448cfb3..ed0b1ce24 100644
--- a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
@@ -6,7 +6,7 @@
     "namespace" : "guac-ldap",
 
     "authProviders" : [
-        "net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider"
+        "org.apache.guacamole.auth.ldap.LDAPAuthenticationProvider"
     ],
 
     "translations" : [
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/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java
similarity index 98%
rename from extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java
rename to extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java
index 3e11993ef..ee9550df1 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/org/apache/guacamole/auth/noauth/NoAuthConfigContentHandler.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.noauth;
+package org.apache.guacamole.auth.noauth;
 
 import java.util.Collections;
 import java.util.HashMap;
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/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
similarity index 99%
rename from extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java
rename to extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
index d2c0c47e6..506f47c47 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/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.noauth;
+package org.apache.guacamole.auth.noauth;
 
 import java.util.Map;
 import java.io.BufferedReader;
diff --git a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
index c7d2bfa82..5446702aa 100644
--- a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
@@ -6,7 +6,7 @@
     "namespace" : "guac-noauth",
 
     "authProviders" : [
-        "net.sourceforge.guacamole.net.auth.noauth.NoAuthenticationProvider"
+        "org.apache.guacamole.auth.noauth.NoAuthenticationProvider"
     ],
 
     "translations" : [
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicFileAuthenticationProvider.java
similarity index 99%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/BasicFileAuthenticationProvider.java
index 4653eb640..7fe6bbd20 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java
index bc83f74d2..7fcf6d4fb 100644
--- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java
@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import net.sourceforge.guacamole.net.basic.BasicFileAuthenticationProvider;
+import org.apache.guacamole.net.basic.BasicFileAuthenticationProvider;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.GuacamoleServerException;
 import org.apache.guacamole.environment.Environment;