Merge of broker from trunk rev 478883

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/new_persistence@479420 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 375 insertions, 141 deletions

diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml
new file mode 100644
index 0000000000..59e83d7f8f
--- /dev/null
+++ b/java/common/protocol-version.xml
@@ -0,0 +1,123 @@
+<!--
+ -
+ - 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.
+ -
+ -->
+<project name="Qpid Common Protocol Versions" default="generate">
+
+  <property name="saxon.jar" value="lib/saxon/saxon8.jar"/>
+  
+  <macrodef name="saxon">
+    <attribute name="out"/>
+    <attribute name="src"/>
+    <attribute name="xsl"/>
+    <element name="args" implicit="true" optional="true"/>
+    <sequential>
+      <java jar="${saxon.jar}" fork="true">
+        <arg value="-o"/>
+        <arg value="@{out}"/>
+        <arg value="@{src}"/>
+        <arg value="@{xsl}"/>
+        <args/>
+      </java>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="amqp">
+    <attribute name="ver"/>
+    <sequential>
+      <!-- Check for the existence of the AMQP specification file -->
+      <property name="amqpspecfile-@{ver}" value="${specs.dir}/amqp-@{ver}.xml"/>
+      <available file="${specs.dir}/amqp-@{ver}.xml"
+              property="amqpspecfile.present-@{ver}"/>
+      <fail unless="amqpspecfile.present-@{ver}"
+              message="ERROR: AMQP specification file ${specs.dir}/amqp-@{ver}.xml not found."/>
+      
+      <!-- Read in the file as a set of properties; extract the amqp version -->
+      <xmlproperty prefix="@{ver}" file="${specs.dir}/amqp-@{ver}.xml"/>
+      <echo>Found AMQP specification file "${specs.dir}/amqp-@{ver}.xml"; major=${@{ver}.amqp(major)} minor=${@{ver}.amqp(minor)}</echo>
+
+      <!-- Add the version to the ProtocolVersionList.java file -->
+      <replaceregexp file="${proto_version}" match=" // !VER!"
+              replace=",${line.separator}        {${@{ver}.amqp(major)}, ${@{ver}.amqp(minor)}} // !VER!"
+              flags="s" byline="true"/>
+      <replaceregexp file="${proto_version}" match=" // !VER1!"
+              replace="{${@{ver}.amqp(major)}, ${@{ver}.amqp(minor)}} // !VER!"
+              flags="s" byline="true"/>
+
+      <!-- Create directory; generate from specification file -->
+      <mkdir dir="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}"/>
+      <saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/results.out"
+             src="${specs.dir}/amqp-@{ver}.xml" 
+             xsl="${spec.stylesheet}">
+        <arg value="major=${@{ver}.amqp(major)}"/>
+        <arg value="minor=${@{ver}.amqp(minor)}"/>
+        <arg value="registry_name=MainRegistry"/>
+      </saxon>
+      <!--  -->
+      <saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/cluster.out"
+             src="${cluster.asl}"
+             xsl="${spec.stylesheet}">
+        <arg value="major=${@{ver}.amqp(major)}"/>
+        <arg value="minor=${@{ver}.amqp(minor)}"/>
+        <arg value="registry_name=ClusterRegistry"/>
+      </saxon>
+      <saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/registry.out"
+             src="${registry.template}"
+             xsl="${registry.stylesheet}">
+        <arg value="major=${@{ver}.amqp(major)}"/>
+        <arg value="minor=${@{ver}.amqp(minor)}"/>
+      </saxon>
+    </sequential>
+  </macrodef>
+
+<!--  <uptodate property="generated" targetfile="${generated.dir}/results.out"
+            srcfile="${amqp.xml}"/> -->
+
+<!--  <target name="generate" unless="generated"> -->
+  <target name="generate">
+    <mkdir dir="${generated.dir}"/>
+    <copy file="src/main/versions/ProtocolVersionList.java.tmpl" tofile="${proto_version}"
+            overwrite="true"/>
+    <!--
+    NOTE: Set the AMQP version numbers to be supported in this build here.
+    The last version in this list will be the version returned when a protocol
+    ProtocolInitiation NAK frame is returned by the broker. Usually this is the
+    highest or most recent version.
+    -->
+    <!-- <amqp ver="0.8"/>
+    <amqp ver="0.9"/>
+    <amqp ver="0.10"/> -->
+    <amqp ver="8.0"/>
+    
+<!--     <saxon out="${generated.dir}/results.out" src="${amqp.xml}"
+           xsl="${stylesheet}">
+      <arg value="asl_base=${asl.base}"/>
+      <arg value="registry_name=MainRegistry"/>
+    </saxon>
+    <saxon out="${generated.dir}/cluster.out" src="${cluster.asl}"
+           xsl="${stylesheet}">
+      <arg value="registry_name=ClusterRegistry"/>
+    </saxon>
+    <saxon out="${generated.dir}/registry.out" src="${registry_template}"
+           xsl="${registry_stylesheet}"/> -->
+  </target>
+
+  <target name="precompile" depends="generate"/>
+
+</project>
diff --git a/java/common/src/main/versions/ProtocolVersionList.java b/java/common/src/main/versions/ProtocolVersionList.java
deleted file mode 100644
index febf002f08..0000000000
--- a/java/common/src/main/versions/ProtocolVersionList.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
- *
- */
-
-/**
- * This class is autogenerated, do not modify.
- */
-
-package org.apache.qpid.framing;
-
-/**
- * NOTE: Don't remove the line containing the token VER or VER1 - these are
- * markers for code generation.
- */
-
-public interface ProtocolVersionList
-{
-    public final int PROTOCOL_MAJOR = 0;
-    public final int PROTOCOL_MINOR = 1;
-    public final byte pv[][] = {
-         // !VER1!
-        };
-}
diff --git a/java/common/src/main/versions/ProtocolVersionList.java.tmpl b/java/common/src/main/versions/ProtocolVersionList.java.tmpl
new file mode 100644
index 0000000000..301c428f3b
--- /dev/null
+++ b/java/common/src/main/versions/ProtocolVersionList.java.tmpl
@@ -0,0 +1,40 @@
+/**

+ *

+ * 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.

+ *

+ */

