QPID-1860 : Update verify to remove lines starting with #

Update verify.in to use # as a comment character for the ASL header.
Also updated all the other files I added the ASL header to with ==== to also have #.
I cannot see where these files are processed. 


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@775644 13f79535-47bb-0310-9956-ffa450edef68

67 files changed, 1174 insertions, 1171 deletions

diff --git a/qpid/cpp/examples/README.verify b/qpid/cpp/examples/README.verify
index d15adce58d..7704e46c91 100644
--- a/qpid/cpp/examples/README.verify
+++ b/qpid/cpp/examples/README.verify
@@ -24,3 +24,6 @@ scripts.
 This will require you using the verify script, and providing the necessary sub
 script(s) it will utilize in the process. Please note that it is your
 responsibility to setup the necessary environment for the verification process
+
+=== verify.in format ===
+Lines starting with # are comments and are removed prior to comparison with example output.
diff --git a/qpid/cpp/examples/direct/verify.in b/qpid/cpp/examples/direct/verify.in
index 39e5912bd7..7861411c9f 100644
--- a/qpid/cpp/examples/direct/verify.in
+++ b/qpid/cpp/examples/direct/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer.out
 ==== listener.out
diff --git a/qpid/cpp/examples/direct/verify_cpp_python.in b/qpid/cpp/examples/direct/verify_cpp_python.in
index 8066468744..e4f2c605d5 100644
--- a/qpid/cpp/examples/direct/verify_cpp_python.in
+++ b/qpid/cpp/examples/direct/verify_cpp_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer.out
 ==== direct_consumer.py.out
diff --git a/qpid/cpp/examples/direct/verify_python_cpp.in b/qpid/cpp/examples/direct/verify_python_cpp.in
index de71f78247..fb6d101bdc 100644
--- a/qpid/cpp/examples/direct/verify_python_cpp.in
+++ b/qpid/cpp/examples/direct/verify_python_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== direct_producer.py.out
 ==== listener.out
diff --git a/qpid/cpp/examples/fanout/verify.in b/qpid/cpp/examples/fanout/verify.in
index 18642d979e..1d54b48de0 100644
--- a/qpid/cpp/examples/fanout/verify.in
+++ b/qpid/cpp/examples/fanout/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.out
 ==== listener.out | remove_uuid
 Listening
diff --git a/qpid/cpp/examples/fanout/verify_cpp_python.in b/qpid/cpp/examples/fanout/verify_cpp_python.in
index c5a5cc2b66..25e6bcd3c5 100644
--- a/qpid/cpp/examples/fanout/verify_cpp_python.in
+++ b/qpid/cpp/examples/fanout/verify_cpp_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.out
 ==== fanout_consumer.py.out | remove_uuid
 Subscribed to queue 
diff --git a/qpid/cpp/examples/fanout/verify_python_cpp.in b/qpid/cpp/examples/fanout/verify_python_cpp.in
index 1abe7e3a48..4c932129cf 100644
--- a/qpid/cpp/examples/fanout/verify_python_cpp.in
+++ b/qpid/cpp/examples/fanout/verify_python_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.py.out
 ==== listener.out | remove_uuid
 Listening
diff --git a/qpid/cpp/examples/pub-sub/verify.in b/qpid/cpp/examples/pub-sub/verify.in
index 1d7b4ea186..59568f906c 100644
--- a/qpid/cpp/examples/pub-sub/verify.in
+++ b/qpid/cpp/examples/pub-sub/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.out
 ==== topic_listener.out | remove_uuid | sort
 Declaring queue: europe
diff --git a/qpid/cpp/examples/pub-sub/verify_cpp_python.in b/qpid/cpp/examples/pub-sub/verify_cpp_python.in
index 6976e3b87d..5cf50d9efd 100644
--- a/qpid/cpp/examples/pub-sub/verify_cpp_python.in
+++ b/qpid/cpp/examples/pub-sub/verify_cpp_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.out
 ==== topic_subscriber.py.out | remove_uuid | sort
 Message 0
diff --git a/qpid/cpp/examples/pub-sub/verify_python_cpp.in b/qpid/cpp/examples/pub-sub/verify_python_cpp.in
index 141500e2a4..431e5b02fe 100644
--- a/qpid/cpp/examples/pub-sub/verify_python_cpp.in
+++ b/qpid/cpp/examples/pub-sub/verify_python_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.py.out
 ==== topic_listener.out | remove_uuid | sort
 Declaring queue: europe
diff --git a/qpid/cpp/examples/request-response/verify.in b/qpid/cpp/examples/request-response/verify.in
index ce16fc7e3c..b0f9aa760f 100644
--- a/qpid/cpp/examples/request-response/verify.in
+++ b/qpid/cpp/examples/request-response/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.out | remove_uuid
 Activating response queue listener for: client
 Request: Twas brillig, and the slithy toves
