rhmessaging commits: r4136 - mgmt/newdata/cumin/etc.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-07-20 16:09:38 -0400 (Tue, 20 Jul 2010)
New Revision: 4136
Modified:
mgmt/newdata/cumin/etc/cumin.conf
Log:
These are the true defaults
Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf 2010-07-20 19:42:56 UTC (rev 4135)
+++ mgmt/newdata/cumin/etc/cumin.conf 2010-07-20 20:09:38 UTC (rev 4136)
@@ -6,12 +6,12 @@
# log-level: info
[web]
-# log-file: /var/log/cumin/web.log
+# log-file: $CUMIN_HOME/log/web.log
# host: localhost
# port: 45672
# operator-email: [none]
[data]
-# log-file: /var/log/cumin/data.log
+# log-file: $CUMIN_HOME/log/data.log
# expire-frequency: 600
# expire-threshold: 86400
13 years, 11 months
rhmessaging commits: r4135 - mgmt/newdata/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-07-20 15:42:56 -0400 (Tue, 20 Jul 2010)
New Revision: 4135
Modified:
mgmt/newdata/cumin/python/cumin/grid/negotiator.py
mgmt/newdata/cumin/python/cumin/grid/negotiator.strings
Log:
Removing unused class
Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/negotiator.py 2010-07-20 18:30:33 UTC (rev 4134)
+++ mgmt/newdata/cumin/python/cumin/grid/negotiator.py 2010-07-20 19:42:56 UTC (rev 4135)
@@ -938,13 +938,6 @@
return params
-class EditButton(ActionSet):
- def __init__(self, app, name, task, negotiator):
- super(EditButton, self).__init__(app, name)
-
- link = ObjectTaskLink(app, "edit", task)
- self.add_child(link)
-
class NegotiatorLimitSet(ObjectTask):
def __init__(self, app, frame):
super(NegotiatorLimitSet, self).__init__(app, frame)
Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/negotiator.strings 2010-07-20 18:30:33 UTC (rev 4134)
+++ mgmt/newdata/cumin/python/cumin/grid/negotiator.strings 2010-07-20 19:42:56 UTC (rev 4135)
@@ -433,11 +433,6 @@
]]>
</script>
-[EditButton.html]
-<ul class="actions">
- <li>{edit}</li>
-</ul>
-
[ExpandColumn.css]
th.expand {
width: 1em;
13 years, 11 months
rhmessaging commits: r4134 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2010-07-20 14:30:33 -0400 (Tue, 20 Jul 2010)
New Revision: 4134
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Bug 614944 - "qpidd broker crash in mrg::msgstore::TxnCtxt::abort() -> DbTxn::abort()": Fix part 2, in which the store will give BDB 3 chances to sucessfully start. If a failure is caught, then it will wait 1 sec, then try again. If the third attempt fails, the exception will be allowed to be thrown. All attempts are logged.
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2010-07-20 17:07:24 UTC (rev 4133)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2010-07-20 18:30:33 UTC (rev 4134)
@@ -306,6 +306,16 @@
void MessageStoreImpl::init()
{
+ const int retryMax = 3;
+ int bdbRetryCnt = 0;
+ do {
+ if (bdbRetryCnt++ > 0)
+ {
+ closeDbs();
+ ::usleep(1000000); // 1 sec delay
+ QPID_LOG(error, "Previoius BDB store initialization failed, retrying (" << bdbRetryCnt << " of " << retryMax << ")...");
+ }
+
try {
journal::jdir::create_dir(getBdbBaseDir());
@@ -353,6 +363,7 @@
"db_upgrade or using db_recover - but the db4-utils package must also be installed to use these utilities.)", e);
}
QPID_LOG(error, "BDB exception occurred while initializing store: " << e.what());
+ if (bdbRetryCnt >= retryMax)
THROW_STORE_EXCEPTION_2("BDB exception occurred while initializing store", e);
} catch (const journal::jexception& e) {
QPID_LOG(error, "Journal Exception occurred while initializing store: " << e);
@@ -361,6 +372,7 @@
QPID_LOG(error, "Unknown exception occurred while initializing store.");
throw;
}
+ } while (!isInit);
}
void MessageStoreImpl::finalize()
13 years, 11 months
rhmessaging commits: r4133 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2010-07-20 13:07:24 -0400 (Tue, 20 Jul 2010)
New Revision: 4133
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
store/trunk/cpp/lib/MessageStoreImpl.h
Log:
Bug 614944 - "qpidd broker crash in mrg::msgstore::TxnCtxt::abort() -> DbTxn::abort()": Fix part 1, which improves the exception handling so that there is no throw within a catch. This will not change the probability of occurance of this bug, but the logs and exception message outcome will be different.
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2010-07-20 16:51:16 UTC (rev 4132)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2010-07-20 17:07:24 UTC (rev 4133)
@@ -306,57 +306,61 @@
void MessageStoreImpl::init()
{
- journal::jdir::create_dir(getBdbBaseDir());
+ try {
+ journal::jdir::create_dir(getBdbBaseDir());
- try {
- dbenv.reset(new DbEnv(0));
- dbenv->set_errpfx("msgstore");
- dbenv->set_lg_regionmax(256000); // default = 65000
- dbenv->open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0);
- } catch (const DbException& e) {
- if (e.get_errno() == DB_VERSION_MISMATCH)
- THROW_STORE_EXCEPTION_2("Database environment mismatch: This version of bd4 does not match that which created the store database. "
- "(If recovery is not important, delete the contents of the store directory. Otherwise, try upgrading the database using "
- "db_upgrade or using db_recover - but the db4-utils package must also be installed to use these utilities.)", e);
- THROW_STORE_EXCEPTION_2("Error opening environment", e);
- }
+ dbenv.reset(new DbEnv(0));
+ dbenv->set_errpfx("msgstore");
+ dbenv->set_lg_regionmax(256000); // default = 65000
+ dbenv->open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0);
- TxnCtxt txn;
- try {
- // Databases are constructed here instead of the constructor so that the DB_RECOVER flag can be used
- // against the database environment. Recover can only be performed if no databases have been created
- // against the environment at the time of recovery, as recovery invalidates the environment.
- queueDb.reset(new Db(dbenv.get(), 0));
- configDb.reset(new Db(dbenv.get(), 0));
- exchangeDb.reset(new Db(dbenv.get(), 0));
- mappingDb.reset(new Db(dbenv.get(), 0));
- bindingDb.reset(new Db(dbenv.get(), 0));
- generalDb.reset(new Db(dbenv.get(), 0));
+ // Databases are constructed here instead of the constructor so that the DB_RECOVER flag can be used
+ // against the database environment. Recover can only be performed if no databases have been created
+ // against the environment at the time of recovery, as recovery invalidates the environment.
+ queueDb.reset(new Db(dbenv.get(), 0));
+ dbs.push_back(queueDb);
+ configDb.reset(new Db(dbenv.get(), 0));
+ dbs.push_back(configDb);
+ exchangeDb.reset(new Db(dbenv.get(), 0));
+ dbs.push_back(exchangeDb);
+ mappingDb.reset(new Db(dbenv.get(), 0));
+ dbs.push_back(mappingDb);
+ bindingDb.reset(new Db(dbenv.get(), 0));
+ dbs.push_back(bindingDb);
+ generalDb.reset(new Db(dbenv.get(), 0));
+ dbs.push_back(generalDb);
- txn.begin(dbenv.get(), false);
- open(queueDb, txn.get(), "queues.db", false);
- open(configDb, txn.get(), "config.db", false);
- open(exchangeDb, txn.get(), "exchanges.db", false);
- open(mappingDb, txn.get(), "mappings.db", true);
- open(bindingDb, txn.get(), "bindings.db", true);
- open(generalDb, txn.get(), "general.db", false);
- tplStorePtr.reset(new TplJournalImpl(timer, "TplStore", getTplBaseDir(), "tpl", defJournalGetEventsTimeout, defJournalFlushTimeout, agent));
- txn.commit();
- } catch (const journal::jexception& e) {
- QPID_LOG(error, "Journal Exception occurred while initializing store: " << e);
- txn.abort();
- THROW_STORE_EXCEPTION_2("Error opening tplStore instance", e.what());
- } catch (const DbException& e) {
- QPID_LOG(error, "BDB exception occurred while initializing store: " << e.what());
- txn.abort();
- THROW_STORE_EXCEPTION_2("Error opening databases", e);
- } catch (...) {
- QPID_LOG(error, "Unknown exception occurred while initializing store.");
- txn.abort();
- throw;
- }
+ TxnCtxt txn;
+ txn.begin(dbenv.get(), false);
+ try {
+ open(queueDb, txn.get(), "queues.db", false);
+ open(configDb, txn.get(), "config.db", false);
+ open(exchangeDb, txn.get(), "exchanges.db", false);
+ open(mappingDb, txn.get(), "mappings.db", true);
+ open(bindingDb, txn.get(), "bindings.db", true);
+ open(generalDb, txn.get(), "general.db", false);
+ txn.commit();
+ } catch (...) { txn.abort(); throw; }
- isInit = true;
+ tplStorePtr.reset(new TplJournalImpl(timer, "TplStore", getTplBaseDir(), "tpl", defJournalGetEventsTimeout, defJournalFlushTimeout, agent));
+ isInit = true;
+ } catch (const DbException& e) {
+ if (e.get_errno() == DB_VERSION_MISMATCH)
+ {
+ QPID_LOG(error, "Database environment mismatch: This version of db4 does not match that which created the store database.: " << e.what());
+ THROW_STORE_EXCEPTION_2("Database environment mismatch: This version of db4 does not match that which created the store database. "
+ "(If recovery is not important, delete the contents of the store directory. Otherwise, try upgrading the database using "
+ "db_upgrade or using db_recover - but the db4-utils package must also be installed to use these utilities.)", e);
+ }
+ QPID_LOG(error, "BDB exception occurred while initializing store: " << e.what());
+ THROW_STORE_EXCEPTION_2("BDB exception occurred while initializing store", e);
+ } catch (const journal::jexception& e) {
+ QPID_LOG(error, "Journal Exception occurred while initializing store: " << e);
+ THROW_STORE_EXCEPTION_2("Journal Exception occurred while initializing store", e.what());
+ } catch (...) {
+ QPID_LOG(error, "Unknown exception occurred while initializing store.");
+ throw;
+ }
}
void MessageStoreImpl::finalize()
@@ -389,20 +393,19 @@
THROW_STORE_EXCEPTION(oss.str());
}
}
- for (std::list<db_ptr >::iterator i = dbs.begin(); i != dbs.end(); i++) {
- (*i)->close(0);
- }
+ closeDbs();
dbs.clear();
if (tplStorePtr->is_ready()) tplStorePtr->stop(true);
dbenv->close(0);
+ isInit = false;
}
std::ostringstream oss;
oss << storeDir << "/" << storeTopLevelDir;
if (pushDownStoreFiles) {
QPID_LOG(notice, "Store directory " << oss.str() << " was pushed down into directory " << mrg::journal::jdir::push_down(storeDir, storeTopLevelDir, "cluster") << ".");
} else {
+ mrg::journal::jdir::delete_dir(oss.str().c_str());
QPID_LOG(notice, "Store directory " << oss.str() << " was truncated.");
- mrg::journal::jdir::delete_dir(oss.str().c_str());
}
init();
}
@@ -425,16 +428,21 @@
{
if(dupKey) db->set_flags(DB_DUPSORT);
db->open(txn, file, 0, DB_BTREE, DB_CREATE | DB_THREAD, 0);
- dbs.push_back(db);
}
+void MessageStoreImpl::closeDbs()
+{
+ for (std::list<db_ptr >::iterator i = dbs.begin(); i != dbs.end(); i++) {
+ (*i)->close(0);
+ }
+ dbs.clear();
+}
+
MessageStoreImpl::~MessageStoreImpl()
{
finalize();
try {
- for (std::list<db_ptr >::iterator i = dbs.begin(); i != dbs.end(); i++) {
- (*i)->close(0);
- }
+ closeDbs();
} catch (const DbException& e) {
QPID_LOG(error, "Error closing BDB databases: " << e.what());
} catch (const journal::jexception& e) {
Modified: store/trunk/cpp/lib/MessageStoreImpl.h
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.h 2010-07-20 16:51:16 UTC (rev 4132)
+++ store/trunk/cpp/lib/MessageStoreImpl.h 2010-07-20 17:07:24 UTC (rev 4133)
@@ -240,6 +240,7 @@
DbTxn* txn,
const char* file,
bool dupKey);
+ void closeDbs();
// journal functions
void createJrnlQueue(const qpid::broker::PersistableQueue& queue);
13 years, 11 months
rhmessaging commits: r4132 - mgmt/newdata/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-07-20 12:51:16 -0400 (Tue, 20 Jul 2010)
New Revision: 4132
Modified:
mgmt/newdata/cumin/python/cumin/grid/slot.py
Log:
Tweek the max number of slots visible for performance reasons
Modified: mgmt/newdata/cumin/python/cumin/grid/slot.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-07-20 15:42:07 UTC (rev 4131)
+++ mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-07-20 16:51:16 UTC (rev 4132)
@@ -120,7 +120,7 @@
shapes = ["rectangle", "circle", "circle"]
max_width = 400
max_png_age = 30
- max_visible_slots = 500 # start drill-down mode after this number
+ max_visible_slots = 200 # start drill-down mode after this number
def __init__(self, app, name, param, desc):
super(SlotMapPage, self).__init__(app, name)
13 years, 11 months
rhmessaging commits: r4131 - mgmt/newdata/cumin/etc.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-07-20 11:42:07 -0400 (Tue, 20 Jul 2010)
New Revision: 4131
Modified:
mgmt/newdata/cumin/etc/cumin.conf
Log:
Prepare the config file for release
Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf 2010-07-20 15:17:43 UTC (rev 4130)
+++ mgmt/newdata/cumin/etc/cumin.conf 2010-07-20 15:42:07 UTC (rev 4131)
@@ -3,15 +3,15 @@
[common]
# database: dbname=cumin user=cumin host=localhost
# broker: localhost:5672
-# debug: False
-log-file: /var/log/cumin/cumin.log
-log-level: info
+# log-level: info
[web]
+# log-file: /var/log/cumin/web.log
# host: localhost
# port: 45672
# operator-email: [none]
[data]
+# log-file: /var/log/cumin/data.log
# expire-frequency: 600
# expire-threshold: 86400
13 years, 11 months
rhmessaging commits: r4130 - in store/trunk/java/bdbstore: src/test/java/org/apache/qpid/server/store/berkeleydb and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: rgemmell
Date: 2010-07-20 11:17:43 -0400 (Tue, 20 Jul 2010)
New Revision: 4130
Added:
store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes
store/trunk/java/bdbstore/test-profiles/java-bdb.excludes
Modified:
store/trunk/java/bdbstore/build.xml
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
Log:
Update build.xml to actually copy the test profiles, add excludes to disable broken tests until they are updated
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2010-07-20 09:02:52 UTC (rev 4129)
+++ store/trunk/java/bdbstore/build.xml 2010-07-20 15:17:43 UTC (rev 4130)
@@ -25,7 +25,7 @@
<import file="../../module.xml" />
- <target name="postbuild" depends="copy-store-to-upgrade" />
+ <target name="postbuild" depends="copy-store-to-upgrade,copy-test-profiles" />
<target name="copy-store-to-upgrade" description="copy the upgrade tool resource folder contents into the build tree">
<copy todir="${qpid.home}" failonerror="true">
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2010-07-20 09:02:52 UTC (rev 4129)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2010-07-20 15:17:43 UTC (rev 4130)
@@ -537,4 +537,9 @@
return new TestSuite(BDBStoreTest.class);
}
*/
+
+ public void testDummy()
+ {
+
+ }
}
Added: store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes
===================================================================
--- store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes (rev 0)
+++ store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes 2010-07-20 15:17:43 UTC (rev 4130)
@@ -0,0 +1,6 @@
+#These tests are broken
+org.apache.qpid.server.store.berkeleydb.BDBStoreTest#*
+org.apache.qpid.server.store.berkeleydb.MessageReSendTest#*
+org.apache.qpid.server.store.berkeleydb.QueueDeleteWhilstRoutingTest#*
+org.apache.qpid.server.store.berkeleydb.StoreContextRaceConditionTest#*
+
Added: store/trunk/java/bdbstore/test-profiles/java-bdb.excludes
===================================================================
--- store/trunk/java/bdbstore/test-profiles/java-bdb.excludes (rev 0)
+++ store/trunk/java/bdbstore/test-profiles/java-bdb.excludes 2010-07-20 15:17:43 UTC (rev 4130)
@@ -0,0 +1,6 @@
+#These tests are broken
+org.apache.qpid.server.store.berkeleydb.BDBStoreTest#*
+org.apache.qpid.server.store.berkeleydb.MessageReSendTest#*
+org.apache.qpid.server.store.berkeleydb.QueueDeleteWhilstRoutingTest#*
+org.apache.qpid.server.store.berkeleydb.StoreContextRaceConditionTest#*
+
13 years, 11 months
rhmessaging commits: r4128 - in store/trunk/java/bdbstore: docs and 6 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: rgemmell
Date: 2010-07-20 04:34:58 -0400 (Tue, 20 Jul 2010)
New Revision: 4128
Removed:
store/trunk/java/bdbstore/ReadMe.txt
store/trunk/java/bdbstore/default.testprofile
store/trunk/java/bdbstore/dist-zip.xml
store/trunk/java/bdbstore/docs/README
store/trunk/java/bdbstore/etc/config.xml
store/trunk/java/bdbstore/etc/jmxremote.access
store/trunk/java/bdbstore/etc/passwd
store/trunk/java/bdbstore/jar-with-dependencies.xml
store/trunk/java/bdbstore/lib/backport-util-concurrent-2.2.jar
store/trunk/java/bdbstore/lib/commons-cli-1.0.jar
store/trunk/java/bdbstore/lib/commons-collections-3.2.jar
store/trunk/java/bdbstore/lib/commons-configuration-1.2.jar
store/trunk/java/bdbstore/lib/commons-lang-2.2.jar
store/trunk/java/bdbstore/lib/geronimo-jms_1.1_spec-1.0.jar
store/trunk/java/bdbstore/lib/junit-3.8.1.jar
store/trunk/java/bdbstore/lib/log4j-1.2.12.jar
store/trunk/java/bdbstore/lib/mina-core-1.0.1.jar
store/trunk/java/bdbstore/lib/org.apache.felix.framework-1.0.0.jar
store/trunk/java/bdbstore/lib/org.osgi.core-1.0.0.jar
store/trunk/java/bdbstore/lib/slf4j-api-1.4.0.jar
store/trunk/java/bdbstore/lib/slf4j-log4j12-1.4.0.jar
store/trunk/java/bdbstore/log4j-test.xml
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.jar
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5
store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1
store/trunk/java/bdbstore/pom.xml
store/trunk/java/bdbstore/test-provider.properties
Modified:
store/trunk/java/bdbstore/build.xml
Log:
Update build.xml to allow building the BDBstore as a broker-plugins module within Qpid's main Java build system. Also remove the already-defunct maven build artefacts, and the now-defunct copies of the broker libraries.
Deleted: store/trunk/java/bdbstore/ReadMe.txt
===================================================================
--- store/trunk/java/bdbstore/ReadMe.txt 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/ReadMe.txt 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,14 +0,0 @@
-Building with Maven
--------------------
-The BerkeleyDB jar will automatically be installed in to your local repository with maven from the
-local mvn-repo. This will occur whe you first try and compile the BDB module.
-
-
-Using with Qpid
----------------
-You will need to update the broker config.xml to configure the broker to use the BDB store.
-Full class is org.apache.qpid.server.store.berkeleydb.BDBMessageStore
-
-In the broker directory a new persistent-distribution directory is available.
-Running "mvn assembly:directory" will create a directory in target that includes all the BDB code and can be run
-as normal with the qpid-server scripts located in the bin directory.
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/build.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,212 +1,43 @@
<!--
- - Simple Build file for BDBStore
+ - 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.
-->
-<project name="BDBStore" default="build">
-
- <property name="project.name" value="qpid-BDB-MessageStore"/>
- <property name="project.version" value="0.5"/>
- <property name="src.tools.dir" location="src/tools/java"/>
- <property name="src.main.dir" location="src/main/java"/>
- <property name="src.resources.dir" location="src/resources"/>
- <property name="src.test.dir" location="src/test/java"/>
- <property name="build.dir" location="build"/>
- <property name="lib.dir" location="lib"/>
- <property name="bin.dir" location="bin"/>
- <property name="release.dir" location="release"/>
- <property name="resources.dir" location="resources"/>
- <property name="docs.dir" location="docs"/>
- <property name="java.target" value="1.5"/>
- <property name="java.source" value="1.5"/>
+<project name="BDBMessageStore" default="build">
+ <property name="module.depends" value="common client management/common broker perftests systests" />
+ <property name="module.test.depends" value="test common/test broker/test management/common perftests systests management/tools/qpid-cli" />
- <dirname property="project.root" file="${ant.file.common}"/>
+ <property name="broker-plugins-bdbstore.libs" value="broker-plugins/bdbstore/lib/je-3.3.62.jar" />
+ <property name="broker-plugins-bdbstore.test.libs" value="${test.libs} broker-plugins/bdbstore/lib/je-3.3.62.jar" />
- <property name="build.classes" location="build/classes"/>
- <property name="build.test.classes" location="build/test/classes"/>
- <property name="build.tools.classes" location="build/tools/classes"/>
- <property name="build.results" location="build/results"/>
- <property name="project.namever" value="${project.name}-${project.version}"/>
- <property name="bdbstore.jar" location="${build.dir}/qpid-bdbstore-${project.version}.jar"/>
- <property name="bdbtools.jar" location="${build.dir}/qpid-bdbtools-${project.version}.jar"/>
- <property name="release.zip" location="${release.dir}/${project.namever}.zip"/>
- <property name="release.tar" location="${release.dir}/${project.namever}.tar"/>
- <property name="release.tgz" location="${release.dir}/${project.namever}.tgz"/>
- <property name="release.bz2" location="${release.dir}/${project.namever}.bz2"/>
- <property name="qpid.work.dir" location="${project.root}/build/test-work"/>
+ <import file="../../module.xml" />
+ <target name="postbuild" depends="copy-store-to-upgrade" />
- <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
-
- <available property="src.test.dir.exists" file="${src.test.dir}"/>
-
- <property file="${project.root}/default.testprofile"/>
-
- <path id="class.path">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="tools.class.path">
- <path refid="class.path"/>
- <pathelement path="${build.classes}"/>
- <pathelement path="${build.tools.classes}"/>
- </path>
-
-
- <path id="test.class.path">
- <path refid="class.path"/>
- <pathelement path="${build.classes}"/>
- <pathelement path="${build.tools.classes}"/>
- <pathelement path="${build.test.classes}"/>
- </path>
-
- <target name="init">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.test.classes}"/>
- <mkdir dir="${build.tools.classes}"/>
- <mkdir dir="${build.results}"/>
+ <target name="copy-store-to-upgrade" description="copy the upgrade tool resource folder contents into the build tree">
+ <copy todir="${qpid.home}" failonerror="true">
+ <fileset dir="src/test/resources/upgrade"/>
+ </copy>
</target>
- <target name="clean" description="remove build artifacts">
- <delete dir="${build.dir}"/>
- <delete dir="${release.dir}"/>
+ <target name="copy-test-profiles" description="copy the test-profile files into the build tree">
+ <copy todir="${project.root}/test-profiles" failonerror="true">
+ <fileset dir="test-profiles"/>
+ </copy>
</target>
-
- <target name="build" depends="init,build-main,build-tools,build-tests"/>
- <target name="build-main" depends="init">
- <javac srcdir="${src.main.dir}"
- destdir="${build.classes}"
- target="${java.target}"
- classpathref="test.class.path" debug="on"/>
- </target>
- <target name="build-tests" depends="init,build-main">
- <javac srcdir="${src.test.dir}"
- destdir="${build.test.classes}"
- classpathref="test.class.path" debug="on"/>
- </target>
-
- <target name="build-tools" depends="init,build-main">
- <javac srcdir="${src.tools.dir}"
- destdir="${build.tools.classes}"
- classpathref="tools.class.path" debug="on"/>
- <copy todir="${build.tools.classes}" >
- <fileset dir="${src.tools.dir}">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </copy>
- </target>
-
- <target name="jar" depends="build">
- <jar destfile="${bdbstore.jar}">
- <fileset dir="${build.classes}"/>
- <fileset dir="${src.resources.dir}"/>
- </jar>
- <jar destfile="${bdbtools.jar}" basedir="${build.tools.classes}"/>
- </target>
-
- <target name="test" depends="build-tests,prepare-tests" if="src.test.dir.exists"
- unless="${dontruntest}" description="execute unit tests">
-
- <delete file="${module.failed}"/>
-
- <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
- haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
- failureproperty="test.failures" printsummary="on" timeout="600000" >
- <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
- <sysproperty key="root.logging.level" value="${root.logging.level}"/>
- <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
- <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
- <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
- <sysproperty key="broker" value="${broker}"/>
- <sysproperty key="broker.clean" value="${broker.clean}"/>
- <sysproperty key="broker.version" value="${broker.version}"/>
- <sysproperty key="broker.ready" value="${broker.ready}" />
- <sysproperty key="test.excludes" value="${test.excludes}"/>
- <sysproperty key="test.excludesfile" value="${test.excludesfile}"/>
- <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
- <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
- <sysproperty key="QPID_HOME" value="${project.root}"/>
- <sysproperty key="QPID_WORK" value="${qpid.work.dir}"/>
- <sysproperty key="BDB_WORK" value="${qpid.work.dir}/bdbstore"/>
- <sysproperty key="BDB_HOME" value="${project.root}"/>
- <sysproperty key="test.excludes" value="false"/>
-
-
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <classpath refid="test.class.path"/>
-
- <batchtest fork="${test.fork}" todir="${build.results}">
- <fileset dir="${src.test.dir}" excludes="${module.test.excludes}">
- <include name="**/${test}.java"/>
- </fileset>
- </batchtest>
- </junit>
-
- <!--antcall target="touch-failed"/-->
-
- <condition property="failed">
- <and>
- <isfalse value="${test.failures.ignore}"/>
- <available file="${module.failed}"/>
- </and>
- </condition>
-
- <fail if="failed" message="TEST SUITE FAILED"/>
-
- </target>
-
- <target name="prepare" depends="jar">
- <mkdir dir="${release.dir}"/>
- </target>
-
- <target name="prepare-tests">
- <mkdir dir="${qpid.work.dir}"/>
- </target>
-
- <target name="zip" depends="build,prepare" description="build release archive">
- <zip destfile="${release.zip}">
- <zipfileset dir="${bin.dir}" prefix="${project.namever}/bin" filemode="755">
- <include name="*"/>
- <exclude name="*.txt"/>
- </zipfileset>
-
- <zipfileset dir="${bin.dir}" prefix="${project.namever}/bin" filemode="644">
- <include name="*.txt"/>
- </zipfileset>
-
- <zipfileset dir="${build.dir}" prefix="${project.namever}/lib" filemode="644">
- <include name="*.jar"/>
- </zipfileset>
-
- <zipfileset dir="${lib.dir}" prefix="${project.namever}/lib" filemode="644">
- <include name="je*.jar"/>
- <include name="commons-cli*.jar"/>
- </zipfileset>
-
- <zipfileset dir="${resources.dir}" prefix="${project.namever}" filemode="644"/>
- <zipfileset dir="${docs.dir}" prefix="${project.namever}/docs" filemode="644"/>
- </zip>
- </target>
-
- <target name="tar" depends="zip" description="build release archive">
- <tar destfile="${release.tar}" longfile="gnu" >
- <zipfileset src="${release.zip}"/>
- </tar>
- </target>
-
- <target name="tgz" depends="tar" description="build release archive">
- <gzip src="${release.tar}" destfile="${release.tgz}"/>
- </target>
-
- <target name="bzip2" depends="tar" description="build release archive">
- <bzip2 src="${release.tar}" destfile="${release.bz2}"/>
- </target>
-
- <target name="release" depends="zip,tgz" description="build all release archives except .bz2"/>
-
</project>
Deleted: store/trunk/java/bdbstore/default.testprofile
===================================================================
--- store/trunk/java/bdbstore/default.testprofile 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/default.testprofile 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,23 +0,0 @@
-broker.version=0-8
-broker=vm
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-
-java.naming.provider.url=${project.root}/test-provider.properties
-max_prefetch=1000
-
-log=debug
-amqj.logging.level=${log}
-amqj.protocol.logging.level=${log}
-root.logging.level=${log}
-log4j.configuration=file:///${project.root}/log4j-test.xml
-log4j.debug=false
-
-test.excludes=true
-test.excludesfile=${project.root}/08ExcludeList
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=none
Deleted: store/trunk/java/bdbstore/dist-zip.xml
===================================================================
--- store/trunk/java/bdbstore/dist-zip.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/dist-zip.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,25 +0,0 @@
-<!-- This is an assembly descriptor that produces a zip containing the backup utility and the all dependencies jar. -->
-<assembly>
- <id>bdbtests</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>bdb_backup</outputDirectory>
- <includes>
- <include>qpid-bdbstore-${qpid.version}-all-test-deps.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>etc/scripts</directory>
- <outputDirectory>bdb_backup</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
Deleted: store/trunk/java/bdbstore/docs/README
===================================================================
--- store/trunk/java/bdbstore/docs/README 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/docs/README 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,3 +0,0 @@
-BDB Message Store for Apache Qpid
----------------------------------
-Documentation to be completed
Deleted: store/trunk/java/bdbstore/etc/config.xml
===================================================================
--- store/trunk/java/bdbstore/etc/config.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/etc/config.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- -
- - 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.
- -
- -->
-<broker>
- <prefix>${QPID_HOME}</prefix>
- <work>${QPID_WORK}</work>
- <conf>${prefix}/etc</conf>
- <connector>
- <!-- Uncomment out this block and edit the keystorePath and keystorePassword
- to enable SSL support
- <ssl>
- <enabled>true</enabled>
- <sslOnly>true</sslOnly>
- <keystorePath>/path/to/keystore.ks</keystorePath>
- <keystorePassword>keystorepass</keystorePassword>
- </ssl>-->
- <qpidnio>false</qpidnio>
- <protectio>
- <enabled>false</enabled>
- </protectio>
- <transport>nio</transport>
- <port>5672</port>
- <sslport>8672</sslport>
- <socketReceiveBuffer>32768</socketReceiveBuffer>
- <socketSendBuffer>32768</socketSendBuffer>
- </connector>
- <management>
- <enabled>true</enabled>
- <jmxport>8999</jmxport>
- <security-enabled>false</security-enabled>
- </management>
- <advanced>
- <filterchain enableExecutorPool="true"/>
- <enablePooledAllocator>false</enablePooledAllocator>
- <enableDirectBuffers>false</enableDirectBuffers>
- <framesize>65535</framesize>
- <compressBufferOnQueue>false</compressBufferOnQueue>
- <enableJMSXUserID>false</enableJMSXUserID>
- </advanced>
-
- <security>
- <principal-databases>
- <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed -->
- <principal-database>
- <name>passwordfile</name>
- <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
- <attributes>
- <attribute>
- <name>passwordFile</name>
- <value>${conf}/passwd</value>
- </attribute>
- </attributes>
- </principal-database>
- </principal-databases>
-
- <access>
- <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
- </access>
- <jmx>
- <access>${conf}/jmxremote.access</access>
- <principal-database>passwordfile</principal-database>
- </jmx>
- </security>
-
- <virtualhosts>
- <directory>${conf}/virtualhosts</directory>
-
- <virtualhost>
- <name>localhost</name>
- <localhost>
- <store>
- <class>org.apache.qpid.server.store.MemoryMessageStore</class>
- </store>
-
- <housekeeping>
- <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
- </housekeeping>
-
- </localhost>
- </virtualhost>
-
- <virtualhost>
- <name>development</name>
- <development>
- <store>
- <class>org.apache.qpid.server.store.MemoryMessageStore</class>
- </store>
- </development>
- </virtualhost>
-
- <virtualhost>
- <name>test</name>
- <test>
- <store>
- <class>org.apache.qpid.server.store.MemoryMessageStore</class>
- </store>
- </test>
- </virtualhost>
-
- </virtualhosts>
- <heartbeat>
- <delay>0</delay>
- <timeoutFactor>2.0</timeoutFactor>
- </heartbeat>
- <queue>
- <auto_register>true</auto_register>
- </queue>
-
- <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
-</broker>
-
-
Deleted: store/trunk/java/bdbstore/etc/jmxremote.access
===================================================================
--- store/trunk/java/bdbstore/etc/jmxremote.access 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/etc/jmxremote.access 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,23 +0,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.
-
-#Generated by JMX Console : Last edited by user:admin
-#Tue Jun 12 16:46:39 BST 2007
-admin=admin
-guest=readonly
-user=readwrite
Deleted: store/trunk/java/bdbstore/etc/passwd
===================================================================
--- store/trunk/java/bdbstore/etc/passwd 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/etc/passwd 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,22 +0,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.
-#
-guest:guest
-client:guest
-server:guest
-
Deleted: store/trunk/java/bdbstore/jar-with-dependencies.xml
===================================================================
--- store/trunk/java/bdbstore/jar-with-dependencies.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/jar-with-dependencies.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,56 +0,0 @@
-<!--
- This is an assembly descriptor that produces a jar file that contains all the
- runtime dependencies, fully expanded into a single jar.
--->
-<assembly>
- <id>all-test-deps</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <outputFileNameMapping></outputFileNameMapping>
- <unpack>true</unpack>
- <scope>test</scope>
- <excludes>
- <!-- Exclude everything not needed by the backup utility. -->
- <!--
- <exclude>org.apache.mina:mina-java5</exclude>
- <exclude>org.apache.mina:mina-filter-ssl</exclude>
- <exclude>relaxngDatatype:relaxngDatatype</exclude>
- <exclude>isorelax:isorelax</exclude>
- <exclude>org.apache.mina:mina-core</exclude>
- <exclude>commons-lang:commons-lang</exclude>
- <exclude>commons-collections:commons-collections</exclude>
- <exclude>commons-digester:commons-digester</exclude>
- <exclude>commons-cli:commons-cli</exclude>
- <exclude>msv:msv</exclude>
- <exclude>org.apache.qpid:qpid-broker</exclude>
- <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
- <exclude>commons-logging:commons-logging</exclude>
- <exlcude>commons-codec:commons-codec</exlcude>
- <exclude>xerces:xercesImpl</exclude>
- <exclude>javax.servlet:servlet-api</exclude>
- <exclude>xalan:xalan</exclude>
- <exclude>commons-configuration:commons-configuration</exclude>
- <exclude>jaxen:jaxen</exclude>
- <exclude>slf4j:slf4j-simple</exclude>
- <exclude>commons-beanutils:commons-beanutils</exclude>
- <exclude>xml-apis:xml-apis</exclude>
- <exclude>commons-beanutils:commons-beanutils-core</exclude>
- <exclude>commons-logging:commons-logging-api</exclude>
- <exclude>dom4j:dom4j</exclude>
- <exclude>saxpath:saxpath</exclude>
- -->
- </excludes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
Deleted: store/trunk/java/bdbstore/lib/backport-util-concurrent-2.2.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/commons-cli-1.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/commons-collections-3.2.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/commons-configuration-1.2.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/commons-lang-2.2.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/geronimo-jms_1.1_spec-1.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/junit-3.8.1.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/log4j-1.2.12.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/mina-core-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/org.apache.felix.framework-1.0.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/org.osgi.core-1.0.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/slf4j-api-1.4.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/lib/slf4j-log4j12-1.4.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/log4j-test.xml
===================================================================
--- store/trunk/java/bdbstore/log4j-test.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/log4j-test.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j configuration for unit tests -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
- </layout>
- </appender>
-
- <logger name="org.apache.qpid">
- <level value="${amqj.logging.level}"/>
- </logger>
-
- <logger name="qpid.protocol">
- <level value="${amqj.protocol.logging.level}"/>
- </logger>
-
- <logger name="org.apache.qpid.test">
- <level value="ALL"/>
- </logger>
-
- <root>
- <level value="${root.logging.level}"/>
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1 +0,0 @@
-d21746ca7c9806a202ca4b2099588605
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1 +0,0 @@
-d345cc8c994519abbc40c1ae810fdf3e59855040
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.1.0</version>
- <distributionManagement>
- <status>deployed</status>
- </distributionManagement>
-</project>
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1 +0,0 @@
-ddf2876fd3ba2e0813a785ffec8b697e
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1 +0,0 @@
-f9c263f05c7fc0ca55202de393d55e6d8c8ec53f
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.2.42</version>
- <distributionManagement>
- <status>deployed</status>
- </distributionManagement>
-</project>
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar
===================================================================
(Binary files differ)
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
- <groupId>sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.1.0</version>
- <versioning>
- <versions>
- <version>3.1.0</version>
- </versions>
- <lastUpdated>20070131093848</lastUpdated>
- </versioning>
-</metadata>
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1 +0,0 @@
-96bfba4c26862f955c15385d2b99eff5
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1
===================================================================
--- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1 +0,0 @@
-3ddc590e7f85a5b05a3d271c29f6b370a243d27d
\ No newline at end of file
Deleted: store/trunk/java/bdbstore/pom.xml
===================================================================
--- store/trunk/java/bdbstore/pom.xml 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/pom.xml 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,110 +0,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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.etp.qpid</groupId>
- <artifactId>qpid-bdbstore</artifactId>
- <packaging>jar</packaging>
- <version>1.0-incubating-M2.1-SNAPSHOT</version>
- <name>Qpid BDB Store</name>
- <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
- <parent>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid</artifactId>
- <version>1.0-incubating-M2.1-SNAPSHOT</version>
- </parent>
-
- <!-- Local repository for the BerkeleyDB-je so we don't have to use the installer script -->
- <repositories>
- <repository>
- <id>berkeley-je.local</id>
- <name>Local BerkeleyDB JE Repository</name>
- <url>file://${basedir}/mvn-repo</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-perftests</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-systests</artifactId>
- </dependency>
- <dependency>
- <groupId>sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.2.76</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- Produce an all dependencies jar, to be used for running the hot backup utility as a standalone tool. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
- <configuration>
- <descriptors>
- <descriptor>jar-with-dependencies.xml</descriptor>
- <descriptor>dist-zip.xml</descriptor>
- </descriptors>
- <outputDirectory>target</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- </plugin>
- </plugins>
-
- <resources>
- <!-- Ensure that the customized log4j for the backup tool is included. -->
- <resource>
- <targetPath>/</targetPath>
- <filtering>false</filtering>
- <directory>src/resources</directory>
- <includes>
- <include>backup-log4j.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
Deleted: store/trunk/java/bdbstore/test-provider.properties
===================================================================
--- store/trunk/java/bdbstore/test-provider.properties 2010-07-19 15:54:02 UTC (rev 4127)
+++ store/trunk/java/bdbstore/test-provider.properties 2010-07-20 08:34:58 UTC (rev 4128)
@@ -1,39 +0,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.
-#
-#
-
-connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
-connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
-connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5671?ssl='true''
-
-connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673;tcp://localhost:5672'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20''
-connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
-connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
-connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673'
-connectionfactory.connection1.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
-connectionfactory.connection2.vm = amqp://username:password@clientid/test?brokerlist='vm://:2'
-
-
-queue.MyQueue = example.MyQueue
-queue.queue = example.queue
-queue.xaQueue = xaQueue
-
-topic.xaTopic = xaTopic
-topic.durableSubscriberTopic = durableSubscriberTopic
13 years, 11 months
rhmessaging commits: r4127 - mgmt/newdata/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-07-19 11:54:02 -0400 (Mon, 19 Jul 2010)
New Revision: 4127
Modified:
mgmt/newdata/cumin/python/cumin/grid/submission.py
Log:
Age out submissions that haven't had new work in a while
Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-07-19 13:37:01 UTC (rev 4126)
+++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-07-19 15:54:02 UTC (rev 4127)
@@ -1,11 +1,14 @@
import logging
import shlex
+from rosemary.sqlquery import *
+
from cumin.objectframe import *
from cumin.objectselector import *
from cumin.objecttask import *
from cumin.widgets import *
from cumin.util import *
+
from job import JobSelector, JobFrame
log = logging.getLogger("cumin.grid.submission")
@@ -31,6 +34,25 @@
self.add_join(jobserver, submission.jobserverRef, jobserver._id)
+ FreshnessFilter(self.query, submission)
+
+class FreshnessFilter(SqlQueryFilter):
+ def __init__(self, query, cls):
+ super(FreshnessFilter, self).__init__(query)
+
+ table = cls.sql_table
+
+ fmt = "(%s > now() - interval '3 days' or %s > 0 or %s > 0 or %s > 0)"
+ args = (table._qmf_update_time.identifier,
+ table.Idle.identifier,
+ table.Running.identifier,
+ table.Held.identifier)
+
+ self.text = fmt % args
+
+ def emit(self):
+ return self.text
+
class SubmissionSelector(ObjectSelector):
def __init__(self, app, name):
cls = app.model.com_redhat_grid.Submission
13 years, 11 months