Merge branch 'new-plugin-system'
Conflicts:
	src/main/scala/servlet/InitializeListener.scala
commit 491fc2c16417a4e20799185375e9d74efd43cae6
2 parents 334753b + 1bed38f
@Naoki Takezoe Naoki Takezoe authored on 20 Feb 2015
Showing 16 changed files
View
etc/deploy-assemby-jar.sh 0 → 100644
View
etc/pom.xml 0 → 100644
View
project/build.scala
View
project/plugins.sbt
View
src/main/scala/ScalatraBootstrap.scala
View
src/main/scala/plugin/Plugin.scala 0 → 100644
View
src/main/scala/plugin/PluginRegistory.scala 0 → 100644
View
src/main/scala/plugin/Results.scala 0 → 100644
View
src/main/scala/plugin/Sessions.scala 0 → 100644
View
src/main/scala/servlet/AutoUpdateListener.scala 100644 → 0
View
src/main/scala/servlet/InitializeListener.scala 0 → 100644
View
src/main/scala/util/ControlUtil.scala
View
src/main/scala/util/JDBCUtil.scala
View
src/main/scala/util/Version.scala 0 → 100644
View
src/main/twirl/main.scala.html
View
src/main/webapp/WEB-INF/web.xml