1 files changed, 31 insertions, 13 deletions

diff --git a/java/common/Option.tpl b/java/common/Option.tpl
index c1e8dcbe22..c22b35b999 100644
--- a/java/common/Option.tpl
+++ b/java/common/Option.tpl
@@ -1,24 +1,42 @@
-package $(pkg);
+package org.apache.qpid.transport;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
 
 public enum Option {
 
 ${
 from genutil import *
 
-names = ["NONE", "SYNC", "BATCH"]
+options = {}
+
 for c in composites:
   for f in c.query["field"]:
     t = resolve_type(f)
     if t["@name"] == "bit":
-      names.append(scream(f["@name"]))
-
-options = {}
-
-for option in names:
- if not options.has_key(option):
-    if options:
-      out(",\n    ")
-    options[option] = None
-    out("$option")
-}
+      option = scream(f["@name"])
+      if not options.has_key(option):
+        options[option] = None
+        out("    $option,\n")}
+    BATCH,
+    UNRELIABLE,
+    NONE
 }