Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 18:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load plugin classes from the copied jar file

Browse Source
This commit is contained in:
Naoki Takezoe
2017-03-12 02:32:21 +09:00
parent 8ee017c3fa
commit b2773ff5b7
1 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
View File

@@ -19,6 +19,7 @@ import io.github.gitbucket.solidbase.Solidbase
import io.github.gitbucket.solidbase.manager.JDBCVersionManager import io.github.gitbucket.solidbase.manager.JDBCVersionManager
import io.github.gitbucket.solidbase.model.Module import io.github.gitbucket.solidbase.model.Module
import org.apache.commons.codec.binary.{Base64, StringUtils} import org.apache.commons.codec.binary.{Base64, StringUtils}
import org.apache.commons.io.FileUtils
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import scala.collection.mutable import scala.collection.mutable
@@ -160,7 +161,7 @@ object PluginRegistry {
private var instance = new PluginRegistry() private var instance = new PluginRegistry()
// private var watcher: PluginWatchThread = null private var watcher: PluginWatchThread = null
/** /**
* Returns the PluginRegistry singleton instance. * Returns the PluginRegistry singleton instance.
@@ -196,11 +197,22 @@ object PluginRegistry {
val pluginDir = new File(PluginHome) val pluginDir = new File(PluginHome)
val manager = new JDBCVersionManager(conn) val manager = new JDBCVersionManager(conn)
// Clean installed directory
val installedDir = new File(PluginHome, "installed")
if(installedDir.exists){
FileUtils.deleteDirectory(installedDir)
}
installedDir.mkdir()
if(pluginDir.exists && pluginDir.isDirectory){ if(pluginDir.exists && pluginDir.isDirectory){
pluginDir.listFiles(new FilenameFilter { pluginDir.listFiles(new FilenameFilter {
override def accept(dir: File, name: String): Boolean = name.endsWith(".jar") override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
}).foreach { pluginJar => }).foreach { pluginJar =>
val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader) // Copy the plugin jar file to GITBUCKET_HOME/plugins/installed
val installedJar = new File(installedDir, pluginJar.getName)
FileUtils.copyFile(pluginJar, installedJar)
val classLoader = new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
try { try {
val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin] val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin]
@@ -235,10 +247,10 @@ object PluginRegistry {
} }
} }
// if(watcher == null){ if(watcher == null){
// watcher = new PluginWatchThread(context) watcher = new PluginWatchThread(context)
// watcher.start() watcher.start()
// } }
} }
def shutdown(context: ServletContext, settings: SystemSettings): Unit = synchronized { def shutdown(context: ServletContext, settings: SystemSettings): Unit = synchronized {
@@ -269,45 +281,46 @@ case class PluginInfo(
classLoader: URLClassLoader classLoader: URLClassLoader
) )
//class PluginWatchThread(context: ServletContext) extends Thread with SystemSettingsService { class PluginWatchThread(context: ServletContext) extends Thread with SystemSettingsService {
// import gitbucket.core.model.Profile.profile.blockingApi._ import gitbucket.core.model.Profile.profile.blockingApi._
// import scala.collection.JavaConverters._
// private val logger = LoggerFactory.getLogger(classOf[PluginWatchThread])
// private val logger = LoggerFactory.getLogger(classOf[PluginWatchThread])
// override def run(): Unit = {
// val path = Paths.get(PluginHome) override def run(): Unit = {
// val fs = path.getFileSystem val path = Paths.get(PluginHome)
// val watcher = fs.newWatchService val fs = path.getFileSystem
// val watcher = fs.newWatchService
// val watchKey = path.register(watcher,
// StandardWatchEventKinds.ENTRY_CREATE, val watchKey = path.register(watcher,
// StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_CREATE,
// StandardWatchEventKinds.ENTRY_DELETE, StandardWatchEventKinds.ENTRY_MODIFY,
// StandardWatchEventKinds.OVERFLOW) StandardWatchEventKinds.ENTRY_DELETE,
// StandardWatchEventKinds.OVERFLOW)
// logger.info("Start PluginWatchThread: " + path)
// logger.info("Start PluginWatchThread: " + path)
// try {
// while (watchKey.isValid()) { try {
// val detectedWatchKey = watcher.take() while (watchKey.isValid()) {
// val events = detectedWatchKey.pollEvents() val detectedWatchKey = watcher.take()
// val events = detectedWatchKey.pollEvents.asScala.filter(_.context.toString != "installed")
// events.forEach { event => if(events.nonEmpty){
// logger.info(event.kind + ": " + event.context) events.foreach { event =>
// } logger.info(event.kind + ": " + event.context)
// }
// gitbucket.core.servlet.Database() withTransaction { session =>
// logger.info("Reloading plugins...") gitbucket.core.servlet.Database() withTransaction { session =>
// PluginRegistry.reload(context, loadSystemSettings(), session.conn) logger.info("Reloading plugins...")
// } PluginRegistry.reload(context, loadSystemSettings(), session.conn)
// }
// detectedWatchKey.reset() }
// } detectedWatchKey.reset()
// } catch { }
// case _: InterruptedException => watchKey.cancel() } catch {
// } case _: InterruptedException => watchKey.cancel()
// }
// logger.info("Shutdown PluginWatchThread")
// } logger.info("Shutdown PluginWatchThread")
// }
//}
}