+

+/**

+ * This class is autogenerated, do not modify.

+ */

+

+package org.apache.qpid.framing;

+

+/**

+ * NOTE: Don't remove the line containing the token VER or VER1 - these are

+ * markers for code generation.

+ */

+

+public interface ProtocolVersionList

+{

+    public final int PROTOCOL_MAJOR = 0;

+    public final int PROTOCOL_MINOR = 1;

+    public final byte pv[][] = {

+         // !VER1!

+        };

+}

diff --git a/java/common/src/main/xsl/cluster.asl b/java/common/src/main/xsl/cluster.asl
new file mode 100644
index 0000000000..40ca937904
--- /dev/null
+++ b/java/common/src/main/xsl/cluster.asl
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+
+<amqp major="8" minor="0" port="5672" comment="AMQ protocol 0.80">
+
+<class name = "cluster" index = "101">
+
+<doc>
+    An extension that allows brokers to communicate in order to
+    provide a clustered service to clients.  
+</doc>
+
+<method name = "join">
+  <field name = "broker" type = "shortstr" />
+</method>
+
+<method name = "membership">
+  <field name = "members" type = "longstr" />
+</method>
+
+<method name = "synch">
+</method>
+
+<method name = "leave">
+  <field name = "broker" type = "shortstr" />
+</method>
+
+<method name = "suspect">
+  <field name = "broker" type = "shortstr" />
+</method>
+
+<method name = "ping">
+  <field name = "broker" type = "shortstr" />
+  <field name = "load" type = "long" />
+  <field name = "response required" type = "bit" />
+</method>
+
+</class>
+
+</amqp>
diff --git a/java/common/src/main/xsl/framing.xsl b/java/common/src/main/xsl/framing.xsl
index bb17a72bce..b8ae20aaf5 100644
--- a/java/common/src/main/xsl/framing.xsl
+++ b/java/common/src/main/xsl/framing.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?> 
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
diff --git a/java/common/src/main/xsl/java.xsl b/java/common/src/main/xsl/java.xsl
index df72bfb0c0..685a9a27ed 100644
--- a/java/common/src/main/xsl/java.xsl
+++ b/java/common/src/main/xsl/java.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?> 
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
diff --git a/java/common/src/main/xsl/prepare1.xsl b/java/common/src/main/xsl/prepare1.xsl
index 5b7641e408..03e1fa7634 100644
--- a/java/common/src/main/xsl/prepare1.xsl
+++ b/java/common/src/main/xsl/prepare1.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?> 
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
diff --git a/java/common/src/main/xsl/prepare2.xsl b/java/common/src/main/xsl/prepare2.xsl
index 38110b0a33..14f4f33841 100644
--- a/java/common/src/main/xsl/prepare2.xsl
+++ b/java/common/src/main/xsl/prepare2.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?> 
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
diff --git a/java/common/src/main/xsl/prepare3.xsl b/java/common/src/main/xsl/prepare3.xsl
index 6d6d75d8f0..f8cf0c8932 100644
--- a/java/common/src/main/xsl/prepare3.xsl
+++ b/java/common/src/main/xsl/prepare3.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?> 
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
diff --git a/java/common/src/main/xsl/registry.template b/java/common/src/main/xsl/registry.template
new file mode 100644
index 0000000000..87c5afcb7b
--- /dev/null
+++ b/java/common/src/main/xsl/registry.template
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<registries>
+    <registry name="MainRegistry"/>
+    <registry name="ClusterRegistry"/>
+</registries>
diff --git a/java/common/src/main/xsl/registry.xsl b/java/common/src/main/xsl/registry.xsl
index eb382c296b..c70dbe21a5 100644
--- a/java/common/src/main/xsl/registry.xsl
+++ b/java/common/src/main/xsl/registry.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?> 
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
diff --git a/java/common/src/main/xsl/utils.xsl b/java/common/src/main/xsl/utils.xsl
index e6fda6c9d5..95e15c6e38 100644
--- a/java/common/src/main/xsl/utils.xsl
+++ b/java/common/src/main/xsl/utils.xsl
@@ -1,19 +1,22 @@
 <?xml version='1.0'?>
 <!--
  -
- - Copyright (c) 2006 The Apache Software Foundation
- -
- - Licensed 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.
  -
  -->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org">
@@ -23,19 +26,22 @@
 <!-- create copyright notice for generated files -->
 <xsl:function name="amq:copyright">/**
 *
-* Copyright (c) 2006 The Apache Software Foundation
-*
-* Licensed 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.
 *
 */
 </xsl:function>