move SshAddress into the SystemSettingsService object

This commit is contained in:
Herr Ritschwumm
2016-02-11 22:37:31 +01:00
parent 3f2935612d
commit ee7220ebd2
5 changed files with 10 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
package gitbucket.core.service
import gitbucket.core.util.{Directory, ControlUtil, SshAddress}
import gitbucket.core.util.{Directory, ControlUtil}
import gitbucket.core.util.Implicits._
import Directory._
import ControlUtil._
@@ -168,6 +168,10 @@ object SystemSettingsService {
fromAddress: Option[String],
fromName: Option[String])
case class SshAddress(
host:String,
port:Int)
val DefaultSshPort = 29418
val DefaultSmtpPort = 25
val DefaultLdapPort = 389

View File

@@ -1,7 +1,7 @@
package gitbucket.core.ssh
import gitbucket.core.service.SystemSettingsService
import gitbucket.core.util.SshAddress
import gitbucket.core.service.SystemSettingsService.SshAddress
import org.apache.sshd.common.Factory
import org.apache.sshd.server.{Environment, ExitCallback, Command}
import java.io.{OutputStream, InputStream}

View File

@@ -5,7 +5,8 @@ import java.util.concurrent.atomic.AtomicBoolean
import javax.servlet.{ServletContextEvent, ServletContextListener}
import gitbucket.core.service.SystemSettingsService
import gitbucket.core.util.{Directory, SshAddress}
import gitbucket.core.service.SystemSettingsService.SshAddress
import gitbucket.core.util.{Directory}
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
import org.slf4j.LoggerFactory

View File

@@ -1,3 +1,5 @@
package gitbucket.core.util
import gitbucket.core.service.SystemSettingsService.SshAddress
case class RepoBase(baseUrl:String, sshAddress:Option[SshAddress])

View File

@@ -1,3 +0,0 @@
package gitbucket.core.util
case class SshAddress(host:String, port:Int)