From 8387295adefec0cb80f2504380a2733f5d1cbfed Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Tue, 13 Nov 2012 19:49:39 +0000
Subject: [PATCH] Take the activemq-amqp module out of the ustable profile,
 include it in the default assembly.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408918 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-amqp/pom.xml                                 |  4 ++--
 .../activemq/transport/amqp/AmqpWireFormat.java       | 11 +++++++++--
 activemq-core/pom.xml                                 |  8 ++++----
 assembly/pom.xml                                      |  4 ++++
 assembly/src/main/descriptors/common-bin.xml          |  4 +++-
 assembly/src/release/conf/activemq.xml                |  1 +
 pom.xml                                               |  4 +++-
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index c4f04620aa..bc39041eb0 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-proton</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${qpid-proton-version}</version>
     </dependency>
 
     <dependency>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-amqp-1-0-client-jms</artifactId>
-      <version>0.18</version>
+      <version>${qpid-jms-version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java
index a24319947e..631011e7be 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java
@@ -30,7 +30,7 @@ public class AmqpWireFormat implements WireFormat {
 
 
     private int version = 1;
-    private long maxFrameLength = 1024*1024*100;
+    private long maxFrameSize = 1024*1024*100;
 
     public ByteSequence marshal(Object command) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -60,7 +60,7 @@ public class AmqpWireFormat implements WireFormat {
             return new AmqpHeader(magic);
         } else {
             int size = dataIn.readInt();
-            if( size > maxFrameLength ) {
+            if( size > maxFrameSize) {
                 throw new AmqpProtocolException("Frame size exceeded max frame length.");
             }
             Buffer frame = new Buffer(size);
@@ -85,4 +85,11 @@ public class AmqpWireFormat implements WireFormat {
     }
 
 
+    public long getMaxFrameSize() {
+        return maxFrameSize;
+    }
+
+    public void setMaxFrameSize(long maxFrameSize) {
+        this.maxFrameSize = maxFrameSize;
+    }
 }
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 430b21bdfc..dea82c1fcc 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -108,6 +108,10 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-stomp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-amqp</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -1197,10 +1201,6 @@
     <profile>
       <id>unstable</id>
       <dependencies>
-        <dependency>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activemq-amqp</artifactId>
-        </dependency>
       </dependencies>
     </profile>
   </profiles>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d57b4d69a0..6535609c85 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -93,6 +93,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-stomp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-amqp</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 3a6621cee7..7dc4adba21 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -112,11 +112,11 @@
         <include>org.slf4j:jcl-over-slf4j</include>
         <include>${pom.groupId}:activemq-client</include>
         <include>${pom.groupId}:activemq-broker</include>
+        <include>${pom.groupId}:activemq-openwire-legacy</include>
         <include>${pom.groupId}:activemq-kahadb-store</include>
         <include>${pom.groupId}:activemq-spring</include>
         <include>${pom.groupId}:activemq-console</include>
         <include>${pom.groupId}:activemq-jaas</include>
-        <include>${pom.groupId}:kahadb</include>
         <include>org.apache.activemq.protobuf:activemq-protobuf</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
@@ -140,6 +140,7 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
+        <include>${pom.groupId}:activemq-amqp</include>
         <include>${pom.groupId}:activemq-mqtt</include>
         <include>${pom.groupId}:activemq-stomp</include>
         <include>${pom.groupId}:activemq-http</include>
@@ -182,6 +183,7 @@
         <include>org.jasypt:jasypt</include>
         <include>org.jasypt:jasypt-spring3</include>
         <include>javax.jmdns:jmdns</include>
+        <include>org.apache.qpid:qpid-proton</include>
       </includes>
     </dependencySet>
     <dependencySet>
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 8a4c031f93..ec81be109d 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -143,6 +143,7 @@
         <transportConnectors>
             <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
             <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"/>
+            <transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"/>
         </transportConnectors>
 
         <!-- destroy the spring context on shutdown to stop jetty -->
diff --git a/pom.xml b/pom.xml
index 84c4e0673c..04c3f88f84 100755
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,8 @@
     <org-apache-derby-version>10.9.1.0</org-apache-derby-version>
     <org.osgi.core-version>4.2.0</org.osgi.core-version>
     <p2psockets-version>1.1.2</p2psockets-version>
+    <qpid-proton-version>1.0-SNAPSHOT</qpid-proton-version>
+    <qpid-jms-version>0.18</qpid-jms-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.4</saxon-version>
@@ -202,6 +204,7 @@
 
     <module>activemq-stomp</module>
     <module>activemq-mqtt</module>
+    <module>activemq-amqp</module>
 
     <module>activemq-kahadb-store</module>
     <module>activemq-amq-store</module>
@@ -1436,7 +1439,6 @@
     <profile>
       <id>unstable</id>
       <modules>
-        <module>activemq-amqp</module>
       </modules>
     </profile>
     <profile>