Update Xitrum from 3.23 to 3.24.0

build.sbt

@@ -1,7 +1,5 @@
 organization := "tv.cntt"
-
 name         := "xitrum-demos"
-
 version      := "1.0-SNAPSHOT"
 
 scalaVersion := "2.11.6"
@@ -14,10 +12,10 @@ javacOptions ++= Seq("-source", "1.7", "-target", "1.7")
 
 //------------------------------------------------------------------------------
 
-libraryDependencies += "tv.cntt" %% "xitrum" % "3.23"
+libraryDependencies += "tv.cntt" %% "xitrum" % "3.24.0"
 
 // Xitrum uses SLF4J, an implementation of SLF4J is needed
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.2"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.3"
 
 // For writing condition in logback.xml
 libraryDependencies += "org.codehaus.janino" % "janino" % "2.7.8"
@@ -28,11 +26,11 @@ libraryDependencies += "tv.cntt" %% "xitrum-ko" % "1.7"
 // For OpenID demo
 libraryDependencies += "org.openid4java" % "openid4java" % "0.9.8"
 
-libraryDependencies += "org.webjars" % "bootstrap" % "3.3.2-2"
+libraryDependencies += "org.webjars" % "bootstrap" % "3.3.4"
 
 // Scalate template engine config for Xitrum -----------------------------------
 
-libraryDependencies += "tv.cntt" %% "xitrum-scalate" % "2.4"
+libraryDependencies += "tv.cntt" %% "xitrum-scalate" % "2.5"
 
 // Precompile Scalate templates
 seq(scalateSettings:_*)
@@ -46,9 +44,7 @@ ScalateKeys.scalateTemplateConfig in Compile := Seq(TemplateConfig(
 // xgettext i18n translation key string extractor is a compiler plugin ---------
 
 autoCompilerPlugins := true
-
 addCompilerPlugin("tv.cntt" %% "xgettext" % "1.3")
-
 scalacOptions += "-P:xgettext:xitrum.I18n"
 
 // Put config directory in classpath for easier development --------------------

config/xitrum.conf

@@ -134,7 +134,7 @@ xitrum {
     # Adjust this when you use very long URL, e.g. send a lot of data with GET method.
     maxInitialLineLength = 4096
 
-    maxHeaderSize = 8192
+    maxHeaderSize = 81920
 
     # Increase if you want to allow bigger file upload.
     # (Google App Engine's limit: 32 MB)

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.8

sbt/sbt

@@ -13,4 +13,4 @@ if [[ "${java_version}" > "1.8" ]]; then
 else
   memopts="-XX:MaxPermSize=384M"
 fi
-$java_cmd -javaagent:`dirname $0`/agent7-1.0.jar -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled $memopts -jar `dirname $0`/sbt-launch-0.13.7.jar "$@"
+$java_cmd -javaagent:`dirname $0`/agent7-1.0.jar -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled $memopts -jar `dirname $0`/sbt-launch-0.13.8.jar "$@"

sbt/sbt.bat

@@ -1,3 +1,5 @@
+@echo off
+
 set SCRIPT_DIR=%~dp0
 
 for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
@@ -12,11 +14,9 @@ for /f "delims=. tokens=1-3" %%v in ("%JAVA_VERSION%") do (
     set BUILD=%%x
 
     set META_SIZE=-XX:MaxMetaspaceSize=384M
-    if "!MINOR!" LSS "8" (
+    if %MINOR% LSS 8 (
       set META_SIZE=-XX:MaxPermSize=384M
     )
-
-    set MEM_OPTS=!META_SIZE!
 )
 
-java -javaagent:"%SCRIPT_DIR%agent7-1.0.jar" -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled %MEM_OPTS% -jar "%SCRIPT_DIR%sbt-launch-0.13.7.jar" %*
+java -javaagent:"%SCRIPT_DIR%agent7-1.0.jar" -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled %META_SIZE% -jar "%SCRIPT_DIR%sbt-launch-0.13.8.jar" %*

script/runner.bat

@@ -1,3 +1,5 @@
+@echo off
+
 for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
     set JAVA_VERSION=%%g
 )
@@ -10,23 +12,21 @@ for /f "delims=. tokens=1-3" %%v in ("%JAVA_VERSION%") do (
     set BUILD=%%x
 
     set META_SIZE=-XX:MaxMetaspaceSize=384m
-    if "!MINOR!" LSS "8" (
+    if %MINOR% LSS 8 (
       set META_SIZE=-XX:MaxPermSize=384m
     )
-
-    set MEM_OPTS=!META_SIZE!
 )
 
-# You may need to customize memory config below to optimize for your environment.
-# To display time when the application is stopped for GC:
-# -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime
-set JAVA_OPTS=-Xmx1024m -Xms256m %MEM_OPTS% -XX:+HeapDumpOnOutOfMemoryError -XX:+AggressiveOpts -XX:+OptimizeStringConcat -XX:+UseFastAccessorMethods -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=1 -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly -Djava.awt.headless=true -server -Dxitrum.mode=production
+rem You may need to customize memory config below to optimize for your environment.
+rem To display time when the application is stopped for GC:
+rem -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime
+set JAVA_OPTS=-Xmx1024m -Xms256m %META_SIZE% -XX:+HeapDumpOnOutOfMemoryError -XX:+AggressiveOpts -XX:+OptimizeStringConcat -XX:+UseFastAccessorMethods -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=1 -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly -Djava.awt.headless=true -server -Dxitrum.mode=production
 
 set ROOT_DIR=%~dp0..
 cd "%$ROOT_DIR%"
 
-# Include ROOT_DIR to find this pid easier later, when
-# starting multiple processes from different directories
+rem Include ROOT_DIR to find this pid easier later, when
+rem starting multiple processes from different directories
 set CLASS_PATH="%ROOT_DIR%\lib\*;config"
 
 java %JAVA_OPTS% -cp %CLASS_PATH% %*

src/main/scalate/demos/action/AppAction.jade

@@ -13,7 +13,7 @@ html
 
     link(rel="shortcut icon" href={publicUrl("favicon.ico")})
 
-    link(type="text/css" rel="stylesheet" media="all" href={webJarsUrl("bootstrap/3.3.2-2/css", "bootstrap.css", "bootstrap.min.css")})
+    link(type="text/css" rel="stylesheet" media="all" href={webJarsUrl("bootstrap/3.3.4/css", "bootstrap.css", "bootstrap.min.css")})
     link(type="text/css" rel="stylesheet" media="all" href={publicUrl("app.css")})
 
   body