You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/13 20:49:40 UTC
svn commit: r1408918 - in /activemq/trunk: ./ activemq-amqp/
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/
activemq-core/ assembly/ assembly/src/main/descriptors/
assembly/src/release/conf/
Author: chirino
Date: Tue Nov 13 19:49:39 2012
New Revision: 1408918
URL: http://svn.apache.org/viewvc?rev=1408918&view=rev
Log:
Take the activemq-amqp module out of the ustable profile, include it in the default assembly.
Modified:
activemq/trunk/activemq-amqp/pom.xml
activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java
activemq/trunk/activemq-core/pom.xml
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/assembly/src/release/conf/activemq.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/pom.xml?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/activemq-amqp/pom.xml (original)
+++ activemq/trunk/activemq-amqp/pom.xml Tue Nov 13 19:49:39 2012
@@ -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>
Modified: activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java (original)
+++ activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java Tue Nov 13 19:49:39 2012
@@ -30,7 +30,7 @@ public class AmqpWireFormat implements W
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 W
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 W
}
+ public long getMaxFrameSize() {
+ return maxFrameSize;
+ }
+
+ public void setMaxFrameSize(long maxFrameSize) {
+ this.maxFrameSize = maxFrameSize;
+ }
}
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Nov 13 19:49:39 2012
@@ -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>
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Nov 13 19:49:39 2012
@@ -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>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Nov 13 19:49:39 2012
@@ -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>
Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Tue Nov 13 19:49:39 2012
@@ -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&wireformat.maxFrameSize=104857600"/>
+ <transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&wireformat.maxFrameSize=104857600"/>
</transportConnectors>
<!-- destroy the spring context on shutdown to stop jetty -->
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1408918&r1=1408917&r2=1408918&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Nov 13 19:49:39 2012
@@ -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>