GUACAMOLE-1: Refactor old net.sourceforge package to org.apache.

glyptodon · Mar 29, 2016 · 4198c33 · 4198c33
1 parent 1f7d9bb
commit 4198c33
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/...th/mysql/MySQLAuthenticationProvider.java → ...th/mysql/MySQLAuthenticationProvider.java b/...th/mysql/MySQLAuthenticationProvider.java → ...th/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/...ql/MySQLAuthenticationProviderModule.java → ...ql/MySQLAuthenticationProviderModule.java b/...ql/MySQLAuthenticationProviderModule.java → ...ql/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/...mole/net/auth/mysql/MySQLEnvironment.java → ...uacamole/auth/mysql/MySQLEnvironment.java b/...mole/net/auth/mysql/MySQLEnvironment.java → ...uacamole/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/.../auth/mysql/MySQLGuacamoleProperties.java → .../auth/mysql/MySQLGuacamoleProperties.java b/.../auth/mysql/MySQLGuacamoleProperties.java → .../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/...uacamole/net/auth/mysql/package-info.java → ...he/guacamole/auth/mysql/package-info.java b/...uacamole/net/auth/mysql/package-info.java → ...he/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/...acamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json b/...acamole-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/...auth/ldap/LDAPAuthenticationProvider.java → ...auth/ldap/LDAPAuthenticationProvider.java b/...auth/ldap/LDAPAuthenticationProvider.java → ...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/...-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java b/...-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
@@ -32,7 +32,7 @@
 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/...ns/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java b/...ns/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
@@ -26,7 +26,7 @@
 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
@@ -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/...th/noauth/NoAuthConfigContentHandler.java → ...th/noauth/NoAuthConfigContentHandler.java b/...th/noauth/NoAuthConfigContentHandler.java → ...th/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/...auth/noauth/NoAuthenticationProvider.java → ...auth/noauth/NoAuthenticationProvider.java b/...auth/noauth/NoAuthenticationProvider.java → ...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
@@ -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/...asic/BasicFileAuthenticationProvider.java → ...asic/BasicFileAuthenticationProvider.java b/...asic/BasicFileAuthenticationProvider.java → ...asic/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
@@ -32,7 +32,7 @@
 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;