13 files changed, 213 insertions, 0 deletions
diff --git a/java/common/pom.xml b/java/common/pom.xml
new file mode 100644
index 0000000000..b69e1e1ec3
--- /dev/null
+++ b/java/common/pom.xml
@@ -0,0 +1,90 @@
+<!--
+    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 xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.qpid</groupId>
+  <artifactId>qpid-common</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-incubating-M2-SNAPSHOT</version>
+  <name>Qpid Common Utilities</name>
+  <url>http://cwiki.apache.org/confluence/display/qpid</url>
+
+  <parent>
+    <groupId>org.apache.qpid</groupId>
+    <artifactId>qpid</artifactId>
+    <version>1.0-incubating-M2-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <topDirectoryLocation>..</topDirectoryLocation>
+    <cluster.asl>${basedir}/src/main/xsl/cluster.asl</cluster.asl>
+    <spec.stylesheet>${basedir}/src/main/xsl/framing.xsl</spec.stylesheet>
+    <registry.stylesheet>${basedir}/src/main/xsl/registry.xsl</registry.stylesheet>
+    <registry.template>${basedir}/src/main/xsl/registry.template</registry.template>
+    <generated.path>${project.build.directory}/generated/xsl</generated.path>
+    <generated.package>org/apache/qpid/framing</generated.package>
+    <generated.dir>${generated.path}/${generated.package}</generated.dir>
+    <specs.dir>${topDirectoryLocation}/../specs</specs.dir>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>protocol-version</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <ant antfile="protocol-version.xml">
+                  <property name="cluster.asl" value="${cluster.asl}"/>
+                  <property name="spec.stylesheet" value="${spec.stylesheet}"/>
+                  <property name="registry.stylesheet" value="${registry.stylesheet}"/>
+                  <property name="registry.template" value="${registry.template}"/>
+                  <property name="generated.dir" value="${generated.dir}"/>
+                  <property name="proto_version" value="${generated.dir}/ProtocolVersionList.java"/>
+                  <property name="specs.dir" value="${specs.dir}"/>
+                </ant>
+              </tasks>
+              <sourceRoot>${generated.path}</sourceRoot>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+  </dependencies>
+</project>
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/resources/ProtocolVersionList.java b/java/common/src/main/versions/ProtocolVersionList.java.tmpl
index f0e202dac9..f0e202dac9 100644
--- a/java/common/src/main/resources/ProtocolVersionList.java
+++ b/java/common/src/main/versions/ProtocolVersionList.java.tmpl
diff --git a/java/common/src/main/resources/cluster.asl b/java/common/src/main/xsl/cluster.asl
index 40ca937904..40ca937904 100644
--- a/java/common/src/main/resources/cluster.asl
+++ b/java/common/src/main/xsl/cluster.asl
diff --git a/java/common/stylesheets/framing.xsl b/java/common/src/main/xsl/framing.xsl
index b8ae20aaf5..b8ae20aaf5 100644
--- a/java/common/stylesheets/framing.xsl
+++ b/java/common/src/main/xsl/framing.xsl
diff --git a/java/common/stylesheets/java.xsl b/java/common/src/main/xsl/java.xsl
index 685a9a27ed..685a9a27ed 100644
--- a/java/common/stylesheets/java.xsl
+++ b/java/common/src/main/xsl/java.xsl
diff --git a/java/common/stylesheets/prepare1.xsl b/java/common/src/main/xsl/prepare1.xsl
index 03e1fa7634..03e1fa7634 100644
--- a/java/common/stylesheets/prepare1.xsl
+++ b/java/common/src/main/xsl/prepare1.xsl
diff --git a/java/common/stylesheets/prepare2.xsl b/java/common/src/main/xsl/prepare2.xsl
index 14f4f33841..14f4f33841 100644
--- a/java/common/stylesheets/prepare2.xsl
+++ b/java/common/src/main/xsl/prepare2.xsl
diff --git a/java/common/stylesheets/prepare3.xsl b/java/common/src/main/xsl/prepare3.xsl
index f8cf0c8932..f8cf0c8932 100644
--- a/java/common/stylesheets/prepare3.xsl
+++ b/java/common/src/main/xsl/prepare3.xsl
diff --git a/java/common/stylesheets/readme.txt b/java/common/src/main/xsl/readme.txt
index b373055df9..b373055df9 100644
--- a/java/common/stylesheets/readme.txt
+++ b/java/common/src/main/xsl/readme.txt
diff --git a/java/common/src/main/resources/registry.template b/java/common/src/main/xsl/registry.template
index 87c5afcb7b..87c5afcb7b 100644
--- a/java/common/src/main/resources/registry.template
+++ b/java/common/src/main/xsl/registry.template
diff --git a/java/common/stylesheets/registry.xsl b/java/common/src/main/xsl/registry.xsl
index c70dbe21a5..c70dbe21a5 100644
--- a/java/common/stylesheets/registry.xsl
+++ b/java/common/src/main/xsl/registry.xsl
diff --git a/java/common/stylesheets/utils.xsl b/java/common/src/main/xsl/utils.xsl
index 95e15c6e38..95e15c6e38 100644
--- a/java/common/stylesheets/utils.xsl
+++ b/java/common/src/main/xsl/utils.xsl