JavaScriptBach
diff --git a/‎ChangeLog.txt‎
Lines changed: 4 additions & 0 deletions b/‎ChangeLog.txt‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎babel‎ b/‎babel‎
diff --git a/‎generator/java.babelg.py‎
Lines changed: 8 additions & 1 deletion b/‎generator/java.babelg.py‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎pom.xml‎
Lines changed: 6 additions & 0 deletions b/‎pom.xml‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎run-babel-codegen‎
Lines changed: 30 additions & 6 deletions b/‎run-babel-codegen‎
Lines changed: 30 additions & 6 deletions
diff --git a/‎spec‎ b/‎spec‎
@@ -1,3 +1,7 @@
+
+---------------------------------------------
+2.0-beta-5 (2016-01-22)
+- Updated to latest API specs.
 - Change format of tagged union classes.
   - Change getter method format from getAbc() to getAbcValue().
   - Add new isAbc() convenience methods.
 
@@ -181,7 +181,7 @@ def format_route_ref(api, namespace, route):
 def format_route(api_namespace, api_route):
     if uses_builder_pattern(api_route):
         return '%s#%s' % (namespace_ref(api_namespace), builder_method_name(api_route))
-    elif is_void_type(api_route.request_data_type):
+    elif is_void_type(api_route.request_data_type) or is_union_type(api_route.request_data_type):
         return '%s#%s' % (namespace_ref(api_namespace), routename(api_route.name))
     else:
         # by default, all doc refs should point to the method that
@@ -1663,6 +1663,13 @@ def generate_javadoc(self, doc, params=None, returns=None, throws=None):
         out('/**')
 
         if doc:
+            # sanitize &, <, > characters
+            for char, code in (('&', '&amp;'),
+                               ('<', '&lt;'),
+                               ('>', '&gt;')):
+                doc = doc.replace(char, code)
+
+
             first_paragraph = True
             for paragraph in split_paragraphs(doc.strip()):
                 if not first_paragraph:
 
@@ -41,6 +41,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <skipTests>true</skipTests>
         <osgi.bnd.noee>false</osgi.bnd.noee>
+        <!-- BEGIN PRIVATE REPO ONLY -->
+        <specDir>${project.basedir}/spec</specDir>
+        <!-- END PRIVATE REPO ONLY -->
     </properties>
 
     <dependencies>
@@ -229,6 +232,9 @@
                         <configuration>
                             <executable>run-babel-codegen</executable>
                             <sourceRoot>${project.build.directory}/generated-sources/babel</sourceRoot>
+                            <arguments>
+                                <argument>${specDir}</argument>
+                            </arguments>
                         </configuration>
                     </execution>
                 </executions>
 
@@ -15,18 +15,42 @@ while [ -h "$loc" ]; do
     fi
 done
 
-if [[ $# -ne 0 ]]; then
-    echo "$0: Not expecting any command-line arguments, got $#." 1>&2
-    exit 1
-fi
-
 base_dir=`dirname "$loc"`
 
 babel_dir="$base_dir/babel"
-spec_dir="$base_dir/spec"
 gen_dir="$base_dir/$mvn_target_dir/generated-sources/babel"
 generator="$base_dir/generator/java.babelg.py"
 
+usage() {
+    echo "usage: $0 [SPEC_DIR]"
+    echo ""
+    echo "positional arguments:"
+    echo "  SPEC_DIR     Top-level directory containing Babel spec files."
+    echo ""
+    echo "optional arguments:"
+    echo "  -h/--help    Display this message and exit."
+}
+
+if [[ $# -gt 0 ]]; then
+    case "$1" in
+        "-h"|"--help")
+            usage
+            exit 0
+            ;;
+        *)
+            spec_dir="$1"
+            shift
+    esac
+else
+    spec_dir="$base_dir/spec"
+fi
+
+if [[ $# -ne 0 ]]; then
+    echo "$0: Too many arguments" 1>&2
+    usage
+    exit 1
+fi
+
 up_to_date() {
     local target="$1"; shift
     [[ -f "$target" && $(find "$@" -newer "$target" | head -n 1 | wc -l) -eq 0 ]]