refactor some of the packages, update licenesing

This commit is contained in:
mohammed jasem alaajel 2023-03-17 21:47:17 +04:00
parent a0cafa3e62
commit 21364a3f63
No known key found for this signature in database
8 changed files with 26 additions and 26 deletions

View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.ryanmichela</groupId>
<artifactId>sshd</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</parent>
<artifactId>Minecraft-SSHD-Bukkit</artifactId>
@ -17,6 +17,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<!-- License: This module extends bukkit which is GPL v2 -->
<licenses>
<license>
<name>GPL2</name>
<url>http://www.gnu.org/licenses/gpl-2.0.html</url>
</license>
</licenses>
<dependencies>
<dependency>
@ -24,7 +32,6 @@
<artifactId>spigot-api</artifactId>
<version>1.19.4-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -1,5 +1,6 @@
package com.ryanmichela.sshd;
import com.ryanmichela.sshd.jline.ConsoleShellFactory;
import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
import org.apache.sshd.common.session.helpers.AbstractSession;
import org.apache.sshd.contrib.server.subsystem.sftp.SimpleAccessControlSftpEventListener;
@ -19,9 +20,7 @@ import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.logging.Level;
import java.util.stream.Stream;
/**
* Copyright 2013 Ryan Michela

View File

@ -1,4 +1,4 @@
package com.ryanmichela.sshd.implementations;
package com.ryanmichela.sshd.implementations.commandsenders;
import com.ryanmichela.sshd.SshdPlugin;
import org.bukkit.Bukkit;
@ -14,7 +14,7 @@ import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import com.ryanmichela.sshd.ConsoleShellFactory;
import com.ryanmichela.sshd.jline.ConsoleShellFactory;
import com.ryanmichela.sshd.ConsoleLogFormatter;
import java.io.IOException;

View File

@ -1,4 +1,4 @@
package com.ryanmichela.sshd.implementations;
package com.ryanmichela.sshd.implementations.commandsenders;
import org.bukkit.Bukkit;
import org.bukkit.conversations.Conversation;

View File

@ -1,9 +1,12 @@
package com.ryanmichela.sshd;
package com.ryanmichela.sshd.jline;
/**
* Copyright 2013 Ryan Michela
*/
import com.ryanmichela.sshd.ReflectionUtil;
import com.ryanmichela.sshd.SshdPlugin;
import com.ryanmichela.sshd.Waitable;
import jline.console.completer.Completer;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandMap;
@ -16,7 +19,7 @@ public class ConsoleCommandCompleter implements Completer
{
public int complete(final String buffer, final int cursor, final List<CharSequence> candidates)
{
Waitable<List<String>> waitable = new Waitable<List<String>>()
Waitable<List<String>> waitable = new Waitable<List<String>>()
{
@Override
protected List<String> evaluate()

View File

@ -1,18 +1,10 @@
package com.ryanmichela.sshd;
package com.ryanmichela.sshd.jline;
import com.ryanmichela.sshd.ConsoleCommandCompleter;
import com.ryanmichela.sshd.ConsoleLogFormatter;
import com.ryanmichela.sshd.PermissionUtil;
import com.ryanmichela.sshd.FlushyOutputStream;
import com.ryanmichela.sshd.FlushyStreamHandler;
import com.ryanmichela.sshd.SshTerminal;
import com.ryanmichela.sshd.SshdPlugin;
import com.ryanmichela.sshd.StreamHandlerAppender;
import com.ryanmichela.sshd.implementations.SSHDCommandSender;
import com.ryanmichela.sshd.*;
import com.ryanmichela.sshd.implementations.commandsenders.SSHDCommandSender;
import jline.console.ConsoleReader;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;
import org.apache.sshd.common.Factory;
import org.apache.sshd.server.shell.ShellFactory;
import org.apache.sshd.server.command.Command;
import org.apache.sshd.server.channel.ChannelSession;
@ -29,7 +21,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.StringTokenizer;
import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.StreamHandler;

View File

@ -1,4 +1,4 @@
package com.ryanmichela.sshd;
package com.ryanmichela.sshd.jline;
import jline.TerminalSupport;
@ -7,7 +7,7 @@ import jline.TerminalSupport;
*/
public class SshTerminal extends TerminalSupport
{
protected SshTerminal()
public SshTerminal()
{
super(true);
}

View File

@ -10,7 +10,7 @@
<modules>
<module>Minecraft-SSHD-Bukkit</module>
</modules>
<version>2.0.0</version>
<version>2.1.0</version>
<url>https://git.limework.net/Limework/Minecraft-SSHD/</url>
<properties>
@ -29,8 +29,8 @@
<!-- License -->
<licenses>
<license>
<name>GPL2</name>
<url>http://www.gnu.org/licenses/gpl-2.0.html</url>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>