diff --git a/qpid/cpp/examples/request-response/verify_cpp_python.in b/qpid/cpp/examples/request-response/verify_cpp_python.in
index d42be6eb54..02ca6575cc 100644
--- a/qpid/cpp/examples/request-response/verify_cpp_python.in
+++ b/qpid/cpp/examples/request-response/verify_cpp_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.out | remove_uuid
 Activating response queue listener for: client
 Request: Twas brillig, and the slithy toves
diff --git a/qpid/cpp/examples/request-response/verify_python_cpp.in b/qpid/cpp/examples/request-response/verify_python_cpp.in
index 75dfe9fcd8..35628e14aa 100644
--- a/qpid/cpp/examples/request-response/verify_python_cpp.in
+++ b/qpid/cpp/examples/request-response/verify_python_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.py.out | remove_uuid
 Request: Twas brillig, and the slithy toves
 Request: Did gyre and gimble in the wabe.
diff --git a/qpid/cpp/examples/verify b/qpid/cpp/examples/verify
index 08dcf327a7..28d67ec44a 100755
--- a/qpid/cpp/examples/verify
+++ b/qpid/cpp/examples/verify
@@ -81,7 +81,7 @@ verify() {
     else dir=`dirname $1`; script=`basename $1`; fi
     cd $dir || return 1
     rm -f *.out
-    { source ./$script && diff -ac $script.out $script.in ; } || fail
+    { source ./$script && grep -v ^# $script.in | diff -ac $script.out - ; } || fail
     test -z "$FAIL" && rm -f *.out
     return $FAIL
 }
diff --git a/qpid/dotnet/client-010/examples/direct/verify.in b/qpid/dotnet/client-010/examples/direct/verify.in
index 63036596ff..48b83157d6 100644
--- a/qpid/dotnet/client-010/examples/direct/verify.in
+++ b/qpid/dotnet/client-010/examples/direct/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer_dotnet.out
 ==== direct_listener_dotnet.out
diff --git a/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
index 7fb7a347d9..389c8fd5bb 100644
--- a/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer.out
 ==== direct_listener_dotnet.out
diff --git a/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
index 4121b0f673..60164ddb72 100644
--- a/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer_dotnet.out
 ==== listener.out
diff --git a/qpid/dotnet/client-010/examples/direct/verify_dotnet_java.in b/qpid/dotnet/client-010/examples/direct/verify_dotnet_java.in
index 2174c45428..c08e915c6d 100644
--- a/qpid/dotnet/client-010/examples/direct/verify_dotnet_java.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_dotnet_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer_dotnet.out
 ==== direct_consumer_java.out
diff --git a/qpid/dotnet/client-010/examples/direct/verify_dotnet_python.in b/qpid/dotnet/client-010/examples/direct/verify_dotnet_python.in
index ef7188dec9..35b42b269f 100644
--- a/qpid/dotnet/client-010/examples/direct/verify_dotnet_python.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_dotnet_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== direct_producer_dotnet.out
 ==== direct_consumer.py.out
diff --git a/qpid/dotnet/client-010/examples/direct/verify_java_dotnet.in b/qpid/dotnet/client-010/examples/direct/verify_java_dotnet.in
index f631f0bf8f..0b113b02cf 100644
--- a/qpid/dotnet/client-010/examples/direct/verify_java_dotnet.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_java_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/dotnet/client-010/examples/direct/verify_python_dotnet.in b/qpid/dotnet/client-010/examples/direct/verify_python_dotnet.in
index 0cacb8fbcc..0c5db842a1 100644
--- a/qpid/dotnet/client-010/examples/direct/verify_python_dotnet.in
+++ b/qpid/dotnet/client-010/examples/direct/verify_python_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== direct_producer.py.out
 ==== direct_listener_dotnet.out
diff --git a/qpid/dotnet/client-010/examples/fanout/verify.in b/qpid/dotnet/client-010/examples/fanout/verify.in
index 8a92f1cae4..4ed3cfdfac 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_listener_dotnet.out
 Listening
 Message: Message 0
diff --git a/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
index dfd5eb4732..ffdda06db3 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.out
 ==== fanout_listener_dotnet.out | remove_uuid
 Listening
diff --git a/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
index a050cd3efb..49bd00317f 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_dotnet.out
 ==== listener.out | remove_uuid
 Listening
diff --git a/qpid/dotnet/client-010/examples/fanout/verify_dotnet_java.in b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_java.in
index 4cd17e533e..4fca05cf2d 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify_dotnet_java.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_dotnet.out
 ==== fanout_listener_java.out | remove_uuid
 Listener: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
diff --git a/qpid/dotnet/client-010/examples/fanout/verify_dotnet_python.in b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_python.in
index ce44599d4c..3c4a953c3b 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify_dotnet_python.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_dotnet.out
 ==== fanout_consumer.py.out | remove_uuid
 Subscribed to queue 
diff --git a/qpid/dotnet/client-010/examples/fanout/verify_java_dotnet.in b/qpid/dotnet/client-010/examples/fanout/verify_java_dotnet.in
index 5b864f2e7f..cbbeeacb17 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify_java_dotnet.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_java_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
 Producer: Creating a Message Producer
diff --git a/qpid/dotnet/client-010/examples/fanout/verify_python_dotnet.in b/qpid/dotnet/client-010/examples/fanout/verify_python_dotnet.in
index 4dddca17dd..934c51ef1d 100644
--- a/qpid/dotnet/client-010/examples/fanout/verify_python_dotnet.in
+++ b/qpid/dotnet/client-010/examples/fanout/verify_python_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.py.out
 ==== fanout_listener_dotnet.out | remove_uuid
 Listening
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify.in b/qpid/dotnet/client-010/examples/pub-sub/verify.in
index f5fc243f27..6964d385f9 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== pubsub_producer_dotnet.out
 ==== pubsub_listener_dotnet.out | remove_uuid | sort
 Declaring queue: europe
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
index 2c14217b72..8ee7f58ae4 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.out
 ==== pubsub_listener_dotnet.out | remove_uuid | sort
 Declaring queue: europe
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
index 9e3e66fa87..9aa50efdbd 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== pubsub_producer_dotnet.out
 ==== topic_listener.out | remove_uuid | sort
 Declaring queue: europe
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_java.in b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_java.in
index 3e44541278..d1586b2dc8 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_java.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== pubsub_producer_dotnet.out
 ==== topic_listener_java.out | remove_uuid | sort
 Listener: Closing connection
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_python.in b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_python.in
index bff52a57ec..b4295456f2 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_python.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== pubsub_producer_dotnet.out
 ==== topic_subscriber.py.out | remove_uuid | sort
 Message 0
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify_java_dotnet.in b/qpid/dotnet/client-010/examples/pub-sub/verify_java_dotnet.in
index 951244a304..51a2b6fd3b 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify_java_dotnet.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_java_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher_java.out
 Publisher: Creating a non-transacted, auto-acknowledged session
 Publisher: Creating a TestMessage to send to the topics
diff --git a/qpid/dotnet/client-010/examples/pub-sub/verify_python_dotnet.in b/qpid/dotnet/client-010/examples/pub-sub/verify_python_dotnet.in
index ee1bbf84a2..8c508b4a45 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/verify_python_dotnet.in
+++ b/qpid/dotnet/client-010/examples/pub-sub/verify_python_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.py.out
 ==== pubsub_listener_dotnet.out | remove_uuid | sort
 Declaring queue: europe
diff --git a/qpid/dotnet/client-010/examples/request-response/verify.in b/qpid/dotnet/client-010/examples/request-response/verify.in
index 245ffb6cb4..6916a073c0 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== server_dotnet.out
 Waiting for requests
 Request: Twas brillig, and the slithy toves
diff --git a/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
index bd79b98913..e08249cd7f 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client_dotnet.out
 Activating response queue listener for: clientSystem.Byte[]
 Waiting for all responses to arrive ...
diff --git a/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
index fc5b7c3893..3ca43d9153 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.out | remove_uuid
 Activating response queue listener for: client
 Request: Twas brillig, and the slithy toves
diff --git a/qpid/dotnet/client-010/examples/request-response/verify_dotnet_java.in b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_java.in
index 5d3a4a8b22..235f468266 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify_dotnet_java.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== server_dotnet.out
 Waiting for requests
 Request: Twas brillig, and the slithy toves
diff --git a/qpid/dotnet/client-010/examples/request-response/verify_dotnet_python.in b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_python.in
index 610714bf80..1b5d3ab09f 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify_dotnet_python.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.py.out | remove_uuid
 Request: Twas brillig, and the slithy toves
 Request: Did gyre and gimble in the wabe.
diff --git a/qpid/dotnet/client-010/examples/request-response/verify_java_dotnet.in b/qpid/dotnet/client-010/examples/request-response/verify_java_dotnet.in
index 4df6580379..50cf5fa57f 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify_java_dotnet.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_java_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== server_java.out | remove_uuid
 Server: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
 Server: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/dotnet/client-010/examples/request-response/verify_python_dotnet.in b/qpid/dotnet/client-010/examples/request-response/verify_python_dotnet.in
index ac11370f2f..faf5a06645 100644
--- a/qpid/dotnet/client-010/examples/request-response/verify_python_dotnet.in
+++ b/qpid/dotnet/client-010/examples/request-response/verify_python_dotnet.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client_dotnet.out | remove_uuid
 Activating response queue listener for: clientSystem.Byte[]
 Waiting for all responses to arrive ...
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in
index 60687b25ac..eda76c56c8 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in
index 7f75d5171c..4e14d8e2db 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer.out
 ==== direct_consumer_java.out
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in
index e467e5ee1b..0420eac901 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.out
 ==== direct_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in
index b30f61833f..a2808336e6 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== direct_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in
index 35a6f60dac..8da9041865 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== direct_producer.py.out
 ==== direct_consumer_java.out
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify.in
index c018ed32e0..1d4d1a0ccd 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
 Producer: Creating a Message Producer
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java.in
index 40b9d42e20..0690ec7b37 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.out
 ==== fanout_listener_java.out | remove_uuid
 Listener: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp.in
index dd37ab84c6..41ad460f3d 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
 Producer: Creating a Message Producer
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in
index 52e54bc91d..1433c481f1 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer_java.out
 Producer: Creating a non-transacted, auto-acknowledged session
 Producer: Creating a Message Producer
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java.in
index 369c0dbd6a..c204637fad 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.py.out
 ==== fanout_listener_java.out | remove_uuid
 Listener: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify.in
index 770f3504c2..574057b552 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher_java.out
 Publisher: Creating a non-transacted, auto-acknowledged session
 Publisher: Creating a TestMessage to send to the topics
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java.in
index 72609bee22..e298d13d1c 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.out
 ==== topic_listener_java.out | remove_uuid | sort
 Listener: Closing connection
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp.in
index c09567cb80..c411a9bac7 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher_java.out
 Publisher: Creating a non-transacted, auto-acknowledged session
 Publisher: Creating a TestMessage to send to the topics
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in
index b84f9316ff..73b1e93575 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher_java.out
 Publisher: Creating a non-transacted, auto-acknowledged session
 Publisher: Creating a TestMessage to send to the topics
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in
index a46bf65583..ab514a59ed 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.py.out
 ==== topic_listener_java.out | remove_uuid | sort
 Listener: Closing connection
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify.in
index fb9143e992..df1b5ec6c1 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client_java.out | remove_uuid
 Client: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
 Client: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java.in
index d034b368e6..811f7b7ea5 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client_java.out | remove_uuid
 Client: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
 Client: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp.in
index efb57a6292..e629d2cf9a 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.out | remove_uuid
 Activating response queue listener for: client
 Request: Twas brillig, and the slithy toves
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in
index ab600c0092..394a4fc5d4 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.py.out | remove_uuid
 Request: Twas brillig, and the slithy toves
 Request: Did gyre and gimble in the wabe.
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java.in b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java.in
index 4c28577fe8..5594a01aab 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java.in
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_python_java.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client_java.out | remove_uuid
 Client: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
 Client: Creating a non-transacted, auto-acknowledged session
diff --git a/qpid/python/examples/direct/verify.in b/qpid/python/examples/direct/verify.in
index 206a4141b8..3580e90df2 100644
--- a/qpid/python/examples/direct/verify.in
+++ b/qpid/python/examples/direct/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== direct_producer.py.out
 ==== direct_consumer.py.out
diff --git a/qpid/python/examples/fanout/verify.in b/qpid/python/examples/fanout/verify.in
index 18ac3f066d..c30e5d2d5b 100644
--- a/qpid/python/examples/fanout/verify.in
+++ b/qpid/python/examples/fanout/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== fanout_producer.py.out
 ==== fanout_consumer.py.out | remove_uuid
 Subscribed to queue 
diff --git a/qpid/python/examples/pubsub/verify.in b/qpid/python/examples/pubsub/verify.in
index 8bd6e75140..f05463db5e 100644
--- a/qpid/python/examples/pubsub/verify.in
+++ b/qpid/python/examples/pubsub/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== topic_publisher.py.out
 ==== topic_subscriber.py.out | remove_uuid | sort
 europe.news 0
diff --git a/qpid/python/examples/request-response/verify.in b/qpid/python/examples/request-response/verify.in
index 7a0337b9f0..cf12daac3b 100644
--- a/qpid/python/examples/request-response/verify.in
+++ b/qpid/python/examples/request-response/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== client.py.out | remove_uuid
 Request: Twas brillig, and the slithy toves
 Request: Did gyre and gimble in the wabe.
diff --git a/qpid/python/examples/xml-exchange/verify.in b/qpid/python/examples/xml-exchange/verify.in
index 6c33174308..e82082c04b 100644
--- a/qpid/python/examples/xml-exchange/verify.in
+++ b/qpid/python/examples/xml-exchange/verify.in
@@ -1,21 +1,21 @@
-====
-==== 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.
-====
+#
+# 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.
+#
 ==== declare_queues.py.out
 ==== xml_producer.py.out
 <weather><station>Raleigh-Durham International Airport (KRDU)</station><wind_speed_mph>0</wind_speed_mph><temperature_f>30</temperature_f><dewpoint>35</dewpoint></weather>