This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit daac252f981b679434b87802f07d27079863d760
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Fri Jan 8 06:35:02 2021 +0200
[SSHD-1091] Renamed sshd-contrib top-level package in order to align naming
convention.
---
.../client/auth/password/InteractivePasswordIdentityProvider.java | 3 ++-
.../common/channel/throttle/ThrottlingChannelStreamWriter.java | 4 +++-
.../sshd/{ => contrib}/common/compression/DeflatingInputStream.java | 4 ++--
.../helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java | 3 ++-
.../apache/sshd/{ => contrib}/common/signature/LegacyDSASigner.java | 3 ++-
.../common/util/io/ExposedBufferByteArrayOutputStream.java | 2 +-
.../apache/sshd/{ => contrib}/common/util/io/LineOutputStream.java | 2 +-
.../androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java | 2 +-
.../{ => contrib}/server/scp/SimpleAccessControlScpEventListener.java | 2 +-
.../server/session/proxyprotocol/ProxyProtocolAcceptor.java | 2 +-
.../server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java | 2 +-
.../server/subsystem/sftp/SimpleAccessControlSftpEventListener.java | 2 +-
.../client/auth/password/InteractivePasswordIdentityProviderTest.java | 3 ++-
.../common/channel/throttle/ThrottlingChannelStreamWriterTest.java | 3 ++-
.../sshd/{ => contrib}/common/signature/LegacyDSASignerTest.java | 3 ++-
.../sshd/{ => contrib}/common/util/io/LineOutputStreamTest.java | 3 ++-
.../server/scp/SimpleAccessControlScpEventListenerTest.java | 2 +-
.../subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java | 2 +-
.../org/apache/sshd/{ => contrib}/common/signature/ssh-dss-1024 | 0
.../org/apache/sshd/{ => contrib}/common/signature/ssh-dss-2048 | 0
20 files changed, 28 insertions(+), 19 deletions(-)
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/client/auth/password/InteractivePasswordIdentityProvider.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java
similarity index 97%
rename from
sshd-contrib/src/main/java/org/apache/sshd/client/auth/password/InteractivePasswordIdentityProvider.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java
index 855587d..4f0846f 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/client/auth/password/InteractivePasswordIdentityProvider.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sshd.client.auth.password;
+package org.apache.sshd.contrib.client.auth.password;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -24,6 +24,7 @@ import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.sshd.client.auth.keyboard.UserInteraction;
+import org.apache.sshd.client.auth.password.PasswordIdentityProvider;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.client.session.ClientSessionHolder;
import org.apache.sshd.common.session.SessionHolder;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/channel/throttle/ThrottlingChannelStreamWriter.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/channel/throttle/ThrottlingChannelStreamWriter.java
similarity index 97%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/channel/throttle/ThrottlingChannelStreamWriter.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/channel/throttle/ThrottlingChannelStreamWriter.java
index 5092b5e..addf088 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/channel/throttle/ThrottlingChannelStreamWriter.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/channel/throttle/ThrottlingChannelStreamWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sshd.common.channel.throttle;
+package org.apache.sshd.contrib.common.channel.throttle;
import java.io.EOFException;
import java.io.IOException;
@@ -32,6 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sshd.common.Property;
import org.apache.sshd.common.PropertyResolver;
import org.apache.sshd.common.channel.Channel;
+import org.apache.sshd.common.channel.throttle.ChannelStreamWriter;
+import org.apache.sshd.common.channel.throttle.DefaultChannelStreamWriter;
import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.io.IoWriteFuture;
import org.apache.sshd.common.util.ValidateUtils;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/compression/DeflatingInputStream.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/compression/DeflatingInputStream.java
similarity index 97%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/compression/DeflatingInputStream.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/compression/DeflatingInputStream.java
index 470b132..9f80d23 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/compression/DeflatingInputStream.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/compression/DeflatingInputStream.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.compression;
+package org.apache.sshd.contrib.common.compression;
import java.io.IOException;
import java.io.InputStream;
@@ -26,8 +26,8 @@ import java.io.StreamCorruptedException;
import java.util.Objects;
import org.apache.sshd.common.util.GenericUtils;
-import org.apache.sshd.common.util.io.ExposedBufferByteArrayOutputStream;
import org.apache.sshd.common.util.io.IoUtils;
+import
org.apache.sshd.contrib.common.util.io.ExposedBufferByteArrayOutputStream;
/**
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/session/helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/session/helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java
similarity index 96%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/session/helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/session/helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java
index f133cde..e791d1c 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/session/helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/session/helpers/ChannelIdTrackingUnknownChannelReferenceHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.session.helpers;
+package org.apache.sshd.contrib.common.session.helpers;
import java.io.IOException;
@@ -28,6 +28,7 @@ import org.apache.sshd.common.channel.ChannelListener;
import org.apache.sshd.common.channel.exception.SshChannelNotFoundException;
import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.session.Session;
+import
org.apache.sshd.common.session.helpers.DefaultUnknownChannelReferenceHandler;
import org.apache.sshd.common.util.buffer.Buffer;
/**
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/signature/LegacyDSASigner.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/signature/LegacyDSASigner.java
similarity index 98%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/signature/LegacyDSASigner.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/signature/LegacyDSASigner.java
index 1645ec0..8999e19 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/signature/LegacyDSASigner.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/signature/LegacyDSASigner.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.signature;
+package org.apache.sshd.contrib.common.signature;
import java.io.IOException;
import java.math.BigInteger;
@@ -37,6 +37,7 @@ import java.util.Arrays;
import org.apache.sshd.common.Factory;
import org.apache.sshd.common.random.Random;
+import org.apache.sshd.common.signature.SignatureDSA;
import org.apache.sshd.common.util.ValidateUtils;
import org.apache.sshd.common.util.io.der.DERParser;
import org.apache.sshd.common.util.io.der.DERWriter;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/util/io/ExposedBufferByteArrayOutputStream.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
similarity index 96%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/util/io/ExposedBufferByteArrayOutputStream.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
index 2ba92d6..e64f8ff 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/util/io/ExposedBufferByteArrayOutputStream.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.util.io;
+package org.apache.sshd.contrib.common.util.io;
import java.io.ByteArrayOutputStream;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/util/io/LineOutputStream.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/LineOutputStream.java
similarity index 98%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/util/io/LineOutputStream.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/LineOutputStream.java
index 44012bc..b5085b1 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/util/io/LineOutputStream.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/LineOutputStream.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.util.io;
+package org.apache.sshd.contrib.common.util.io;
import java.io.IOException;
import java.io.OutputStream;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/common/util/security/androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/security/androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java
similarity index 96%
rename from
sshd-contrib/src/main/java/org/apache/sshd/common/util/security/androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/security/androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java
index 187bc29..5be511d 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/common/util/security/androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/security/androidopenssl/AndroidOpenSSLSecurityProviderRegistrar.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sshd.common.util.security.androidopenssl;
+package org.apache.sshd.contrib.common.util.security.androidopenssl;
import java.security.Provider;
import java.security.Security;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/server/scp/SimpleAccessControlScpEventListener.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/scp/SimpleAccessControlScpEventListener.java
similarity index 98%
rename from
sshd-contrib/src/main/java/org/apache/sshd/server/scp/SimpleAccessControlScpEventListener.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/server/scp/SimpleAccessControlScpEventListener.java
index 40e757c..ace3332 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/server/scp/SimpleAccessControlScpEventListener.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/scp/SimpleAccessControlScpEventListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.scp;
+package org.apache.sshd.contrib.server.scp;
import java.io.IOException;
import java.nio.file.AccessDeniedException;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/server/session/proxyprotocol/ProxyProtocolAcceptor.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/session/proxyprotocol/ProxyProtocolAcceptor.java
similarity index 98%
rename from
sshd-contrib/src/main/java/org/apache/sshd/server/session/proxyprotocol/ProxyProtocolAcceptor.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/server/session/proxyprotocol/ProxyProtocolAcceptor.java
index 05e3f69..21f65b0 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/server/session/proxyprotocol/ProxyProtocolAcceptor.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/session/proxyprotocol/ProxyProtocolAcceptor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.session.proxyprotocol;
+package org.apache.sshd.contrib.server.session.proxyprotocol;
import java.net.InetSocketAddress;
import java.util.Arrays;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java
similarity index 97%
rename from
sshd-contrib/src/main/java/org/apache/sshd/server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java
index ef78d19..62b574c 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/subsystem/sftp/DetailedSftpErrorStatusDataHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.subsystem.sftp;
+package org.apache.sshd.contrib.server.subsystem.sftp;
import java.nio.file.FileSystemException;
import java.util.Objects;
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/server/subsystem/sftp/SimpleAccessControlSftpEventListener.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/subsystem/sftp/SimpleAccessControlSftpEventListener.java
similarity index 99%
rename from
sshd-contrib/src/main/java/org/apache/sshd/server/subsystem/sftp/SimpleAccessControlSftpEventListener.java
rename to
sshd-contrib/src/main/java/org/apache/sshd/contrib/server/subsystem/sftp/SimpleAccessControlSftpEventListener.java
index 55474de..fa8c9b3 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/server/subsystem/sftp/SimpleAccessControlSftpEventListener.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/server/subsystem/sftp/SimpleAccessControlSftpEventListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.subsystem.sftp;
+package org.apache.sshd.contrib.server.subsystem.sftp;
import java.io.IOException;
import java.nio.file.AccessDeniedException;
diff --git
a/sshd-contrib/src/test/java/org/apache/sshd/client/auth/password/InteractivePasswordIdentityProviderTest.java
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProviderTest.java
similarity index 97%
rename from
sshd-contrib/src/test/java/org/apache/sshd/client/auth/password/InteractivePasswordIdentityProviderTest.java
rename to
sshd-contrib/src/test/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProviderTest.java
index 4f8ba5f..ee381cb 100644
---
a/sshd-contrib/src/test/java/org/apache/sshd/client/auth/password/InteractivePasswordIdentityProviderTest.java
+++
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProviderTest.java
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sshd.client.auth.password;
+package org.apache.sshd.contrib.client.auth.password;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sshd.client.auth.keyboard.UserInteraction;
+import org.apache.sshd.client.auth.password.PasswordIdentityProvider;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.NoIoTestCase;
diff --git
a/sshd-contrib/src/test/java/org/apache/sshd/common/channel/throttle/ThrottlingChannelStreamWriterTest.java
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/common/channel/throttle/ThrottlingChannelStreamWriterTest.java
similarity index 97%
rename from
sshd-contrib/src/test/java/org/apache/sshd/common/channel/throttle/ThrottlingChannelStreamWriterTest.java
rename to
sshd-contrib/src/test/java/org/apache/sshd/contrib/common/channel/throttle/ThrottlingChannelStreamWriterTest.java
index 14eb5ca..d9ed03b 100644
---
a/sshd-contrib/src/test/java/org/apache/sshd/common/channel/throttle/ThrottlingChannelStreamWriterTest.java
+++
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/common/channel/throttle/ThrottlingChannelStreamWriterTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sshd.common.channel.throttle;
+package org.apache.sshd.contrib.common.channel.throttle;
import java.io.IOException;
import java.io.StreamCorruptedException;
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.sshd.common.channel.IoWriteFutureImpl;
+import org.apache.sshd.common.channel.throttle.ChannelStreamWriter;
import org.apache.sshd.common.io.IoWriteFuture;
import org.apache.sshd.common.util.buffer.Buffer;
import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
diff --git
a/sshd-contrib/src/test/java/org/apache/sshd/common/signature/LegacyDSASignerTest.java
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/common/signature/LegacyDSASignerTest.java
similarity index 98%
rename from
sshd-contrib/src/test/java/org/apache/sshd/common/signature/LegacyDSASignerTest.java
rename to
sshd-contrib/src/test/java/org/apache/sshd/contrib/common/signature/LegacyDSASignerTest.java
index f9645b4..1ab162a 100644
---
a/sshd-contrib/src/test/java/org/apache/sshd/common/signature/LegacyDSASignerTest.java
+++
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/common/signature/LegacyDSASignerTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.signature;
+package org.apache.sshd.contrib.common.signature;
import java.io.IOException;
import java.net.URL;
@@ -32,6 +32,7 @@ import org.apache.sshd.common.config.keys.KeyUtils;
import
org.apache.sshd.common.config.keys.loader.pem.DSSPEMResourceKeyPairParser;
import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.random.JceRandomFactory;
+import org.apache.sshd.common.signature.SignatureDSA;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.ValidateUtils;
import org.apache.sshd.common.util.security.SecurityUtils;
diff --git
a/sshd-contrib/src/test/java/org/apache/sshd/common/util/io/LineOutputStreamTest.java
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/common/util/io/LineOutputStreamTest.java
similarity index 97%
rename from
sshd-contrib/src/test/java/org/apache/sshd/common/util/io/LineOutputStreamTest.java
rename to
sshd-contrib/src/test/java/org/apache/sshd/contrib/common/util/io/LineOutputStreamTest.java
index 5107f1b..7e58da1 100644
---
a/sshd-contrib/src/test/java/org/apache/sshd/common/util/io/LineOutputStreamTest.java
+++
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/common/util/io/LineOutputStreamTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.common.util.io;
+package org.apache.sshd.contrib.common.util.io;
import java.io.IOException;
import java.io.InputStream;
@@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.sshd.common.util.io.IoUtils;
import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory;
import org.apache.sshd.util.test.JUnitTestSupport;
import org.apache.sshd.util.test.NoIoTestCase;
diff --git
a/sshd-contrib/src/test/java/org/apache/sshd/server/scp/SimpleAccessControlScpEventListenerTest.java
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/server/scp/SimpleAccessControlScpEventListenerTest.java
similarity index 99%
rename from
sshd-contrib/src/test/java/org/apache/sshd/server/scp/SimpleAccessControlScpEventListenerTest.java
rename to
sshd-contrib/src/test/java/org/apache/sshd/contrib/server/scp/SimpleAccessControlScpEventListenerTest.java
index d270387..9aeee01 100644
---
a/sshd-contrib/src/test/java/org/apache/sshd/server/scp/SimpleAccessControlScpEventListenerTest.java
+++
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/server/scp/SimpleAccessControlScpEventListenerTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.scp;
+package org.apache.sshd.contrib.server.scp;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
diff --git
a/sshd-contrib/src/test/java/org/apache/sshd/server/subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/server/subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java
similarity index 99%
rename from
sshd-contrib/src/test/java/org/apache/sshd/server/subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java
rename to
sshd-contrib/src/test/java/org/apache/sshd/contrib/server/subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java
index c83eed6..78ba222 100644
---
a/sshd-contrib/src/test/java/org/apache/sshd/server/subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java
+++
b/sshd-contrib/src/test/java/org/apache/sshd/contrib/server/subsystem/sftp/SimpleAccessControlSftpEventListenerTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sshd.server.subsystem.sftp;
+package org.apache.sshd.contrib.server.subsystem.sftp;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
diff --git
a/sshd-contrib/src/test/resources/org/apache/sshd/common/signature/ssh-dss-1024
b/sshd-contrib/src/test/resources/org/apache/sshd/contrib/common/signature/ssh-dss-1024
similarity index 100%
rename from
sshd-contrib/src/test/resources/org/apache/sshd/common/signature/ssh-dss-1024
rename to
sshd-contrib/src/test/resources/org/apache/sshd/contrib/common/signature/ssh-dss-1024
diff --git
a/sshd-contrib/src/test/resources/org/apache/sshd/common/signature/ssh-dss-2048
b/sshd-contrib/src/test/resources/org/apache/sshd/contrib/common/signature/ssh-dss-2048
similarity index 100%
rename from
sshd-contrib/src/test/resources/org/apache/sshd/common/signature/ssh-dss-2048
rename to
sshd-contrib/src/test/resources/org/apache/sshd/contrib/common/signature/ssh-dss-2048
