Skip to content

Commit

Permalink
get bukkit 1.7.2 to compile
Browse files Browse the repository at this point in the history
  • Loading branch information
rmichela committed Dec 29, 2013
1 parent e981133 commit 2326c7e
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 13 deletions.
9 changes: 2 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.ryanmichela</groupId>
<artifactId>SSHD</artifactId>
<version>1.0</version>
<version>1.1</version>
<url>http://dev.bukkit.org/server-mods/sshd/</url>

<!-- Repositories -->
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.6.4-R1.0</version>
<version>1.7.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
</dependency>
Expand All @@ -41,11 +41,6 @@
<scope>compile</scope>
<type>jar</type>
</dependency>
<!--<dependency>-->
<!--<groupId>org.bouncycastle</groupId>-->
<!--<artifactId>bcprov-jdk16</artifactId>-->
<!--<version>1.46</version>-->
<!--</dependency>-->
</dependencies>

<!-- Build -->
Expand Down
42 changes: 42 additions & 0 deletions src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.ryanmichela.sshd;

/**
* Copyright 2013 Ryan Michela
*/

import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.SimpleDateFormat;
import java.util.logging.Formatter;
import java.util.logging.LogRecord;

public class ConsoleLogFormatter extends Formatter {

private SimpleDateFormat dateFormat;

public ConsoleLogFormatter() {
this.dateFormat = new SimpleDateFormat("HH:mm:ss");
}

public String format(LogRecord logrecord) {
StringBuilder stringbuilder = new StringBuilder();

stringbuilder.append(" [");
stringbuilder.append(this.dateFormat.format(Long.valueOf(logrecord.getMillis()))).append(" ");

stringbuilder.append(logrecord.getLevel().getName()).append("]: ");
stringbuilder.append(this.formatMessage(logrecord));
stringbuilder.append('\n');
Throwable throwable = logrecord.getThrown();

if (throwable != null) {
StringWriter stringwriter = new StringWriter();

throwable.printStackTrace(new PrintWriter(stringwriter));
stringbuilder.append(stringwriter.toString());
}

return stringbuilder.toString();
}
}

7 changes: 2 additions & 5 deletions src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.logging.Formatter;
import java.util.logging.Logger;
import java.util.logging.StreamHandler;

Expand Down Expand Up @@ -66,19 +65,17 @@ public void setExitCallback(ExitCallback callback) {

public void start(Environment env) throws IOException {

Formatter bukkitFormatter = Bukkit.getLogger().getHandlers()[0].getFormatter();

try {
consoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
consoleReader.setExpandEvents(true);
consoleReader.addCompleter(new ConsoleCommandCompleter());

streamHandler = new FlushyStreamHandler(out, bukkitFormatter, consoleReader);
streamHandler = new FlushyStreamHandler(out, new ConsoleLogFormatter(), consoleReader);
Bukkit.getLogger().addHandler(streamHandler);
Logger.getLogger("").addHandler(streamHandler);

environment = env;
thread = new Thread(this, "EchoShell " + env.getEnv().get(Environment.ENV_USER));
thread = new Thread(this, "SSHD ConsoleShell " + env.getEnv().get(Environment.ENV_USER));
thread.start();
} catch (Exception e) {
throw new IOException("Error starting shell", e);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.ryanmichela.sshd;

import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.session.ServerSession;

Expand Down

0 comments on commit 2326c7e

Please sign in to comment.