Fork: 0
johnpearcey / gitbucket_jkp
Browse code
Fix compilation error
master
1 parent 7396bf0 commit 358bc23931d31c8cdabfdab7bb88126beef69230
@Naoki Takezoe Naoki Takezoe authored on 5 Jul 2017
Patch
Unified Split
Showing 2 changed files
View
8
■■■■■
 src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
pluginId = plugin.pluginId,
pluginName = plugin.pluginName,
pluginVersion = plugin.versions.last.getVersion,
description = plugin.description,
pluginClass = plugin
))
pluginClass = plugin,
pluginJar = pluginJar,
classLoader = classLoader
), true)
 
} catch {
case e: Throwable => {
logger.error(s"Error during plugin initialization: ${pluginJar.getName}", e)
View
6
■■■■■
 src/main/scala/gitbucket/core/servlet/InitializeListener.scala
logger.info("Install bundled plugins")
val cl = Thread.currentThread.getContextClassLoader
try {
using(cl.getResourceAsStream("plugins/plugins")){ pluginsFile =>
val pluginRepositoryDir = new File(PluginHome, ".repository")
if(!pluginRepositoryDir.exists){
pluginRepositoryDir.mkdirs()
}
val plugins = IOUtils.toString(pluginsFile, "UTF-8").split("\n").map(_.trim)
plugins.collect { case plugin if plugin.nonEmpty && !plugin.startsWith("#") =>
val file = new File(PluginHome, plugin)
val file = new File(pluginRepositoryDir, plugin)
logger.info(s"Copy ${plugin} to ${file.getAbsolutePath}")
using(cl.getResourceAsStream("plugins/" + plugin), new FileOutputStream(file)){ case (in, out) => IOUtils.copy(in, out) }
}
}