You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2011/04/21 01:19:57 UTC
svn commit: r1095555 - in
/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp: ./
src/main/activemq/core/ src/main/activemq/state/
src/main/activemq/transport/tcp/ src/main/activemq/wireformat/openwire/
Author: tabish
Date: Wed Apr 20 23:19:57 2011
New Revision: 1095555
URL: http://svn.apache.org/viewvc?rev=1095555&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQCPP-363
Modified:
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/RELEASE_NOTES.txt
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/configure.ac
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/pom.xml
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionState.h
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/RELEASE_NOTES.txt?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/RELEASE_NOTES.txt (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/RELEASE_NOTES.txt Wed Apr 20 23:19:57 2011
@@ -1,4 +1,9 @@
=========================================================================
+== Release Notes for ActiveMQ CPP 3.4.0 ==
+=========================================================================
+
+
+=========================================================================
== Release Notes for ActiveMQ CPP 3.3.0 ==
=========================================================================
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/configure.ac?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/configure.ac (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/configure.ac Wed Apr 20 23:19:57 2011
@@ -20,7 +20,7 @@ AC_PREREQ(2.61)
## --------------------------------
## Initialization macros.
## --------------------------------
-AC_INIT(activemq-cpp, 3.3.0, dev@activemq.apache.org)
+AC_INIT(activemq-cpp, 3.4.0, dev@activemq.apache.org)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@ AC_CONFIG_MACRO_DIR([m4])
## ------------------------------------------------------------
ACTIVEMQ_LIBRARY_NAME=activemq-cpp
ACTIVEMQ_MAJOR_VERSION=3
-ACTIVEMQ_MINOR_VERSION=3
+ACTIVEMQ_MINOR_VERSION=4
ACTIVEMQ_PATCH_VERSION=0
ACTIVEMQ_VERSION=${ACTIVEMQ_MAJOR_VERSION}.${ACTIVEMQ_MINOR_VERSION}.${ACTIVEMQ_PATCH_VERSION}
ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
@@ -39,7 +39,7 @@ ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
## Define the Version variables for the CMS API Library
## ------------------------------------------------------------
CMSAPI_MAJOR_VERSION=2
-CMSAPI_MINOR_VERSION=3
+CMSAPI_MINOR_VERSION=4
CMSAPI_VERSION=${CMSAPI_MAJOR_VERSION}.${CMSAPI_MINOR_VERSION}
AC_SUBST(CMSAPI_MAJOR_VERSION)
@@ -75,7 +75,7 @@ AC_SUBST(CMSAPI_VERSION)
## 3. Programs may need to be changed, recompiled, relinked in order to use the new version. Bump
## current, set revision and age to 0.
##
-ACTIVEMQ_LIBRARY_VERSION=13:0:0
+ACTIVEMQ_LIBRARY_VERSION=14:0:0
AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
AC_SUBST(ACTIVEMQ_VERSION)
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/pom.xml?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/pom.xml (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/pom.xml Wed Apr 20 23:19:57 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.activemq-cpp</groupId>
<artifactId>activemq-cpp-pom</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-cpp-library</artifactId>
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp Wed Apr 20 23:19:57 2011
@@ -31,7 +31,7 @@ ActiveMQConnectionMetaData::~ActiveMQCon
////////////////////////////////////////////////////////////////////////////////
std::string ActiveMQConnectionMetaData::getCMSVersion() const {
- return "2.3";
+ return "2.4";
}
////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,7 @@ int ActiveMQConnectionMetaData::getCMSMa
////////////////////////////////////////////////////////////////////////////////
int ActiveMQConnectionMetaData::getCMSMinorVersion() const {
- return 3;
+ return 4;
}
////////////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@ std::string ActiveMQConnectionMetaData::
////////////////////////////////////////////////////////////////////////////////
std::string ActiveMQConnectionMetaData::getProviderVersion() const {
- return "3.3.0";
+ return "3.4.0";
}
////////////////////////////////////////////////////////////////////////////////
@@ -61,7 +61,7 @@ int ActiveMQConnectionMetaData::getProvi
////////////////////////////////////////////////////////////////////////////////
int ActiveMQConnectionMetaData::getProviderMinorVersion() const {
- return 3;
+ return 4;
}
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionState.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionState.h?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionState.h (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionState.h Wed Apr 20 23:19:57 2011
@@ -141,7 +141,7 @@ namespace state {
return sessions.values();
}
- StlMap< Pointer<ConsumerId>, Pointer<ConsumerInfo>, ConsumerId::COMPARATOR > getRecoveringPullConsumers() {
+ StlMap< Pointer<ConsumerId>, Pointer<ConsumerInfo>, ConsumerId::COMPARATOR >& getRecoveringPullConsumers() {
return recoveringPullConsumers;
}
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp Wed Apr 20 23:19:57 2011
@@ -824,17 +824,8 @@ void ConnectionStateTracker::connectionI
control->setDestination( stalledConsumers.get( *key )->getDestination() );
try {
-
- //if( LOG.isDebugEnabled() ) {
- // LOG.debug("restored recovering consumer: " + control.getConsumerId() +
- // " with: " + control.getPrefetch());
- //}
transport->oneway( control );
} catch( Exception& ex ) {
- //if( LOG.isDebugEnabled() ) {
- // LOG.debug("Failed to submit control for consumer: " + control.getConsumerId() +
- // " with: " + control.getPrefetch(), ex);
- //}
}
}
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp Wed Apr 20 23:19:57 2011
@@ -97,7 +97,10 @@ Pointer<Transport> TcpTransportFactory::
}
// If command tracing was enabled, wrap the transport with a logging transport.
+ // We support the old CMS value, the ActiveMQ trace value and the NMS useLogging
+ // value in order to be more friendly.
if( properties.getProperty( "transport.commandTracingEnabled", "false" ) == "true" ||
+ properties.getProperty( "transport.useLogging", "false" ) == "true" ||
properties.getProperty( "transport.trace", "false" ) == "true" ) {
// Create the Transport for response correlator
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp?rev=1095555&r1=1095554&r2=1095555&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp Wed Apr 20 23:19:57 2011
@@ -44,7 +44,7 @@ Pointer<WireFormat> OpenWireFormatFactor
// Configure the version to use
info->setVersion( Integer::parseInt(
- properties.getProperty( "wireFormat.version", "5" ) ) );
+ properties.getProperty( "wireFormat.version", "6" ) ) );
// parse params out of the properties
info->setStackTraceEnabled( Boolean::parseBoolean(