Author: fast Date: 2011-07-26 17:13:43 -0700 (Tue, 26 Jul 2011) New Revision: 161 - (https://svn.ict.usc.edu/vh_public/changeset/161) Log: activemq - merging changes from VH repository r10578, r10581, r10585, r10590
r10578 activemq - merging activemq-dotnet 1.5.1 into trunk. contains the changes made in r9059: - added ActiveMQ.NMS as a project reference instead of a .dll reference, removed source control sections, and removed Post- / Pre- build events calling nant. also contains r9320: - added DotNetZip (Ionic.Zlib.dll) as dependency. Not provided in source dist r10581 activemq - merging activemq 5.5.0 into trunk. Contains VH specific fixes, same as r9065, r8642 - Removed pauses from end of batch files - Modified InstallService.bat so that JAVA_HOME is no longer required. - Fix for wrapper.conf so that it launches correctly. See http://www.nabble.com/wrapper.conf-5.0-SNAPSHOT-td13154884s2354.html#a13154884 - Added wireFormat.maxInactivityDuration=0 to the URI in the conf file. - Added empty 'work' folder to fix server crash on startup. See https://issues.apache.org/jira/browse/AMQ-2946 r10585 activemq - reverting changes made in r10581. Having troubles with 5.5.0. A new dependency was added, and I'm having a hard time finding an elegant solution. 5.5.0 uses slf4j, which requires you to include a logger binding .jar. I've tried a few options: - activemq includes slf4j-log4j12-1.5.11.jar in \lib\optional. I've tried including this, which requires you to also include log4j-1.2.14.jar. For one thing, this forces everyone to use this version of log4j, which isn't ideal. Also, by doing this, it will output Warnings about not configuring log4j correctly unless you include a log4j.properties file. Requiring every app to include a log4j.properties even when they're not using log4j is not ideal either. - There are other binder .jars that I could use, but wasn't having luck. I downloaded the slf4j package, and tried using slf4j-nop-1.5.11.jar and slf4j-simple-1.5.11.jar, but I received NoClassDefFoundError: org/slf4j/helpers/NOPLoggerFactory on both. The next version of slf4j will default to the nop logger if one's not provided. So I think I'm going to hold off on upgrading activemq until the next version that will hopefully include the new version of slf4j. r10590 activemq - merging activemq-cpp 3.4.0 into trunk. Including compiled binaries. Includes fixes made in r9181 Project files have been modified to point to correct location of the apr headers and libs (..\..\apr\apr\include, ..\..\apr\apr-util\include, ..\..\apr\apr\lib, ..\..\apr\apr-util\lib). These are compiled for VS2008 SP1. Compiled with the Windows 7 SDK installed. Added: trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/DtcBasicTransactionsTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/DtcConsumerTransactionsTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/DtcProducerTransactionsTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/DtcTransactionsTestSupport.cs Modified: trunk/lib/activemq/activemq-cpp/RELEASE_NOTES.txt trunk/lib/activemq/activemq-cpp/configure trunk/lib/activemq/activemq-cpp/configure.ac trunk/lib/activemq/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h trunk/lib/activemq/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h trunk/lib/activemq/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp trunk/lib/activemq/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp trunk/lib/activemq/activemq-cpp/src/main/activemq/core/ActiveMQSession.h trunk/lib/activemq/activemq-cpp/src/main/activemq/state/ConnectionState.h trunk/lib/activemq/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp trunk/lib/activemq/activemq-cpp/src/main/activemq/transport/IOTransport.h trunk/lib/activemq/activemq-cpp/src/main/activemq/transport/Transport.h trunk/lib/activemq/activemq-cpp/src/main/activemq/transport/TransportFilter.h trunk/lib/activemq/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp trunk/lib/activemq/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.h trunk/lib/activemq/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp trunk/lib/activemq/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp trunk/lib/activemq/activemq-cpp/src/main/cms/MessageConsumer.h trunk/lib/activemq/activemq-cpp/src/main/cms/Session.h trunk/lib/activemq/activemq-cpp/src/main/decaf/util/concurrent/Executor.h trunk/lib/activemq/activemq-cpp/src/main/decaf/util/concurrent/ExecutorService.h trunk/lib/activemq/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.cpp trunk/lib/activemq/activemq-cpp/src/test/activemq/cmsutil/DummyConsumer.h trunk/lib/activemq/activemq-cpp/src/test/activemq/cmsutil/DummySession.h trunk/lib/activemq/activemq-cpp/src/test/activemq/transport/correlator/ResponseCorrelatorTest.cpp trunk/lib/activemq/activemq-cpp/vs2008-build/DebugDLL/activemq-cppd.dll trunk/lib/activemq/activemq-cpp/vs2008-build/DebugDLL/activemq-cppd.lib trunk/lib/activemq/activemq-cpp/vs2008-build/DebugDLL/activemq-cppd.pdb trunk/lib/activemq/activemq-cpp/vs2008-build/DebugDLL64/activemq-cppd.dll trunk/lib/activemq/activemq-cpp/vs2008-build/DebugDLL64/activemq-cppd.lib trunk/lib/activemq/activemq-cpp/vs2008-build/DebugDLL64/activemq-cppd.pdb trunk/lib/activemq/activemq-cpp/vs2008-build/ReleaseDLL/activemq-cpp.dll trunk/lib/activemq/activemq-cpp/vs2008-build/ReleaseDLL/activemq-cpp.lib trunk/lib/activemq/activemq-cpp/vs2008-build/ReleaseDLL/activemq-cpp.pdb trunk/lib/activemq/activemq-cpp/vs2008-build/ReleaseDLL64/activemq-cpp.dll trunk/lib/activemq/activemq-cpp/vs2008-build/ReleaseDLL64/activemq-cpp.lib trunk/lib/activemq/activemq-cpp/vs2008-build/ReleaseDLL64/activemq-cpp.pdb trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/nant-common.xml trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/nant.build trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/CommonAssemblyInfo.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/MessageConsumer.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/NetTxConnection.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/NetTxSession.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/PrefetchPolicy.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/Session.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/SessionExecutor.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/Threads/DedicatedTaskRunner.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/Threads/DefaultThreadPools.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/Threads/TaskRunnerFactory.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/TransactionContext.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/main/csharp/Transport/TransportFactory.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/AMQRedeliveryPolicyTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/CommonAssemblyInfo.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/MessageConsumerTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/NMSConnectionFactoryTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/NetTxTransactionTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/src/test/csharp/Threads/DedicatedTaskRunnerTest.cs trunk/lib/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/vs2008-activemq-test.csproj ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Smartbody-svn mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/smartbody-svn
