This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit e040cb4dd0aad8a57061412bfafe8c1e77f2b301
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jul 21 10:01:57 2020 +0200
[SSHD-1038] Refactor packages from a module into a cleaner hierarchy
renamed: sshd-ldap: org.apache.sshd.server.auth -> org.apache.sshd.ldap
renamed: sshd-ldap: org.apache.sshd.common.util.net ->
org.apache.sshd.ldap
renamed: sshd-ldap: org.apache.sshd.server.auth -> org.apache.sshd.ldap
renamed: sshd-ldap: org.apache.sshd.server.auth.password ->
org.apache.sshd.ldap
renamed: sshd-ldap: org.apache.sshd.server.auth.pubkey ->
org.apache.sshd.ldap
---
.../org/apache/sshd/{server/auth => ldap}/LdapAuthenticator.java | 3 +--
.../apache/sshd/{common/util/net => ldap}/LdapNetworkConnector.java | 3 ++-
.../{server/auth/password => ldap}/LdapPasswordAuthenticator.java | 5 +++--
.../{server/auth/pubkey => ldap}/LdapPublickeyAuthenticator.java | 4 ++--
sshd-ldap/src/main/resources/.gitignore | 0
.../org/apache/sshd/{server/auth => ldap}/BaseAuthenticatorTest.java | 2 +-
.../auth/password => ldap}/LdapPasswordAuthenticatorTest.java | 3 +--
.../{server/auth/pubkey => ldap}/LdapPublickeyAuthenticatorTest.java | 3 +--
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/LdapAuthenticator.java
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapAuthenticator.java
similarity index 93%
rename from
sshd-ldap/src/main/java/org/apache/sshd/server/auth/LdapAuthenticator.java
rename to sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapAuthenticator.java
index 2544f35..ad04441 100644
--- a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/LdapAuthenticator.java
+++ b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapAuthenticator.java
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.sshd.server.auth;
+package org.apache.sshd.ldap;
-import org.apache.sshd.common.util.net.LdapNetworkConnector;
import org.apache.sshd.server.session.ServerSession;
/**
diff --git
a/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
similarity index 99%
rename from
sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java
rename to sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
index a3352cb..cf596f6 100644
---
a/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java
+++ b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.util.net;
+package org.apache.sshd.ldap;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -44,6 +44,7 @@ import org.apache.sshd.common.PropertyResolverUtils;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.ValidateUtils;
import org.apache.sshd.common.util.buffer.BufferUtils;
+import org.apache.sshd.common.util.net.NetworkConnector;
/**
* Uses the <A
HREF="http://docs.oracle.com/javase/7/docs/technotes/guides/jndi/jndi-ldap.html";>
LDAP Naming Service
diff --git
a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticator.java
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
similarity index 95%
rename from
sshd-ldap/src/main/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticator.java
rename to
sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
index 818a2b2..ebec2db 100644
---
a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticator.java
+++
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
@@ -17,13 +17,14 @@
* under the License.
*/
-package org.apache.sshd.server.auth.password;
+package org.apache.sshd.ldap;
import java.util.Map;
import javax.naming.NamingException;
-import org.apache.sshd.server.auth.LdapAuthenticator;
+import org.apache.sshd.server.auth.password.PasswordAuthenticator;
+import org.apache.sshd.server.auth.password.PasswordChangeRequiredException;
import org.apache.sshd.server.session.ServerSession;
/**
diff --git
a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPublickeyAuthenticator.java
similarity index 99%
rename from
sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java
rename to
sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPublickeyAuthenticator.java
index 6d7331b..fa72845 100644
---
a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java
+++
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPublickeyAuthenticator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.auth.pubkey;
+package org.apache.sshd.ldap;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -36,7 +36,7 @@ import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.ValidateUtils;
-import org.apache.sshd.server.auth.LdapAuthenticator;
+import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.server.session.ServerSession;
/**
diff --git a/sshd-ldap/src/main/resources/.gitignore
b/sshd-ldap/src/main/resources/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git
a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java
b/sshd-ldap/src/test/java/org/apache/sshd/ldap/BaseAuthenticatorTest.java
similarity index 99%
rename from
sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java
rename to
sshd-ldap/src/test/java/org/apache/sshd/ldap/BaseAuthenticatorTest.java
index 6e5a1cd..d2a37ec 100644
---
a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java
+++ b/sshd-ldap/src/test/java/org/apache/sshd/ldap/BaseAuthenticatorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.auth;
+package org.apache.sshd.ldap;
import java.util.Comparator;
import java.util.Map;
diff --git
a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java
b/sshd-ldap/src/test/java/org/apache/sshd/ldap/LdapPasswordAuthenticatorTest.java
similarity index 96%
rename from
sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java
rename to
sshd-ldap/src/test/java/org/apache/sshd/ldap/LdapPasswordAuthenticatorTest.java
index c66d1f1..a40978c 100644
---
a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java
+++
b/sshd-ldap/src/test/java/org/apache/sshd/ldap/LdapPasswordAuthenticatorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.auth.password;
+package org.apache.sshd.ldap;
import java.util.Map;
@@ -28,7 +28,6 @@ import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.integ.CreateLdapServerRule;
import org.apache.sshd.common.util.GenericUtils;
-import org.apache.sshd.server.auth.BaseAuthenticatorTest;
import org.apache.sshd.server.session.ServerSession;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
diff --git
a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java
b/sshd-ldap/src/test/java/org/apache/sshd/ldap/LdapPublickeyAuthenticatorTest.java
similarity index 97%
rename from
sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java
rename to
sshd-ldap/src/test/java/org/apache/sshd/ldap/LdapPublickeyAuthenticatorTest.java
index 1040a09..b7f1ac7 100644
---
a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java
+++
b/sshd-ldap/src/test/java/org/apache/sshd/ldap/LdapPublickeyAuthenticatorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.auth.pubkey;
+package org.apache.sshd.ldap;
import java.security.PublicKey;
import java.util.Collections;
@@ -36,7 +36,6 @@ import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;
import org.apache.sshd.common.util.GenericUtils;
-import org.apache.sshd.server.auth.BaseAuthenticatorTest;
import org.apache.sshd.server.session.ServerSession;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
