rhmessaging commits: r3303 - store/trunk/java/bdbstore/etc/scripts.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-04-17 10:58:15 -0400 (Fri, 17 Apr 2009)
New Revision: 3303
Modified:
store/trunk/java/bdbstore/etc/scripts/bdbtest.sh
Log:
Added systest dependency to bdbtest.sh
Modified: store/trunk/java/bdbstore/etc/scripts/bdbtest.sh
===================================================================
--- store/trunk/java/bdbstore/etc/scripts/bdbtest.sh 2009-04-16 18:10:13 UTC (rev 3302)
+++ store/trunk/java/bdbstore/etc/scripts/bdbtest.sh 2009-04-17 14:58:15 UTC (rev 3303)
@@ -35,7 +35,7 @@
VERSION=0.5
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar
# Set other variables used by the qpid-run script before calling
export JAVA=java JAVA_MEM=-Xmx256m QPID_CLASSPATH=$QPID_LIBS
15 years, 5 months
rhmessaging commits: r3302 - mgmt/trunk/cumin/resources.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-16 14:10:13 -0400 (Thu, 16 Apr 2009)
New Revision: 3302
Modified:
mgmt/trunk/cumin/resources/app.js
Log:
Check for existence of forms to avoid javascript error
Modified: mgmt/trunk/cumin/resources/app.js
===================================================================
--- mgmt/trunk/cumin/resources/app.js 2009-04-16 17:43:44 UTC (rev 3301)
+++ mgmt/trunk/cumin/resources/app.js 2009-04-16 18:10:13 UTC (rev 3302)
@@ -74,18 +74,20 @@
var hash = wooly.session.hash();
for (var key in hash) {
if (!(hash[key] instanceof Function)) {
- var checks = document.forms[0].elements[key];
- if (checks) {
- var vals = $A(hash[key].split('|'));
- if (typeof checks.length == "undefined") {
- if (vals.contains(checks.value)) {
- checks.checked = true;
- }
- } else {
- for (var i=0; i < checks.length; i++) {
- if (vals.contains(checks[i].value)) {
- checks[i].checked = true;
+ if (document.forms.length > 0) {
+ var checks = document.forms[0].elements[key];
+ if (checks) {
+ var vals = $A(hash[key].split('|'));
+ if (typeof checks.length == "undefined") {
+ if (vals.contains(checks.value)) {
+ checks.checked = true;
}
+ } else {
+ for (var i=0; i < checks.length; i++) {
+ if (vals.contains(checks[i].value)) {
+ checks[i].checked = true;
+ }
+ }
}
}
}
15 years, 5 months
rhmessaging commits: r3301 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-16 13:43:44 -0400 (Thu, 16 Apr 2009)
New Revision: 3301
Modified:
mgmt/trunk/cumin/python/cumin/visualizations.strings
Log:
Fix double-clicking on slot vis (now cancels single click)
Fix zooming-in.
Modified: mgmt/trunk/cumin/python/cumin/visualizations.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/visualizations.strings 2009-04-16 13:32:55 UTC (rev 3300)
+++ mgmt/trunk/cumin/python/cumin/visualizations.strings 2009-04-16 17:43:44 UTC (rev 3301)
@@ -353,7 +353,7 @@
var rx = Math.min(slot_clip_size, slot_map_info.width) / 2;
var ry = Math.min(slot_clip_size, slot_map_info.height) / 2;
- var click_info = get_index(rx, ry);
+ var click_info = vis.get_index(rx, ry);
if (click_info)
slot_center_index = click_info.index;
}
@@ -709,10 +709,10 @@
function doDoubleClick(e) {
var now = new Date();
- this.doubleclick_when = now.getTime();
- if (this.click_handle != null) {
- clearTimeout(this.click_handle); // Clear pending Click
- this.click_handle = null;
+ clicks.doubleclick_when = now.getTime();
+ if (clicks.click_handle != null) {
+ clearTimeout(clicks.click_handle); // Clear pending Click
+ clicks.click_handle = null;
}
if (!e) var e = window.event;
var posxy = get_relative_event_pos(e);
15 years, 5 months
rhmessaging commits: r3300 - mgmt/trunk/wooly/resources.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-16 09:32:55 -0400 (Thu, 16 Apr 2009)
New Revision: 3300
Modified:
mgmt/trunk/wooly/resources/wooly.js
Log:
Do a deep search in xmlGetElementById in case id is not a direct decendant of parent.
Modified: mgmt/trunk/wooly/resources/wooly.js
===================================================================
--- mgmt/trunk/wooly/resources/wooly.js 2009-04-16 12:42:02 UTC (rev 3299)
+++ mgmt/trunk/wooly/resources/wooly.js 2009-04-16 13:32:55 UTC (rev 3300)
@@ -211,18 +211,26 @@
}
function xmlGetElementById(parent, id) {
- var children = parent.childNodes;
- if (children) {
- for (var i=0; i<children.length; i++) {
- var child = children.item(i);
- if (child.nodeType == 1) {
- if (id == child.getAttribute("id")) {
- return child;
- }
- }
- }
- }
- return null;
+ var child = parent.firstChild;
+ // loop through siblings first
+ while (child) {
+ if (child.nodeType == 1) {
+ if (child.getAttribute("id") == id)
+ return child;
+ }
+ child = child.nextSibling;
+ }
+ // then do a deep look at relatives
+ var child = parent.firstChild;
+ while (child) {
+ if (child.nodeType == 1) {
+ var progeny = xmlGetElementById(child, id);
+ if (progeny)
+ return progeny;
+ }
+ child = child.nextSibling;
+ }
+ return null;
}
function copyNode(node) {
15 years, 5 months
rhmessaging commits: r3299 - store/branches/java/0.5-release/src/test/java/org/apache/qpid/server/store/berkeleydb/utils.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-04-16 08:42:02 -0400 (Thu, 16 Apr 2009)
New Revision: 3299
Modified:
store/branches/java/0.5-release/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java
Log:
Remove unused test method that relies on removed method in Apache tests.
Modified: store/branches/java/0.5-release/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java
===================================================================
--- store/branches/java/0.5-release/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java 2009-04-15 20:14:35 UTC (rev 3298)
+++ store/branches/java/0.5-release/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java 2009-04-16 12:42:02 UTC (rev 3299)
@@ -112,22 +112,6 @@
}
}
- public void startVMBroker(int vmID, ConfigurationFileApplicationRegistry configFile) throws Exception
- {
- if (vmID != 1)
- {
- testWork = BDB_WORK_PRE_TEST + "-" + vmID;
- }
- else
- {
- testWork = BDB_WORK_PRE_TEST;
- }
- System.setProperty(BDB_WORK, testWork);
- System.setProperty(QPID_WORK, testWork);
-
- super.startBroker(vmID, configFile);
- }
-
public boolean deleteDirectory(File dir)
{
if (dir.isDirectory())
15 years, 5 months
rhmessaging commits: r3298 - in mgmt/trunk/cumin/python/cumin: messaging and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-15 16:14:35 -0400 (Wed, 15 Apr 2009)
New Revision: 3298
Modified:
mgmt/trunk/cumin/python/cumin/grid/job.py
mgmt/trunk/cumin/python/cumin/grid/job.strings
mgmt/trunk/cumin/python/cumin/messaging/exchange.py
mgmt/trunk/cumin/python/cumin/messaging/exchange.strings
mgmt/trunk/cumin/python/cumin/messaging/queue.py
mgmt/trunk/cumin/python/cumin/messaging/queue.strings
Log:
Auto-update queue, exchange, and job sets.
Modified: mgmt/trunk/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/job.py 2009-04-15 20:13:28 UTC (rev 3297)
+++ mgmt/trunk/cumin/python/cumin/grid/job.py 2009-04-15 20:14:35 UTC (rev 3298)
@@ -239,6 +239,8 @@
def __init__(self, app, name):
super(JobTab, self).__init__(app, name)
+ self.update_enabled = True
+
self.__remove = JobRemoveButton(app, "remove")
self.add_child(self.__remove)
Modified: mgmt/trunk/cumin/python/cumin/grid/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/job.strings 2009-04-15 20:13:28 UTC (rev 3297)
+++ mgmt/trunk/cumin/python/cumin/grid/job.strings 2009-04-15 20:14:35 UTC (rev 3298)
@@ -109,14 +109,14 @@
});
[JobTab.html]
-<form id="{id}" method="post" action="?">
+<form id="{id}" method="post" action="?" update="{id}.table">
<div class="sactions">
{job_search}
<h2>Act on Selected Jobs:</h2>
{hold} {release} {remove}
</div>
- <table class="mobjects">
+ <table id="{id}.table" class="mobjects">
<thead>
<tr>
<th class="setnav" colspan="{column_count}">
@@ -130,7 +130,13 @@
</table>
<div>{hidden_inputs}</div>
</form>
+<script type="text/javascript">
+//<![CDATA[
+ wooly.addPageUpdateListener( cumin.restoreTableCheckboxes );
+//]]>
+</script>
+
[JobSearch.html]
<div class="rfloat searchbox">
<h2><label for="job_search">Go To Job:</label></h2>
Modified: mgmt/trunk/cumin/python/cumin/messaging/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/exchange.py 2009-04-15 20:13:28 UTC (rev 3297)
+++ mgmt/trunk/cumin/python/cumin/messaging/exchange.py 2009-04-15 20:14:35 UTC (rev 3298)
@@ -40,6 +40,8 @@
self.vhost = vhost
+ self.update_enabled = True
+
self.ids = FilteredCheckboxIdColumn(app, "id", self, callback=self.disable_exchange)
self.add_column(self.ids)
Modified: mgmt/trunk/cumin/python/cumin/messaging/exchange.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/exchange.strings 2009-04-15 20:13:28 UTC (rev 3297)
+++ mgmt/trunk/cumin/python/cumin/messaging/exchange.strings 2009-04-15 20:14:35 UTC (rev 3298)
@@ -47,7 +47,7 @@
}
[ExchangeSet.html]
-<form id="{id}" method="post" action="?">
+<form id="{id}" method="post" action="?" update="{id}.table">
<ul class="actions">
<li><a class="nav" href="{add_exchange_url}">Add New Exchange</a></li>
</ul>
@@ -60,7 +60,7 @@
{remove}
</div>
- <table class="mobjects">
+ <table id="{id}.table" class="mobjects">
<thead>
<tr>
<th class="setnav" colspan="{column_count}">
Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/queue.py 2009-04-15 20:13:28 UTC (rev 3297)
+++ mgmt/trunk/cumin/python/cumin/messaging/queue.py 2009-04-15 20:14:35 UTC (rev 3298)
@@ -26,6 +26,8 @@
self.vhost = vhost
+ self.update_enabled = True
+
self.ids = CheckboxIdColumn(app, "id")
self.add_column(self.ids)
Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/queue.strings 2009-04-15 20:13:28 UTC (rev 3297)
+++ mgmt/trunk/cumin/python/cumin/messaging/queue.strings 2009-04-15 20:14:35 UTC (rev 3298)
@@ -35,7 +35,7 @@
{sql_where}
[QueueSet.html]
-<form id="{id}" method="post" action="?">
+<form id="{id}" method="post" action="?" update="{id}.table">
<ul class="actions">
<li><a class="nav" href="{add_queue_url}">Add New Queue</a></li>
</ul>
@@ -46,8 +46,7 @@
<h2>Act on Selected Queues:</h2>
{purge} {remove}
</div>
-
- <table class="mobjects">
+ <table id="{id}.table" class="mobjects">
<thead>
<tr>
<th class="setnav" colspan="{column_count}">
@@ -61,6 +60,11 @@
</table>
<div>{hidden_inputs}</div>
</form>
+<script type="text/javascript">
+//<![CDATA[
+ wooly.addPageUpdateListener( cumin.restoreTableCheckboxes );
+//]]>
+</script>
[TopQueueSet.sql]
select
15 years, 5 months
rhmessaging commits: r3297 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-15 16:13:28 -0400 (Wed, 15 Apr 2009)
New Revision: 3297
Modified:
mgmt/trunk/cumin/python/cumin/stat.strings
Log:
Use wooly.setHash
Modified: mgmt/trunk/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.strings 2009-04-15 20:12:50 UTC (rev 3296)
+++ mgmt/trunk/cumin/python/cumin/stat.strings 2009-04-15 20:13:28 UTC (rev 3297)
@@ -98,12 +98,7 @@
var hash = wooly.session.hash();
hash[id] = state;
- var href = window.location.href;
- var hashIndex = href.indexOf("#");
- if (hashIndex > 0) {
- href = href.substring(0, hashIndex);
- }
- window.location.replace(href + "#" + hash.marshal());
+ wooly.session.setHash(hash);
}
return false;
}
15 years, 5 months
rhmessaging commits: r3296 - mgmt/trunk/cumin/resources.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-15 16:12:50 -0400 (Wed, 15 Apr 2009)
New Revision: 3296
Modified:
mgmt/trunk/cumin/resources/app.js
Log:
Added functions to save and restore checkbox states for auto-updated tables.
Modified: mgmt/trunk/cumin/resources/app.js
===================================================================
--- mgmt/trunk/cumin/resources/app.js 2009-04-15 20:12:14 UTC (rev 3295)
+++ mgmt/trunk/cumin/resources/app.js 2009-04-15 20:12:50 UTC (rev 3296)
@@ -45,6 +45,54 @@
img.setattr("src", src);
}
+ this.clickTableCheckbox = function (check, name) {
+ var val = check.value;
+ var hash = wooly.session.hash();
+ if (!(name in hash)) {
+ hash[name] = "";
+ }
+ var vals = $A(hash[name].split('|'));
+ if ((vals.length == 1) && (vals[0] == ""))
+ vals.empty();
+ var valIndex = vals.indexOf(val);
+ if (check.checked) {
+ if (valIndex > -1)
+ vals[valIndex] = val;
+ else
+ vals.push(val);
+ }
+ else
+ vals = vals.erase(val);
+ if (vals.length == 0)
+ delete hash[name];
+ else
+ hash[name] = vals.join('|');
+ wooly.session.setHash(hash);
+ }
+
+ this.restoreTableCheckboxes = function () {
+ var hash = wooly.session.hash();
+ for (var key in hash) {
+ if (!(hash[key] instanceof Function)) {
+ var checks = document.forms[0].elements[key];
+ if (checks) {
+ var vals = $A(hash[key].split('|'));
+ if (typeof checks.length == "undefined") {
+ if (vals.contains(checks.value)) {
+ checks.checked = true;
+ }
+ } else {
+ for (var i=0; i < checks.length; i++) {
+ if (vals.contains(checks[i].value)) {
+ checks[i].checked = true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
}
}())
15 years, 5 months
rhmessaging commits: r3295 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-15 16:12:14 -0400 (Wed, 15 Apr 2009)
New Revision: 3295
Modified:
mgmt/trunk/cumin/python/cumin/widgets.py
mgmt/trunk/cumin/python/cumin/widgets.strings
Log:
If a table is auto-updated, add an onclick handler to the checkbox to save its state in the hash.
Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py 2009-04-15 20:09:57 UTC (rev 3294)
+++ mgmt/trunk/cumin/python/cumin/widgets.py 2009-04-15 20:12:14 UTC (rev 3295)
@@ -927,9 +927,10 @@
id = data[self.name]
attr = id in self.param.get(session) and "checked=\"checked\"" or ""
disa = disabled and "disabled=\"disabled\"" or ""
- t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%i\" %s %s/></td>"
+ click = self.parent.update_enabled and " onclick=\"cumin.clickTableCheckbox(this, '%s')\"" % name or ""
+ t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%i\" %s %s%s/></td>"
- return t % (name, id, attr, disa)
+ return t % (name, id, attr, disa, click)
class CheckboxStringIdColumn(FormInput, SqlTableColumn):
def __init__(self, app, name):
Modified: mgmt/trunk/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.strings 2009-04-15 20:09:57 UTC (rev 3294)
+++ mgmt/trunk/cumin/python/cumin/widgets.strings 2009-04-15 20:12:14 UTC (rev 3295)
@@ -486,14 +486,15 @@
elem = form.elements[i];
if (elem.name == elem_name) {
- elem.checked = control.checked;
+ if (elem.checked != control.checked)
+ elem.click(); // fires the onclick event
}
}
}
[CheckboxIdColumnHeader.html]
-<th><input id="{id}" type="checkbox"
- onclick="checkAll('{id}', '{form_id}', '{elem_name}')"/></th>
+<th><input id="{id}" type="checkbox" name="all"
+ onclick="cumin.clickTableCheckbox(this, 'all'); checkAll('{id}', '{form_id}', '{elem_name}')" value="all"/></th>
[TopN.html]
<div>
15 years, 5 months
rhmessaging commits: r3294 - mgmt/trunk/wooly/resources.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-04-15 16:09:57 -0400 (Wed, 15 Apr 2009)
New Revision: 3294
Modified:
mgmt/trunk/wooly/resources/wooly.js
Log:
Support for updating only part of a widget's html.
Don't preempt pending ajax requests each timer interval (Allows background updates to take longer than the update interval)
Modified: mgmt/trunk/wooly/resources/wooly.js
===================================================================
--- mgmt/trunk/wooly/resources/wooly.js 2009-04-15 19:26:33 UTC (rev 3293)
+++ mgmt/trunk/wooly/resources/wooly.js 2009-04-15 20:09:57 UTC (rev 3294)
@@ -210,6 +210,21 @@
}
}
+ function xmlGetElementById(parent, id) {
+ var children = parent.childNodes;
+ if (children) {
+ for (var i=0; i<children.length; i++) {
+ var child = children.item(i);
+ if (child.nodeType == 1) {
+ if (id == child.getAttribute("id")) {
+ return child;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
function copyNode(node) {
switch (node.nodeType) {
case 1:
@@ -306,6 +321,12 @@
newElem = newElem.nextSibling;
}
+ var updateId = newElem.getAttribute("update");
+ // only update a sub-block of html
+ if (updateId) {
+ oldElem = document.getElementById(updateId);
+ newElem = xmlGetElementById(newElem, updateId);
+ }
replaceNode(newElem, oldElem);
} else {
wooly.log("Element '" + id + "' not found");
@@ -354,9 +375,12 @@
var req = this.getNewRequest();
function fetch() {
- req.open("get", url, true);
- req.onreadystatechange = update;
- req.send(null);
+ // don't preempt a pending request
+ if (req.readyState == 0 || req.readyState == 4) {
+ req.open("get", url, true);
+ req.onreadystatechange = update;
+ req.send(null);
+ }
}
fetch();
@@ -661,6 +685,15 @@
return wooly.session.branch(h);
}
+ this.setHash = function (hash) {
+ var href = window.location.href;
+ var hashIndex = href.indexOf("#");
+ if (hashIndex > 0) {
+ href = href.substring(0, hashIndex);
+ }
+ window.location.replace(href + "#" + hash.marshal());
+ }
+
/* convert string query into cumin session object */
function Branch (s) {
15 years, 5 months