Updates from PR review

Updated previous changes based on dcassel's suggestions.
Tested using the sample SJS requests and test.sjs in marklogic-community#640.

deploy/default.properties

@@ -13,6 +13,13 @@
 #
 xquery.dir=${basedir}/src
 
+#
+# What type of language is the default for the controllers?
+# sjs - Serverside JavaScript
+# xqy - XQuery (default)
+#
+controller-ext=xqy
+
 #
 # MarkLogic application servers exist inside a group. ML Instances start off
 # with a group called "Default".

src/app/config/config.xqy

@@ -58,6 +58,18 @@ declare variable $c:ROXY-ROUTES :=
     }
   </routes>;
 
+(:
+ : ***********************************************
+ : What is the default language of the controllers defined in the <request>
+ : sjs - Serverside JavaScript
+ : xqy - XQuery (default)
+ :
+ : Override this setting in the build.properties with the "controller-ext" key value pair.
+ :
+ : ***********************************************
+ :)
+declare variable $c:CTRL-EXT := ("@ml.controller-ext", $def:CTRL-EXT)[1];
+
 (:
  : ***********************************************
  : A decent place to put your appservices search config

src/roxy/config/defaults.xqy

@@ -88,6 +88,11 @@ declare variable $ROXY-ROUTES :=
       <request uri="^.+$"/>
     </routes>;
 
+(:
+ : Default controller language
+ :)
+declare variable $CTRL-EXT := "xqy";
+
 (:
  : ***********************************************
  : A decent place to put your appservices search config

src/roxy/router.xqy

@@ -27,7 +27,7 @@ import module namespace u = "http://marklogic.com/roxy/util" at "/roxy/lib/util.
 declare option xdmp:mapping "false";
 
 declare variable $controller as xs:QName := req:get("controller", "type=xs:QName");
-declare variable $language as xs:string := req:get("language", "xqy", "type=xs:string");
+declare variable $language as xs:string := req:get("language", $config:CTRL-EXT, "type=xs:string");
 declare variable $controller-path as xs:string := fn:concat("/app/controllers/", $controller, ".", $language);
 declare variable $controller-ns as xs:string :=
   if ($language eq "xqy") then