From c9e5b84950a75530b82ac72acf71ee3141d8bef1 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Wed, 11 Jan 2012 11:07:52 +0000
Subject: QPID-3736 : Upgrade to BDB version 5.0.34

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1229957 13f79535-47bb-0310-9956-ffa450edef68
---
 java/bdbstore/build.xml                            |  2 +-
 .../server/store/berkeleydb/BDBMessageStore.java   |  3 +--
 java/build.deps                                    |  2 +-
 java/lib/poms/je-4.0.117.xml                       | 22 ----------------------
 java/lib/poms/je-5.0.34.xml                        | 22 ++++++++++++++++++++++
 5 files changed, 25 insertions(+), 26 deletions(-)
 delete mode 100644 java/lib/poms/je-4.0.117.xml
 create mode 100644 java/lib/poms/je-5.0.34.xml

(limited to 'java')

diff --git a/java/bdbstore/build.xml b/java/bdbstore/build.xml
index 9513e7cc5b..af7c108aa9 100644
--- a/java/bdbstore/build.xml
+++ b/java/bdbstore/build.xml
@@ -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" />
 
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
index 81b5c8599f..2e2d2f0b11 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
@@ -2093,8 +2093,7 @@ public class BDBMessageStore implements MessageStore, DurableConfigurationStore
 
             try
             {
-                //TODO - upgrade to BDB 5.0, then use: _environment.flushLog(true);
-                _environment.sync();
+                _environment.flushLog(true);
 
                 for(int i = 0; i < size; i++)
                 {
diff --git a/java/build.deps b/java/build.deps
index 20c6008a04..dd3853cb73 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -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}
 
diff --git a/java/lib/poms/je-4.0.117.xml b/java/lib/poms/je-4.0.117.xml
deleted file mode 100644
index 85573a99f9..0000000000
--- a/java/lib/poms/je-4.0.117.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>com.sleepycat</groupId>
-  <artifactId>je</artifactId>
-  <version>4.0.117</version>
-</dep>
diff --git a/java/lib/poms/je-5.0.34.xml b/java/lib/poms/je-5.0.34.xml
new file mode 100644
index 0000000000..1e4688019b
--- /dev/null
+++ b/java/lib/poms/je-5.0.34.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>com.sleepycat</groupId>
+  <artifactId>je</artifactId>
+  <version>5.0.34</version>
+</dep>
-- 
cgit v1.2.1