diff --git a/web/app/models/LeonConsole.scala b/web/app/models/LeonConsole.scala index f4e910b882baccee902d41f70ba8a17b7cbe4945..aa33fe9fee40dc88178368fac02352ebb820df3b 100644 --- a/web/app/models/LeonConsole.scala +++ b/web/app/models/LeonConsole.scala @@ -90,6 +90,7 @@ class ConsoleSession extends Actor { log("Welcome to LeonOnline!") log("Processing request...") + val classPath = Play.current.configuration.getString("app.classpath").getOrElse("") mode match { case "verification" => @@ -100,7 +101,8 @@ class ConsoleSession extends Actor { settings = Settings( synthesis = false, xlang = false, - verify = true + verify = true, + classPath = classPath ), files = Nil, reporter = new WSReporter(channel) @@ -120,7 +122,8 @@ class ConsoleSession extends Actor { settings = Settings( synthesis = true, xlang = false, - verify = false + verify = false, + classPath = classPath ), files = Nil, reporter = new WSReporter(channel) diff --git a/web/conf/application.conf b/web/conf/application.conf index ab89b5b5b6cf58a8c580952a492ff41d766fdee5..5dfd3e304b9cf38560ae19f7eb7e91b99501ab1a 100644 --- a/web/conf/application.conf +++ b/web/conf/application.conf @@ -46,4 +46,7 @@ logger.play=INFO logger.application=DEBUG # This specifies the prefix under which the web page lies, used almost exclusively for the laraserver setup -app.prefix=/leon +app.prefix="" + +# Specifies the classpath used by the Scala compiler within Leon +app.classpath="." diff --git a/web/conf/laraserver.conf b/web/conf/laraserver.conf new file mode 100644 index 0000000000000000000000000000000000000000..79045b83fb7a10fe421f99803e9d7856a915d810 --- /dev/null +++ b/web/conf/laraserver.conf @@ -0,0 +1,52 @@ +# This is the main configuration file for the application. +# ~~~~~ + +# Secret key +# ~~~~~ +# The secret key is used to secure cryptographics functions. +# If you deploy your application to several instances be sure to use the same key! +application.secret="_JKq[m=o8OG;]F8xD:bGMs^/?KXXb2Huq^KLM=obhIQvsPIwPNJq@sgLWTRCLr4]" + +# The application languages +# ~~~~~ +application.langs="en" + +# Global object class +# ~~~~~ +# Define the Global object class for this application. +# Default to Global in the root package. +# global=Global + +# Database configuration +# ~~~~~ +# You can declare as many datasources as you want. +# By convention, the default datasource is named `default` +# +# db.default.driver=org.h2.Driver +# db.default.url="jdbc:h2:mem:play" +# db.default.user=sa +# db.default.password= + +# Evolutions +# ~~~~~ +# You can disable evolutions if needed +# evolutionplugin=disabled + +# Logger +# ~~~~~ +# You can also configure logback (http://logback.qos.ch/), by providing a logger.xml file in the conf directory . + +# Root logger: +logger.root=ERROR + +# Logger used by the framework: +logger.play=INFO + +# Logger provided to your application: +logger.application=DEBUG + +# This specifies the prefix under which the web page lies, used almost exclusively for the laraserver setup +app.prefix="/leon" + +# Specifies the classpath used by the Scala compiler within Leon +app.classpath="/localhome/leonweb/.sbt/0.12.1/boot/scala-2.9.2/lib/"