rhmessaging commits: r4146 - mgmt/newdata/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-07-26 09:39:22 -0400 (Mon, 26 Jul 2010)
New Revision: 4146
Modified:
mgmt/newdata/cumin/python/cumin/model.py
Log:
Removed entry for !!descriptors from job meta data since it is suppressed
Modified: mgmt/newdata/cumin/python/cumin/model.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/model.py 2010-07-22 20:43:09 UTC (rev 4145)
+++ mgmt/newdata/cumin/python/cumin/model.py 2010-07-26 13:39:22 UTC (rev 4146)
@@ -1413,10 +1413,6 @@
prop.group = "Condor Info"
prop.writable = False
- prop = DictAdProperty(self, "!!descriptors")
- prop.group = "Condor Info"
- prop.writable = False
-
### Command Info Group
prop = AdProperty(self, "Args")
prop.description = "Arguments passed to job Cmd"
14 years, 5 months
rhmessaging commits: r4145 - in mgmt/newdata/cumin: python/cumin/grid and 3 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-07-22 16:43:09 -0400 (Thu, 22 Jul 2010)
New Revision: 4145
Modified:
mgmt/newdata/cumin/python/cumin/grid/job.py
mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py
mgmt/newdata/cumin/python/cumin/messaging/main.py
mgmt/newdata/cumin/python/cumin/objectselector.py
mgmt/newdata/cumin/python/cumin/objectselector.strings
mgmt/newdata/cumin/python/cumin/objecttask.py
mgmt/newdata/cumin/python/cumin/objecttask.strings
mgmt/newdata/cumin/python/cumin/usergrid/widgets.py
mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings
mgmt/newdata/cumin/resources/app.css
Log:
* Incorporate Ernie's patch for ObjectSelector links
* Handle job frame location in a way that's compatible with reuse in
the admin and user grid UIs
* Adjust styling for ObjectSelector links
* Filter grid user submissions by user
* Rename the task link and button widgets
Modified: mgmt/newdata/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -177,7 +177,8 @@
class JobIdColumn(ObjectLinkColumn):
def render_cell_href(self, session, record):
job_id = record[self.parent.job_id_column.field.index]
- frame = self.page.page_widgets_by_path[self.frame_path]
+ #frame = self.page.page_widgets_by_path[self.frame_path]
+ frame = self.table.frame.job
submission = self.parent.submission.get(session)
return frame.get_href(session, submission._id, job_id)
Modified: mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -30,6 +30,10 @@
self.remove = BrokerGroupSelectionRemove(app, self)
+ task = BrokerGroupAdd(app)
+ link = TaskLink(app, "brokergroupadd", task)
+ self.links.add_child(link)
+
class BrokerGroupSelectionRemove(SelectionTask):
def get_title(self, session):
return "Remove"
Modified: mgmt/newdata/cumin/python/cumin/messaging/main.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/messaging/main.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/messaging/main.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -37,12 +37,10 @@
self.add_mode(self.broker)
self.add_sticky_view(self.broker)
- self.brokergroup = BrokerGroupFrame(app, "brokergroup")
- self.add_mode(self.brokergroup)
+ self.broker_group = BrokerGroupFrame(app, "brokergroup")
+ self.add_mode(self.broker_group)
- self.add_group = BrokerGroupAdd(app)
self.tasks = list()
- self.tasks.append(self.add_group)
def init(self):
super(MessagingFrame, self).init()
@@ -57,7 +55,7 @@
def __init__(self, app, name):
super(MessagingView, self).__init__(app, name)
- heading = self.MessageViewHeading(app, "heading")
+ heading = self.Heading(app, "heading")
self.add_child(heading)
self.tabs = TabbedModeSet(app, "tabs")
@@ -66,23 +64,9 @@
self.tabs.add_tab(BrokerBrowser(app, "brokers"))
self.tabs.add_tab(BrokerGroupSelector(app, "brokergroups"))
- class MessageViewHeading(CuminSummary):
- def __init__(self, app, name):
- super(MessagingView.MessageViewHeading, self).__init__(app, name, None)
-
- self.tasks = self.SummaryTasks(app, "tasks")
- self.replace_child(self.tasks)
-
- props = Widget(app, "properties")
- self.replace_child(props)
-
+ class Heading(CuminHeading):
def render_title(self, session):
return "Messaging"
def render_icon_href(self, session):
return "resource?name=broker-36.png"
-
- class SummaryTasks(ActionSet):
- def do_get_items(self, session):
- return [(x.get_href(session), x.get_title(session), True)
- for x in self.frame.tasks]
Modified: mgmt/newdata/cumin/python/cumin/objectselector.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectselector.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objectselector.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -99,6 +99,9 @@
self.buttons = ObjectSelectorButtons(app, "buttons")
self.add_child(self.buttons)
+ self.links = ObjectSelectorLinks(app, "links")
+ self.add_child(self.links)
+
self.tasks = list()
def init(self):
@@ -108,7 +111,7 @@
task.init()
for task in self.tasks:
- button = SelectionTaskButton(self.app, task)
+ button = TaskButton(self.app, task)
self.buttons.add_child(button)
button.init()
@@ -215,3 +218,6 @@
class ObjectSelectorButtons(ObjectSelectorControl):
pass
+
+class ObjectSelectorLinks(ObjectSelectorControl):
+ pass
Modified: mgmt/newdata/cumin/python/cumin/objectselector.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectselector.strings 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objectselector.strings 2010-07-22 20:43:09 UTC (rev 4145)
@@ -24,8 +24,14 @@
display: inline;
}
+div.ObjectSelectorLinks {
+ margin: 0 0 1em 0;
+}
+
[ObjectSelector.html]
<div id="{id}" class="{class}">
+ {links}
+
{filters}
{switches}
Modified: mgmt/newdata/cumin/python/cumin/objecttask.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objecttask.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objecttask.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -37,6 +37,11 @@
def get_href(self, session):
return self.enter(session).marshal()
+ def enter(self, session):
+ log.debug("Entering %s", self)
+
+ return session
+
def exit(self, session):
log.debug("Exiting %s", self)
@@ -405,11 +410,11 @@
def render_item_class(self, session, item):
return "item"
-class ObjectTaskLink(Link):
+class TaskLink(Link):
def __init__(self, app, name, task):
- assert isinstance(task, ObjectTask), task
+ assert isinstance(task, Task), task
- super(ObjectTaskLink, self).__init__(app, name)
+ super(TaskLink, self).__init__(app, name)
self.task = task
@@ -419,9 +424,9 @@
def render_content(self, session):
return self.task.get_title(session)
-class SelectionTaskButton(FormButton):
+class TaskButton(FormButton):
def __init__(self, app, task):
- super(SelectionTaskButton, self).__init__(app, task.name)
+ super(TaskButton, self).__init__(app, task.name)
self.task = task
Modified: mgmt/newdata/cumin/python/cumin/objecttask.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/objecttask.strings 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objecttask.strings 2010-07-22 20:43:09 UTC (rev 4145)
@@ -38,3 +38,14 @@
ul.SelectionList {
list-style: none;
}
+
+[TaskLink.css]
+a.TaskLink {
+ font-size: 0.9em;
+}
+
+a.TaskLink:before {
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
+}
Modified: mgmt/newdata/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -82,20 +82,23 @@
self.user = user
- self.user_name = UserSubmissionSelector.UserName(self, "username")
- self.add_attribute(self.user_name)
+ cls = self.app.model.com_redhat_cumin.User
- #self.add_filter(self.user_name, self.cls.Owner)
+ self.add_filter(self.user, self.cls.Owner, cls.name)
frame = "main.submissions.submission"
col = ObjectLinkColumn(app, "name", self.cls.Name, self.cls._id, frame)
self.insert_column(1, col)
- class UserName(Attribute):
- def get(self, session):
- user = self.widget.user.get(session)
- return user.name
+ #task = SubmissionAdd(app) # XXX ugh, pool frame
+ task = NullTask(app)
+ link = TaskLink(app, "submissionadd", task)
+ self.links.add_child(link)
+class NullTask(Task):
+ def get_title(self, session):
+ return "Create submission"
+
class UserJobStatSet(NewStatSet):
def __init__(self, app, name, user):
super(UserJobStatSet, self).__init__(app, name)
Modified: mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings 2010-07-22 20:43:09 UTC (rev 4145)
@@ -15,13 +15,6 @@
</h2>
{jobs}
-
- <h2>
- <img src="resource?name=pool-20.png"/>
- Slots
- </h2>
-
- {slots}
</td>
<td>
</td>
Modified: mgmt/newdata/cumin/resources/app.css
===================================================================
--- mgmt/newdata/cumin/resources/app.css 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/resources/app.css 2010-07-22 20:43:09 UTC (rev 4145)
@@ -612,7 +612,7 @@
font-size: 0.9em;
}
-a.ObjectTaskLink.Cumin:before {
+a.TaskLink.Cumin:before {
content: "\00BB \0020";
font-weight: bold;
color: #dc9f2e;
14 years, 5 months
rhmessaging commits: r4144 - store/trunk/cpp/lib/jrnl.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2010-07-22 13:08:58 -0400 (Thu, 22 Jul 2010)
New Revision: 4144
Modified:
store/trunk/cpp/lib/jrnl/jcntl.cpp
store/trunk/cpp/lib/jrnl/jrec.hpp
store/trunk/cpp/lib/jrnl/txn_rec.hpp
Log:
Fix for BZ617209 "Store: Recovery failure (JERR_MAP_NOTFOUND:)". Corrected incorrect logic; all tests (including the long tests) now pass.
Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcntl.cpp 2010-07-22 15:03:47 UTC (rev 4143)
+++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2010-07-22 17:08:58 UTC (rev 4144)
@@ -747,16 +747,7 @@
else
{
int16_t enq_fid = _emap.get_remove_pfid(dr.deq_rid(), true);
- if (enq_fid < enq_map::EMAP_OK) // fail
- {
- if (enq_fid == enq_map::EMAP_RID_NOT_FOUND)
- {
- std::ostringstream oss;
- oss << std::hex << "_emap.get_remove_pfid(): drid=0x" << dr.deq_rid();
- throw jexception(jerrno::JERR_MAP_NOTFOUND, oss.str(), "jcntl", "rcvr_get_next_record");
- }
- }
- else
+ if (enq_fid >= enq_map::EMAP_OK) // ignore not found error
rd._enq_cnt_list[enq_fid]--;
}
}
@@ -805,18 +796,9 @@
}
else // txn dequeue
{
- int16_t fid = _emap.get_remove_pfid(itr->_drid, true);
- if (fid < 0)
- {
- if (fid == enq_map::EMAP_RID_NOT_FOUND)
- {
- std::ostringstream oss;
- oss << std::hex << "_emap.get_remove_pfid(): drid=0x" << itr->_drid;
- throw jexception(jerrno::JERR_MAP_NOTFOUND, oss.str(), "jcntl", "rcvr_get_next_record");
- }
- }
- else
- rd._enq_cnt_list[fid]--;
+ int16_t enq_fid = _emap.get_remove_pfid(itr->_drid, true);
+ if (enq_fid >= enq_map::EMAP_OK)
+ rd._enq_cnt_list[enq_fid]--;
}
}
std::free(xidp);
Modified: store/trunk/cpp/lib/jrnl/jrec.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jrec.hpp 2010-07-22 15:03:47 UTC (rev 4143)
+++ store/trunk/cpp/lib/jrnl/jrec.hpp 2010-07-22 17:08:58 UTC (rev 4144)
@@ -165,6 +165,7 @@
{ return size_blks(size, JRNL_DBLK_SIZE * JRNL_SBLK_SIZE); }
static inline u_int32_t size_blks(const std::size_t size, const std::size_t blksize)
{ return (size + blksize - 1)/blksize; }
+ virtual u_int64_t rid() const = 0;
protected:
virtual void chk_hdr() const = 0;
Modified: store/trunk/cpp/lib/jrnl/txn_rec.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_rec.hpp 2010-07-22 15:03:47 UTC (rev 4143)
+++ store/trunk/cpp/lib/jrnl/txn_rec.hpp 2010-07-22 17:08:58 UTC (rev 4144)
@@ -86,6 +86,7 @@
inline std::size_t data_size() const { return 0; } // This record never carries data
std::size_t xid_size() const;
std::size_t rec_size() const;
+ inline u_int64_t rid() const { return _txn_hdr._rid; }
private:
void chk_hdr() const;
14 years, 5 months
rhmessaging commits: r4143 - mgmt/newdata/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-07-22 11:03:47 -0400 (Thu, 22 Jul 2010)
New Revision: 4143
Modified:
mgmt/newdata/cumin/python/cumin/grid/job.py
Log:
Fix bz 616957: Don't display job ads that start with !!
Modified: mgmt/newdata/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-22 14:50:59 UTC (rev 4142)
+++ mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-22 15:03:47 UTC (rev 4143)
@@ -312,7 +312,8 @@
action = QmfCall(self.app, {'JobAd': {}})
ads = action.execute(job_server, "GetJobAd", job_id).data['JobAd']
cls = self.app.model.job_meta_data
- ad_list = [self.gen_item(x, ads[x], cls, dtype=self.get_type(ads[x])) for x in ads]
+ ad_list = [self.gen_item(x, ads[x], cls, dtype=self.get_type(ads[x])) \
+ for x in ads if not x.startswith("!!")]
self.items.set(session, ad_list)
14 years, 5 months
rhmessaging commits: r4142 - mgmt/newdata/cumin/python/cumin/inventory.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-07-22 10:50:59 -0400 (Thu, 22 Jul 2010)
New Revision: 4142
Modified:
mgmt/newdata/cumin/python/cumin/inventory/system.py
Log:
Added slot vis back to system overview
Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-07-21 19:16:37 UTC (rev 4141)
+++ mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-07-22 14:50:59 UTC (rev 4142)
@@ -83,7 +83,7 @@
super(SystemSlotMap, self).__init__(app, name)
self.system = system
- self.slot_clip_size = 240
+ self.slot_clip_size = 280
def do_process(self, session):
super(SystemSlotMap, self).do_process(session)
@@ -98,7 +98,8 @@
page = self.app.system_slots_page
sess = Session(page)
- page.id.set(sess, system._id)
+ #page.sysimage.set(sess, system._id)
+ page.sysimage.set(sess, system)
return sess.marshal()
@@ -113,14 +114,14 @@
page = self.app.system_slots_page
sess = Session(page)
- page.id.set(sess, system._id)
+ page.sysimage.set(sess, system)
page.json.set(sess, "slots")
page.groups.set(sess, [])
return sess.marshal()
def render_slot_chart_width(self, session):
- return 300
+ return 360
def render_slot_chart_height(self, session):
return 200
@@ -207,15 +208,15 @@
class SystemSlotMapPage(SlotMapPage):
def __init__(self, app, name):
- super(SystemSlotMapPage, self).__init__(app, name, None, "System")
+ self.cls = app.model.com_redhat_sesame.Sysimage
+ self.sysimage = RosemaryObjectParameter(app, "id", self.cls)
- self.id = IntegerParameter(app, "id")
- self.add_parameter(self.id)
+ super(SystemSlotMapPage, self).__init__(app, name, self.sysimage, "System")
+ self.add_parameter(self.sysimage)
+
def do_process(self, session):
super(SystemSlotMapPage, self).do_process(session)
- cls = self.app.com_redhat_sesame.Sysimage
- system = cls.get_object_by_id(session.cursor, self.id.get(session))
-
- self.slots.add_where_expr(session, "s.system = '%s'", system.nodeName)
+ sysimage = self.sysimage.get(session)
+ self.slots.add_where_expr(session, "\"System\" = '%s'", sysimage.nodeName)
14 years, 5 months
rhmessaging commits: r4141 - mgmt/newdata/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-07-21 15:16:37 -0400 (Wed, 21 Jul 2010)
New Revision: 4141
Modified:
mgmt/newdata/cumin/python/cumin/config.py
Log:
Fix config search path; Drop unused config parameter
Modified: mgmt/newdata/cumin/python/cumin/config.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/config.py 2010-07-21 15:55:06 UTC (rev 4140)
+++ mgmt/newdata/cumin/python/cumin/config.py 2010-07-21 19:16:37 UTC (rev 4141)
@@ -44,7 +44,7 @@
paths.append(os.path.join(os.path.expanduser("~"), ".cumin.conf"))
paths.append(os.path.join(self.home, "etc", "cumin.conf"))
- paths.append(os.path.join("", "etc", "cumin.conf"))
+ paths.append(os.path.join(os.sep, "etc", "cumin", "cumin.conf"))
return self.parse_files(paths)
@@ -58,9 +58,6 @@
param = ConfigParameter(self, "broker", str)
param.default = "amqp://localhost"
- param = ConfigParameter(self, "model", str)
- param.default = os.path.join(self.config.home, "xml")
-
self.log_file = ConfigParameter(self, "log-file", str)
param = ConfigParameter(self, "log-level", str)
@@ -75,7 +72,6 @@
self.add_option("--database", default=section.database)
self.add_option("--broker", default=section.broker)
- self.add_option("--model", default=section.model)
self.add_option("--log-file", default=section.log_file)
self.add_option("--log-level", default=section.log_level)
self.add_option("--debug", action="store_true", default=section.debug)
14 years, 5 months
rhmessaging commits: r4140 - store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: rgemmell
Date: 2010-07-21 11:55:06 -0400 (Wed, 21 Jul 2010)
New Revision: 4140
Modified:
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
Log:
Update selector durability test to check message count instead of using a consumer which could recreate the selector
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2010-07-21 14:12:55 UTC (rev 4139)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2010-07-21 15:55:06 UTC (rev 4140)
@@ -72,8 +72,8 @@
@Override
public void setUp() throws Exception
{
- assertNotNull("QPID_WORK must be set", System.getProperty("QPID_WORK"));
- assertNotNull("QPID_HOME must be set", System.getProperty("QPID_WORK"));
+ assertNotNull("QPID_WORK must be set", QPID_WORK_ORIG);
+ assertNotNull("QPID_HOME must be set", QPID_HOME);
if(! isExternalBroker())
{
@@ -135,28 +135,54 @@
/**
* Test that the selector applied to the DurableSubscription was successfully
- * transfered to the new store, and functions as expected with continued use.
+ * transfered to the new store, and functions as expected with continued use
+ * by monitoring message count while sending new messages to the topic.
*/
public void testSelectorDurability() throws Exception
{
- // Create a connection and start it
- TopicConnection connection = (TopicConnection) getConnection();
- connection.start();
+ JMXTestUtils jmxUtils = null;
+ try
+ {
+ jmxUtils = new JMXTestUtils(this, "guest", "guest");
+ jmxUtils.open();
+ }
+ catch (Exception e)
+ {
+ fail("Unable to establish JMX connection, test cannot proceed");
+ }
- // Drain the subscription of existing messages
- consumeDurableSubscriptionMessages(connection);
+ try
+ {
+ ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + "-" + SUB_NAME);
+ assertEquals("DurableSubscription backing queue should have 1 message on it initially",
+ new Integer(1), dursubQueue.getMessageCount());
+
+ // Create a connection and start it
+ TopicConnection connection = (TopicConnection) getConnection();
+ connection.start();
+
+ // Send messages which don't match and do match the selector, checking message count
+ TopicSession pubSession = connection.createTopicSession(true, org.apache.qpid.jms.Session.SESSION_TRANSACTED);
+ Topic topic = pubSession.createTopic(TOPIC_NAME);
+ TopicPublisher publisher = pubSession.createPublisher(topic);
+
+ BDBStoreUpgradeTestPreparer.publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "false");
+ pubSession.commit();
+ assertEquals("DurableSubscription backing queue should still have 1 message on it",
+ new Integer(1), dursubQueue.getMessageCount());
+
+ BDBStoreUpgradeTestPreparer.publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "true");
+ pubSession.commit();
+ assertEquals("DurableSubscription backing queue should now have 2 messages on it",
+ new Integer(2), dursubQueue.getMessageCount());
- // Send messages which don't match and do match the selector
- TopicSession pubSession = connection.createTopicSession(true, org.apache.qpid.jms.Session.SESSION_TRANSACTED);
- Topic topic = pubSession.createTopic(TOPIC_NAME);
- TopicPublisher publisher = pubSession.createPublisher(topic);
- BDBStoreUpgradeTestPreparer.publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "false");
- BDBStoreUpgradeTestPreparer.publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "true");
- pubSession.commit();
- pubSession.close();
-
- // Verify the matching message is received correctly
- consumeDurableSubscriptionMessages(connection);
+ dursubQueue.clearQueue();
+ pubSession.close();
+ }
+ finally
+ {
+ jmxUtils.close();
+ }
}
/**
14 years, 5 months
rhmessaging commits: r4139 - mgmt/newdata/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-07-21 10:12:55 -0400 (Wed, 21 Jul 2010)
New Revision: 4139
Modified:
mgmt/newdata/cumin/python/cumin/objectframe.py
Log:
Handle long lines in attribute values
Modified: mgmt/newdata/cumin/python/cumin/objectframe.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectframe.py 2010-07-21 09:24:04 UTC (rev 4138)
+++ mgmt/newdata/cumin/python/cumin/objectframe.py 2010-07-21 14:12:55 UTC (rev 4139)
@@ -108,8 +108,28 @@
if value is None:
return fmt_none()
+ if isinstance(value, str):
+ value = self.break_up_long_lines(value)
+
return xml_escape(str(value))
+ def break_up_long_lines(self, string):
+ if " " in string[0:80]:
+ return string
+
+ lines = list()
+
+ length = len(string)
+ prev = 0
+
+ for curr in range(80, length, 80):
+ lines.append(string[prev:curr])
+ prev = curr
+
+ lines.append(string[prev:length])
+
+ return " ".join(lines)
+
class ObjectTasks(Widget):
def __init__(self, app, name, object):
super(ObjectTasks, self).__init__(app, name)
14 years, 5 months
rhmessaging commits: r4138 - store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: rgemmell
Date: 2010-07-21 05:24:04 -0400 (Wed, 21 Jul 2010)
New Revision: 4138
Modified:
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreTest.java
Log:
Ensure the MessageStoreTest test store is created in the QPID_WORK directory
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreTest.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreTest.java 2010-07-20 22:13:46 UTC (rev 4137)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreTest.java 2010-07-21 09:24:04 UTC (rev 4138)
@@ -29,7 +29,8 @@
{
PropertiesConfiguration config = new PropertiesConfiguration();
- config.addProperty("store.environment-path", "BDB_MST");
+ config.addProperty("store.environment-path",
+ System.getProperty("QPID_WORK") + "/BDB_MessageStoreTest");
config.addProperty("store.class", "org.apache.qpid.server.store.berkeleydb.BDBMessageStore");
runTestWithStore(config);
14 years, 5 months
rhmessaging commits: r4137 - store/trunk/cpp/tests/cluster.
by rhmessaging-commits＠lists.jboss.org
Author: aconway
Date: 2010-07-20 18:13:46 -0400 (Tue, 20 Jul 2010)
New Revision: 4137
Modified:
store/trunk/cpp/tests/cluster/run_python_cluster_tests
Log:
Skip SASL tests as the test SASL-db is not installed for store tests.
Modified: store/trunk/cpp/tests/cluster/run_python_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_python_cluster_tests 2010-07-20 20:09:38 UTC (rev 4136)
+++ store/trunk/cpp/tests/cluster/run_python_cluster_tests 2010-07-20 22:13:46 UTC (rev 4137)
@@ -33,11 +33,12 @@
CLUSTER_TESTS_IGNORE=${CLUSTER_TESTS_IGNORE:-"-I ${CLUSTER_TESTS_FAIL}"}
# Ignore tests that don't work in the store environment
# SASL test needs sasl test database which is not installed.
-CLUSTER_TESTS_IGNORE="${CLUSTER_TESTS_IGNORE} -i cluster_tests.ShortTests.test_sasl"
+CLUSTER_TESTS_IGNORE="${CLUSTER_TESTS_IGNORE} -i cluster_tests.ShortTests.test_sasl -i cluster_tests.ShortTests.test_user_id_update"
CLUSTER_TESTS=${CLUSTER_TESTS:-$*}
TEST_CMD="${QPID_PYTHON_TEST} -m cluster_tests ${CLUSTER_TESTS_IGNORE} ${CLUSTER_TESTS} -DOUTDIR=$OUTDIR"
+
if test $COROSYNC; then
$TEST_CMD
RETCODE=$?
14 years, 5 months