Merge branch 'new-plugin-system'
Conflicts: src/main/scala/servlet/InitializeListener.scala |
---|
etc/deploy-assemby-jar.sh 0 → 100644 |
---|
etc/pom.xml 0 → 100644 |
---|
project/build.scala |
---|
project/plugins.sbt |
---|
src/main/scala/ScalatraBootstrap.scala |
---|
src/main/scala/plugin/Plugin.scala 0 → 100644 |
---|
src/main/scala/plugin/PluginRegistory.scala 0 → 100644 |
---|
src/main/scala/plugin/Results.scala 0 → 100644 |
---|
src/main/scala/plugin/Sessions.scala 0 → 100644 |
---|
src/main/scala/servlet/AutoUpdateListener.scala 100644 → 0 |
---|
src/main/scala/servlet/InitializeListener.scala 0 → 100644 |
---|
src/main/scala/util/ControlUtil.scala |
---|
src/main/scala/util/JDBCUtil.scala |
---|
src/main/scala/util/Version.scala 0 → 100644 |
---|
src/main/twirl/main.scala.html |
---|
src/main/webapp/WEB-INF/web.xml |
---|