Author: rgodfrey
Date: Wed Jan 11 11:07:52 2012
New Revision: 1229957
URL: http://svn.apache.org/viewvc?rev=1229957&view=rev
Log:
QPID-3736 : Upgrade to BDB version 5.0.34
Added:
qpid/trunk/qpid/java/lib/poms/je-5.0.34.xml
- copied, changed from r1229955,
qpid/trunk/qpid/java/lib/poms/je-4.0.117.xml
Removed:
qpid/trunk/qpid/java/lib/poms/je-4.0.117.xml
Modified:
qpid/trunk/qpid/java/bdbstore/build.xml
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
qpid/trunk/qpid/java/build.deps
Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1229957&r1=1229956&r2=1229957&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Wed Jan 11 11:07:52 2012
@@ -24,7 +24,7 @@
<import file="../module.xml" />
<property name="bdb.lib.dir" value="${project.root}/lib/bdbstore" />
- <property name="bdb.version" value="4.0.117" />
+ <property name="bdb.version" value="5.0.34" />
<property name="bdb.download.url"
value="http://download.oracle.com/maven/com/sleepycat/je/${bdb.version}/je-${bdb.version}.jar";
/>
<property name="bdb.jar.file" value="${bdb.lib.dir}/je-${bdb.version}.jar"
/>
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1229957&r1=1229956&r2=1229957&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Wed Jan 11 11:07:52 2012
@@ -2093,8 +2093,7 @@ public class BDBMessageStore implements
try
{
- //TODO - upgrade to BDB 5.0, then use:
_environment.flushLog(true);
- _environment.sync();
+ _environment.flushLog(true);
for(int i = 0; i < size; i++)
{
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1229957&r1=1229956&r2=1229957&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Wed Jan 11 11:07:52 2012
@@ -144,7 +144,7 @@ management-common.test.libs=${test.libs}
ra.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${slf4j-api}
${geronimo-kernel} ${geronimo-openejb}
# optional bdbstore module deps
-bdb-je=lib/bdbstore/je-4.0.117.jar
+bdb-je=lib/bdbstore/je-5.0.34.jar
bdbstore.libs=${bdb-je}
bdbstore.test.libs=${test.libs}
Copied: qpid/trunk/qpid/java/lib/poms/je-5.0.34.xml (from r1229955,
qpid/trunk/qpid/java/lib/poms/je-4.0.117.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/je-5.0.34.xml?p2=qpid/trunk/qpid/java/lib/poms/je-5.0.34.xml&p1=qpid/trunk/qpid/java/lib/poms/je-4.0.117.xml&r1=1229955&r2=1229957&rev=1229957&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/je-4.0.117.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/je-5.0.34.xml Wed Jan 11 11:07:52 2012
@@ -18,5 +18,5 @@
<dep>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>4.0.117</version>
+ <version>5.0.34</version>
</dep>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
