rhmessaging-commits
September 2008
rhmessaging-commits@lists.jboss.org
- 1 participants
- 188 discussions
rhmessaging commits: r2445 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-11 12:53:17 -0400 (Thu, 11 Sep 2008)
New Revision: 2445
Modified:
mgmt/trunk/cumin/python/cumin/parameters.py
Log:
Added JobGroupParameter
Modified: mgmt/trunk/cumin/python/cumin/parameters.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/parameters.py 2008-09-11 16:49:57 UTC (rev 2444)
+++ mgmt/trunk/cumin/python/cumin/parameters.py 2008-09-11 16:53:17 UTC (rev 2445)
@@ -72,6 +72,20 @@
def do_marshal(self, job):
return str(job.id)
+class JobGroup(object):
+ def __init__(self, id):
+ self.id = id
+
+ def get_id(self):
+ return self.id
+
+class JobGroupParameter(Parameter):
+ def do_unmarshal(self, string):
+ return JobGroup(string)
+
+ def do_marshal(self, job_group):
+ return str(job_group.id)
+
class PeerParameter(Parameter):
def do_unmarshal(self, string):
return Link.get(int(string))
17 years, 7 months
- 1
- 0
rhmessaging commits: r2444 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-11 12:49:57 -0400 (Thu, 11 Sep 2008)
New Revision: 2444
Modified:
mgmt/trunk/cumin/python/cumin/widgets.py
Log:
Refactoring CuminBulkActionForm to allow for a CuminBulkStringActionForm that uses string ids instead of int ids.
Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py 2008-09-11 16:47:27 UTC (rev 2443)
+++ mgmt/trunk/cumin/python/cumin/widgets.py 2008-09-11 16:49:57 UTC (rev 2444)
@@ -220,19 +220,33 @@
def __init__(self, app, name):
super(CuminActionSetForm, self).__init__(app, name)
-class CuminBulkActionForm(ItemSet, CuminForm, Frame):
+class CuminIntIdList(Widget):
def __init__(self, app, name):
- super(CuminBulkActionForm, self).__init__(app, name)
-
+ super(CuminIntIdList, self).__init__(app, name)
+
param = IntegerParameter(app, "param")
self.add_parameter(param)
self.ids = ListParameter(app, "id", param)
self.add_parameter(self.ids)
- def get_items(self, session, *args):
- return self.ids.get(session)
+ def render_item_content(self, session, id):
+ return "Act on object %i" % id
+
+class CuminStringIdList(Widget):
+ def __init__(self, app, name):
+ super(CuminStringIdList, self).__init__(app, name)
+
+ param = Parameter(app, "param")
+ self.add_parameter(param)
+ self.ids = ListParameter(app, "id", param)
+ self.add_parameter(self.ids)
+
+ def render_item_content(self, session, id):
+ return "Act on object %s" % id
+
+class CuminBulk(ItemSet, CuminForm, Frame):
def process_submit(self, session, *args):
items = self.get_items(session, *args)
@@ -245,18 +259,23 @@
pass
def process_return(self, session, *args):
- pass
+ self.page.set_redirect_url(session, self.get_origin(session))
def process_cancel(self, session, *args):
self.process_return(session, *args)
- def render_item_content(self, session, id):
- return "Act on object %i" % id
-
def render_form_heading(self, session, *args):
return "Actions"
+class CuminBulkActionForm(CuminBulk, CuminIntIdList):
+ def get_items(self, session, *args):
+ return self.ids.get(session)
+
+class CuminBulkStringActionForm(CuminBulk, CuminStringIdList):
+ def get_items(self, session, *args):
+ return self.ids.get(session)
+
class CuminStatus(Widget):
def get_args(self, session):
return self.frame.get_args(session)
@@ -736,6 +755,35 @@
return super(FilteredCheckboxIdColumn, self).do_render(session, data,
disabled=disabled)
+class CheckboxStringIdColumn(SqlTableColumn):
+ def __init__(self, app, name, form):
+ super(CheckboxStringIdColumn, self).__init__(app, name)
+
+ self.form = form
+ self.header_class = CheckboxIdColumnHeader
+
+ param = Parameter(app, "param")
+ self.add_parameter(param)
+
+ self.ids = ListParameter(app, "id", param)
+ self.add_parameter(self.ids)
+
+ def get(self, session):
+ return self.ids.get(session)
+
+ def clear(self, session):
+ self.ids.set(session, list())
+
+ def do_render(self, session, data, disabled=False):
+ name = self.ids.path
+ id = data[self.name]
+ attr = id in self.ids.get(session) and "checked=\"checked\"" or ""
+ disa = disabled and "disabled=\"disabled\"" or ""
+ t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%s\" %s %s/></td>"
+
+ return t % (name, id, attr, disa)
+
+
class NameField(StringField):
def __init__(self, app, name, form):
super(NameField, self).__init__(app, name, form)
17 years, 7 months
- 1
- 0
rhmessaging commits: r2443 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-11 12:47:27 -0400 (Thu, 11 Sep 2008)
New Revision: 2443
Modified:
mgmt/trunk/cumin/python/wooly/tables.py
Log:
Making hidden columns non-class data dependent (so it works with multiple users)
Modified: mgmt/trunk/cumin/python/wooly/tables.py
===================================================================
--- mgmt/trunk/cumin/python/wooly/tables.py 2008-09-11 16:42:33 UTC (rev 2442)
+++ mgmt/trunk/cumin/python/wooly/tables.py 2008-09-11 16:47:27 UTC (rev 2443)
@@ -10,7 +10,6 @@
self.columns = list()
self.headers_by_column = dict()
- self.hidden_column_names = list()
# which column are we sorting on
self.scolumn = Parameter(app, "col")
@@ -21,6 +20,81 @@
self.reversed.default = False
self.add_parameter(self.reversed)
+ # list of columns that default to hidden
+ self.hidden_column_names = list()
+
+ # list of column indexes that have been shown
+ self.vcols = Attribute(app, "vcols")
+ self.add_attribute(self.vcols)
+
+ def add_hidden_column(self, column):
+ self.add_column(column)
+ self.hide_column(column.name)
+
+ def hide_column(self, column_name):
+ self.hidden_column_names.append(column_name)
+
+ def show_column(self, session, column_name):
+ if column_name in self.hidden_column_names:
+ vlist = self.get_vlist(session)
+ shown, vindex = self.is_shown(session, column_name, vlist)
+ if not shown:
+ vlist.append(vindex)
+ vcols = "_".join(vlist)
+ self.vcols.set(session, vcols)
+
+ def render_headers(self, session, *args):
+ writer = Writer()
+
+ vlist = self.get_vlist(session)
+ for column in self.columns:
+ show = True
+ if column.name in self.hidden_column_names:
+ show, vindex = self.is_shown(session, column.name, vlist)
+
+ if show:
+ header = self.headers_by_column[column]
+ writer.write(header.render(session))
+
+ return writer.to_string()
+
+ def render_column_count(self, session, *args):
+ vlist = self.get_vlist(session)
+ return len(self.columns) - len(self.hidden_column_names) + len(vlist)
+
+ def render_cells(self, session, item):
+ writer = Writer()
+
+ vlist = self.get_vlist(session)
+ for col in self.columns:
+ col.set_item(session, item)
+ render = True
+ if col.name in self.hidden_column_names:
+ render, vindex = self.is_shown(session, col.name, vlist)
+
+ if render:
+ writer.write(col.render(session))
+
+ return writer.to_string()
+
+ def is_shown(self, session, name, vlist=None):
+ if vlist is None:
+ vlist = self.get_vlist(session)
+ for i in range(len(self.columns)):
+ if self.columns[i].name == name:
+ return str(i) in vlist, str(i)
+
+ return False, 0
+
+ def get_vlist(self, session):
+ """ get list of visibilized columns """
+
+ vcols = self.vcols.get(session)
+ if vcols:
+ return vcols.split("_")
+ else:
+ return []
+
def add_column(self, column):
self.columns.append(column)
self.add_child(column)
@@ -32,17 +106,6 @@
if self.scolumn.default is None:
self.scolumn.default = column.name
- def add_hidden_column(self, column):
- self.add_column(column)
- self.hide_column(column.name)
-
- def hide_column(self, column_name):
- self.hidden_column_names.append(column_name)
-
- def show_column(self, column_name):
- if column_name in self.hidden_column_names:
- self.hidden_column_names.remove(column_name)
-
def set_header(self, column, header):
self.headers_by_column[column] = header
@@ -70,29 +133,6 @@
count = self.get_item_count(session, *args)
return "%i %s" % (count, count == 1 and "item" or "items")
- def render_headers(self, session, *args):
- writer = Writer()
-
- for column in self.columns:
- if not column.name in self.hidden_column_names:
- header = self.headers_by_column[column]
- writer.write(header.render(session))
-
- return writer.to_string()
-
- def render_column_count(self, session, *args):
- return len(self.columns) - len(self.hidden_column_names)
-
- def render_cells(self, session, item):
- writer = Writer()
-
- for col in self.columns:
- col.set_item(session, item)
- if not col.name in self.hidden_column_names:
- writer.write(col.render(session))
-
- return writer.to_string()
-
def render_none(self, session, *args):
"""For producing a message when the table is empty"""
17 years, 7 months
- 1
- 0
rhmessaging commits: r2442 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-11 12:42:33 -0400 (Thu, 11 Sep 2008)
New Revision: 2442
Modified:
mgmt/trunk/cumin/python/cumin/exchange.py
mgmt/trunk/cumin/python/cumin/queue.py
Log:
Making hidden columns non-class data dependent (so it works with multiple users)
Modified: mgmt/trunk/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.py 2008-09-11 16:12:08 UTC (rev 2441)
+++ mgmt/trunk/cumin/python/cumin/exchange.py 2008-09-11 16:42:33 UTC (rev 2442)
@@ -306,9 +306,11 @@
self.__remove = self.Remove(app, "remove", self)
self.add_child(self.__remove)
- self.show_column("q_id")
self.set_default_column_name("q_id")
+ def pre_render(self, session, args):
+ self.show_column(session, "q_id")
+
def render_title(self, session, exchange):
return "Queue Bindings %s" % \
fmt_count(exchange.bindings.count())
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-09-11 16:12:08 UTC (rev 2441)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-09-11 16:42:33 UTC (rev 2442)
@@ -287,8 +287,10 @@
self.__remove = self.Remove(app, "remove", self)
self.add_child(self.__remove)
- self.show_column("e_id")
self.set_default_column_name("e_id")
+
+ def pre_render(self, session, args):
+ self.show_column(session, "e_id")
def render_add_queue_binding_url(self, session, vhost):
branch = session.branch()
17 years, 7 months
- 1
- 0
rhmessaging commits: r2441 - in store/trunk/cpp: lib and 3 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-09-11 12:12:08 -0400 (Thu, 11 Sep 2008)
New Revision: 2441
Removed:
store/trunk/cpp/mrg-grid.spec
store/trunk/cpp/mrg-messaging.spec
store/trunk/cpp/mrg.spec
store/trunk/cpp/rhm.spec.in
Modified:
store/trunk/cpp/
store/trunk/cpp/configure.ac
store/trunk/cpp/lib/Makefile.am
store/trunk/cpp/tests/Makefile.am
store/trunk/cpp/tests/jrnl/Makefile.am
store/trunk/cpp/tests/jrnl/jtt/Makefile.am
Log:
changed lib name from libbdbstore.so to msgstore.so, changed libtool options to match qpid (thanks, andrew stitcher)
Property changes on: store/trunk/cpp
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.h
config.in
config.log
config.status
configure
libtool
stamp-h1
rpm
rhm.spec
rhm-0.2.tar.gz
rhm-0.2.tar.bz2
rhm-0.2
rhm-0.1.tar.gz
+ Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.h
config.in
config.log
config.status
configure
libtool
stamp-h1
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/configure.ac 2008-09-11 16:12:08 UTC (rev 2441)
@@ -184,7 +184,6 @@
AM_CONDITIONAL([DOXYGEN], [test x$do_doxygen = xyes])
AC_CONFIG_FILES([
- rhm.spec
Makefile
tests/Makefile
tests/jrnl/Makefile
Modified: store/trunk/cpp/lib/Makefile.am
===================================================================
--- store/trunk/cpp/lib/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/lib/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441)
@@ -1,20 +1,22 @@
AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) -I$(srcdir)/gen \
-DRHM_CLEAN -pthread
+
+# Definitions for client and daemon plugins
+PLUGINLDFLAGS=-no-undefined -module -avoid-version
+dmoduledir=$(libdir)/qpid/daemon
+dmodule_LTLIBRARIES = msgstore.la
-lib_LTLIBRARIES = libbdbstore.la
-
-libbdbstore_la_LIBADD = \
+msgstore_la_LIBADD = \
$(APR_LIBS) \
$(LIB_DLOPEN) \
$(LIB_BERKELEY_DB) \
$(LIB_CLOCK_GETTIME) \
$(QPID_LIBS)
-libbdbstore_la_LDFLAGS = \
- -version-info \
- $(LIBTOOL_VERSION_INFO_ARG)
+msgstore_la_LDFLAGS = \
+ $(PLUGINLDFLAGS)
-libbdbstore_la_SOURCES = \
+msgstore_la_SOURCES = \
StorePlugin.cpp \
BindingDbt.cpp \
BufferValue.cpp \
Deleted: store/trunk/cpp/mrg-grid.spec
===================================================================
--- store/trunk/cpp/mrg-grid.spec 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/mrg-grid.spec 2008-09-11 16:12:08 UTC (rev 2441)
@@ -1,37 +0,0 @@
-Summary: MRG - Grid component
-Name: mrg-grid
-Version: 1.0
-Release: 4%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://redhat.com/mrg
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
-
-Requires: condor
-Requires: mrg-grid-docs
-
-%description
-This is the top-level package that includes the MRG Grid component.
-
-%install
-rm -rf %{buildroot}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%prep
-
-%build
-
-%files
-%defattr(-,root,root,-)
-
-
-%changelog
-* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 1.0-4
-- Bumped for Beta 3 update
-
-* Wed Nov 28 2007 Nuno Santos <nsantos(a)redhat.com> - 1.0-1
-- Initial build.
-
Deleted: store/trunk/cpp/mrg-messaging.spec
===================================================================
--- store/trunk/cpp/mrg-messaging.spec 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/mrg-messaging.spec 2008-09-11 16:12:08 UTC (rev 2441)
@@ -1,48 +0,0 @@
-Summary: MRG - Messaging component
-Name: mrg-messaging
-Version: 1.0
-Release: 5%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://redhat.com/mrg
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
-
-Requires: rhm
-Requires: rhm-docs
-Requires: qpidc-devel
-Requires: python-qpid
-Requires: qpid-java-client
-
-
-%description
-This is the top-level package that includes the MRG Grid component.
-
-%install
-rm -rf %{buildroot}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%prep
-
-%build
-
-%files
-%defattr(-,root,root,-)
-
-
-%changelog
-* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 1.0-5
-- Bumped for Beta 3 update
-
-* Wed Jan 23 2008 Nuno Santos <nsantos(a)redhat.com> - 1.0-4
-- Added dependencies for -devel packages, so that examples work
- as per the tutorial
-
-* Mon Jan 21 2008 Gordon Sim <gsim(a)redhat.com> - 1.0-2
-- Bumped release
-
-* Wed Nov 28 2007 Nuno Santos <nsantos(a)redhat.com> - 1.0-1
-- Initial build.
-
Deleted: store/trunk/cpp/mrg.spec
===================================================================
--- store/trunk/cpp/mrg.spec 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/mrg.spec 2008-09-11 16:12:08 UTC (rev 2441)
@@ -1,39 +0,0 @@
-Summary: MRG - Messaging, Real-Time, and Grid components
-Name: mrg
-Version: 1.0
-Release: 4%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://redhat.com/mrg
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
-
-Requires: mrg-messaging
-Requires: mrg-realtime
-Requires: mrg-grid
-
-%description
-This is the top-level package that includes all the MRG components: Messaging,
-Reat-Time, and Grid.
-
-%install
-rm -rf %{buildroot}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%prep
-
-%build
-
-%files
-%defattr(-,root,root,-)
-
-
-%changelog
-* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 1.0-4
-- Bumped for Beta 3 update
-
-* Wed Nov 28 2007 Nuno Santos <nsantos(a)redhat.com> - 1.0-1
-- Initial build.
-
Deleted: store/trunk/cpp/rhm.spec.in
===================================================================
--- store/trunk/cpp/rhm.spec.in 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/rhm.spec.in 2008-09-11 16:12:08 UTC (rev 2441)
@@ -1,124 +0,0 @@
-#
-# Spec file for Red Hat Messaging package rhm.
-#
-
-%define svnrev xxx
-# built against qpidc svn rev xxx
-
-Name: rhm
-Version: @VERSION@
-Release: 21%{?dist}
-Summary: Red Hat extensions to the Qpid messaging system
-Group: System Environment/Libraries
-License: LGPL
-URL: http://rhm.et.redhat.com/rhm
-Source0: http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-ExclusiveArch: i386 x86_64
-
-BuildRequires: qpidc-devel
-BuildRequires: qpidd-devel
-BuildRequires: db4-devel
-# TODO: Workaround missing dependency in qpidd-devel. Remove this
-# when qpid-devel is updated.
-BuildRequires: e2fsprogs-devel
-BuildRequires: libaio-devel
-BuildRequires: python
-BuildRequires: libtool
-
-Requires: qpidd
-Requires: db4
-Requires: libaio
-
-%description
-Red Hat extensions to the Qpid AMQP broker: persistent message storage
-in Berkeley DB.
-
-%prep
-%setup -q
-
-%build
-%configure --disable-static --disable-rpath CXXFLAGS="-O3 -DNDEBUG"
-make %{?_smp_mflags}
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-install -d -m0775 %{buildroot}%{_localstatedir}/rhm
-install -d -m0755 %{buildroot}/usr/lib/qpidd
-install -Dp -m0755 lib/.libs/libbdbstore.so* %{buildroot}/usr/lib/qpidd
-rm -f %{buildroot}%_libdir/*.a
-rm -f %{buildroot}%_libdir/*.la
-rm -f %{buildroot}%_libdir/*.so*
-rm %{buildroot}%_sysconfdir/rhmd.conf
-
-%clean
-rm -rf %{buildroot}
-
-%check
-make check
-
-%files
-%defattr(-,root,root,-)
-%doc README COPYING
-/usr/lib/qpidd/libbdbstore.so*
-%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
-
-
-%changelog
-* Thu May 29 2008 Nuno Santos <nsantos(a)nsantos.bos.redhat.com> - 0.2-21
-- BZ448931: remove initscript for rhmd, and shell startup script
-
-* Mon Apr 14 2008 Kim van der Riet <kim.vdriet(a)redhat.com> - 0.2-20
-- removed cppunit as build dependency - all tests now boost test
-
-* Fri Apr 11 2008 Kim van der Riet <kim.vdriet(a)redhat.com> - 0.2-19
-- added python package as build dependency
-
-* Tue Feb 12 2008 Rafael Schloming <rafaels(a)redhat.com> - 0.2-17
-- bump release for Beta 3 bug fixes
-
-* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 0.2-15
-- Bumped for Beta 3 update
-
-* Tue Jan 22 2008 Nuno Santos <nsantos(a)redhat.com> - 0.2-14
-- fix syntax in configuration file
-
-* Thu Jan 21 2008 Gordon Sim <gsim(a)redhat.com> - 0.2-13
-- Bump release for various journal fixes.
-
-* Thu Jan 03 2008 Nuno Santos <nsantos(a)redhat.com> - 0.2-11
-- add missing dependencies on libaio, cppunit, qpidc-devel
-
-* Thu Jan 03 2008 Nuno Santos <nsantos(a)redhat.com> - 0.2-6
-- limit builds to i386 and x86_64 archs
-
-* Tue Dec 18 2007 Nuno Santos <nsantos(a)redhat.com> - 0.2-5
-- Include several fixes, mainly from Kim Van Der Riet (BZ 401071: Add journal
- file geometry parameters to broker, 401091: Handle journal full condition in
- broker, 401151: Journal RID not monotonically increasing in all cases,
- 401191: Journal recovery fails when overwrite boundary coincides with
- previous record, 403051: Failures in perftest fanout mode with async
- persistence, 403201: Messages prematurely deleted by store, 413021: Journal
- recovery fails when flush did not occur and records don't end on sblk
- boundary, 423981: Error running durable perftest)
-
-* Thu Dec 06 2007 Alan Conway <aconway(a)redhat.com> - 0.2-4
-- Build with optimized flags.
-
-* Thu Oct 04 2007 Nuno Santos <nsantos(a)redhat.com> - 0.2-2
-- Add rhmd init script
-
-* Wed Jul 25 2007 Nuno Santos <nsantos(a)redhat.com> - 0.2-1
-- Disable rpath; bump release to match numbers of qpidc trunk packages
-
-* Tue Apr 17 2007 Alan Conway <aconway(a)redhat.com> - 0.1-3
-- Workaround missing BuildRequires: e2fsprogs-devel in qpidc-devel.
-
-* Tue Apr 17 2007 Alan Conway <aconway(a)redhat.com> - 0.1-2
-- Added missing BuildRequires: db4-devel
-
-* Thu Apr 12 2007 Alan Conway <aconway(a)redhat.com> - 0.1-1
-- Initial build.
-
Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/tests/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441)
@@ -25,7 +25,7 @@
TwoPhaseCommitTest
UNIT_TEST_SRCS = unit_test.cpp unit_test.h
-UNIT_TEST_LDADD = -lboost_unit_test_framework $(top_builddir)/lib/libbdbstore.la
+UNIT_TEST_LDADD = -lboost_unit_test_framework $(top_builddir)/lib/msgstore.la
include gen.mk
@@ -59,6 +59,6 @@
QPID_DIR=$(QPID_DIR) \
VALGRIND=$(VALGRIND) \
abs_srcdir=$(abs_srcdir) \
- LIBBDBSTORE=$(abs_builddir)/../lib/.libs/libbdbstore.so \
+ LIBBDBSTORE=$(abs_builddir)/../lib/.libs/msgstore.so \
TMPDIR=$(TMPDIR) \
$(srcdir)/run_test
Modified: store/trunk/cpp/tests/jrnl/Makefile.am
===================================================================
--- store/trunk/cpp/tests/jrnl/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/tests/jrnl/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441)
@@ -74,7 +74,7 @@
_st_read_txn
UNIT_TEST_SRCS = ../unit_test.cpp
-UNIT_TEST_LDADD = -lboost_unit_test_framework ${top_builddir}/lib/libbdbstore.la
+UNIT_TEST_LDADD = -lboost_unit_test_framework ${top_builddir}/lib/msgstore.la
_ut_time_ns_SOURCES = _ut_time_ns.cpp $(UNIT_TEST_SRCS)
_ut_time_ns_LDADD = $(UNIT_TEST_LDADD)
Modified: store/trunk/cpp/tests/jrnl/jtt/Makefile.am
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440)
+++ store/trunk/cpp/tests/jrnl/jtt/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441)
@@ -26,7 +26,7 @@
TMPDIR=$(abs_srcdir)/test_tmp
-LINK_BDB = ${top_builddir}/lib/libbdbstore.la
+LINK_BDB = ${top_builddir}/lib/msgstore.la
TESTS_ENVIRONMENT = \
VALGRIND=$(VALGRIND) \
17 years, 7 months
- 1
- 0
rhmessaging commits: r2440 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-10 16:29:50 -0400 (Wed, 10 Sep 2008)
New Revision: 2440
Modified:
mgmt/trunk/cumin/python/cumin/binding.py
mgmt/trunk/cumin/python/cumin/binding.strings
Log:
Adding required binding key to direct exchange on binding form.
Modified: mgmt/trunk/cumin/python/cumin/binding.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.py 2008-09-10 20:00:25 UTC (rev 2439)
+++ mgmt/trunk/cumin/python/cumin/binding.py 2008-09-10 20:29:50 UTC (rev 2440)
@@ -88,9 +88,6 @@
self.exchange = exchange
self.instance_data = dict_key
-class DirectExchangeInput(ExchangeInput):
- pass
-
class FanoutExchangeInput(ExchangeInput):
pass
@@ -107,6 +104,9 @@
def render_key_value(self, session, exchange):
return self.get_exchange_info_for(session, exchange, "key")
+class DirectExchangeInput(BindingKeyExchangeInput):
+ pass
+
class TopicExchangeInput(BindingKeyExchangeInput):
pass
@@ -339,7 +339,7 @@
for exchange in form_binding_info:
type = form_binding_info[exchange]["type"]
- if type == "topic":
+ if (type == "topic") or (type == "direct"):
if not "key" in form_binding_info[exchange]:
name = form_binding_info[exchange]["name"]
errs = berrs.setdefault(name, list())
@@ -382,8 +382,8 @@
# if the exchange checkbox is checked
if "name" in binding_info[this_exchange]:
type = binding_info[this_exchange]["type"]
- if type == "direct":
- binding_info[this_exchange]["key"] = queue_name
+ #if type == "direct":
+ # binding_info[this_exchange]["key"] = queue_name
form_binding_info[this_exchange] = dict()
form_binding_info[this_exchange]["name"] = binding_info[this_exchange]["name"]
Modified: mgmt/trunk/cumin/python/cumin/binding.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.strings 2008-09-10 20:00:25 UTC (rev 2439)
+++ mgmt/trunk/cumin/python/cumin/binding.strings 2008-09-10 20:29:50 UTC (rev 2440)
@@ -19,7 +19,7 @@
[DirectExchangeInput.html]
<tr>
{exchange_name_input}
- <td> </td>
+ {exchange_key_input}
</tr>
[TopicExchangeInput.html]
17 years, 7 months
- 1
- 0
rhmessaging commits: r2439 - in store/trunk/cpp/lib: gen and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: tedross
Date: 2008-09-10 16:00:25 -0400 (Wed, 10 Sep 2008)
New Revision: 2439
Modified:
store/trunk/cpp/lib/JournalImpl.cpp
store/trunk/cpp/lib/JournalImpl.h
store/trunk/cpp/lib/gen/Journal.cpp
store/trunk/cpp/lib/gen/Store.cpp
Log:
Re-generated management files
Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438)
+++ store/trunk/cpp/lib/JournalImpl.cpp 2008-09-10 20:00:25 UTC (rev 2439)
@@ -546,7 +546,8 @@
}
qpid::management::Manageable::status_t JournalImpl::ManagementMethod (uint32_t methodId,
- qpid::management::Args& /*args*/)
+ qpid::management::Args& /*args*/,
+ std::string& /*text*/)
{
Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h 2008-09-10 19:43:56 UTC (rev 2438)
+++ store/trunk/cpp/lib/JournalImpl.h 2008-09-10 20:00:25 UTC (rev 2439)
@@ -181,7 +181,8 @@
{ return _mgmtObject; }
qpid::management::Manageable::status_t ManagementMethod (uint32_t,
- qpid::management::Args&);
+ qpid::management::Args&,
+ std::string&);
private:
void free_read_buffers();
Modified: store/trunk/cpp/lib/gen/Journal.cpp
===================================================================
--- store/trunk/cpp/lib/gen/Journal.cpp 2008-09-10 19:43:56 UTC (rev 2438)
+++ store/trunk/cpp/lib/gen/Journal.cpp 2008-09-10 20:00:25 UTC (rev 2439)
@@ -555,18 +555,19 @@
void Journal::doMethod (string methodName, Buffer& inBuf, Buffer& outBuf)
{
Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
+ std::string text;
if (methodName == "expand") {
ArgsJournalExpand ioArgs;
ioArgs.i_by = inBuf.getLong();
- status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs);
+ status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text);
outBuf.putLong (status);
- outBuf.putShortString (Manageable::StatusText (status));
+ outBuf.putShortString (Manageable::StatusText (status, text));
return;
}
- outBuf.putLong (status);
- outBuf.putShortString (Manageable::StatusText (status));
+ outBuf.putLong(status);
+ outBuf.putShortString(Manageable::StatusText(status, text));
}
Modified: store/trunk/cpp/lib/gen/Store.cpp
===================================================================
--- store/trunk/cpp/lib/gen/Store.cpp 2008-09-10 19:43:56 UTC (rev 2438)
+++ store/trunk/cpp/lib/gen/Store.cpp 2008-09-10 20:00:25 UTC (rev 2439)
@@ -356,9 +356,10 @@
void Store::doMethod (string, Buffer&, Buffer& outBuf)
{
Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
+ std::string text;
- outBuf.putLong (status);
- outBuf.putShortString (Manageable::StatusText (status));
+ outBuf.putLong(status);
+ outBuf.putShortString(Manageable::StatusText(status, text));
}
17 years, 7 months
- 1
- 0
rhmessaging commits: r2438 - in store/trunk/cpp: lib/jrnl and 3 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-09-10 15:43:56 -0400 (Wed, 10 Sep 2008)
New Revision: 2438
Modified:
store/trunk/cpp/lib/BindingDbt.cpp
store/trunk/cpp/lib/BindingDbt.h
store/trunk/cpp/lib/BufferValue.cpp
store/trunk/cpp/lib/BufferValue.h
store/trunk/cpp/lib/Cursor.h
store/trunk/cpp/lib/DataTokenImpl.cpp
store/trunk/cpp/lib/DataTokenImpl.h
store/trunk/cpp/lib/IdDbt.cpp
store/trunk/cpp/lib/IdDbt.h
store/trunk/cpp/lib/IdPairDbt.cpp
store/trunk/cpp/lib/IdPairDbt.h
store/trunk/cpp/lib/IdSequence.cpp
store/trunk/cpp/lib/IdSequence.h
store/trunk/cpp/lib/JournalImpl.cpp
store/trunk/cpp/lib/JournalImpl.h
store/trunk/cpp/lib/MessageStoreImpl.cpp
store/trunk/cpp/lib/MessageStoreImpl.h
store/trunk/cpp/lib/PreparedTransaction.cpp
store/trunk/cpp/lib/PreparedTransaction.h
store/trunk/cpp/lib/StoreException.h
store/trunk/cpp/lib/StorePlugin.cpp
store/trunk/cpp/lib/StringDbt.cpp
store/trunk/cpp/lib/StringDbt.h
store/trunk/cpp/lib/TxnCtxt.h
store/trunk/cpp/lib/jrnl/aio.cpp
store/trunk/cpp/lib/jrnl/aio.hpp
store/trunk/cpp/lib/jrnl/aio_cb.hpp
store/trunk/cpp/lib/jrnl/arr_cnt.cpp
store/trunk/cpp/lib/jrnl/arr_cnt.hpp
store/trunk/cpp/lib/jrnl/cvar.cpp
store/trunk/cpp/lib/jrnl/cvar.hpp
store/trunk/cpp/lib/jrnl/data_tok.cpp
store/trunk/cpp/lib/jrnl/data_tok.hpp
store/trunk/cpp/lib/jrnl/deq_hdr.hpp
store/trunk/cpp/lib/jrnl/deq_rec.cpp
store/trunk/cpp/lib/jrnl/deq_rec.hpp
store/trunk/cpp/lib/jrnl/enq_hdr.hpp
store/trunk/cpp/lib/jrnl/enq_map.cpp
store/trunk/cpp/lib/jrnl/enq_map.hpp
store/trunk/cpp/lib/jrnl/enq_rec.cpp
store/trunk/cpp/lib/jrnl/enq_rec.hpp
store/trunk/cpp/lib/jrnl/enums.hpp
store/trunk/cpp/lib/jrnl/fcntl.cpp
store/trunk/cpp/lib/jrnl/fcntl.hpp
store/trunk/cpp/lib/jrnl/file_hdr.hpp
store/trunk/cpp/lib/jrnl/jcfg.hpp
store/trunk/cpp/lib/jrnl/jcntl.cpp
store/trunk/cpp/lib/jrnl/jcntl.hpp
store/trunk/cpp/lib/jrnl/jdir.cpp
store/trunk/cpp/lib/jrnl/jdir.hpp
store/trunk/cpp/lib/jrnl/jerrno.cpp
store/trunk/cpp/lib/jrnl/jerrno.hpp
store/trunk/cpp/lib/jrnl/jexception.cpp
store/trunk/cpp/lib/jrnl/jexception.hpp
store/trunk/cpp/lib/jrnl/jinf.cpp
store/trunk/cpp/lib/jrnl/jinf.hpp
store/trunk/cpp/lib/jrnl/jrec.cpp
store/trunk/cpp/lib/jrnl/jrec.hpp
store/trunk/cpp/lib/jrnl/pmgr.cpp
store/trunk/cpp/lib/jrnl/pmgr.hpp
store/trunk/cpp/lib/jrnl/rcvdat.hpp
store/trunk/cpp/lib/jrnl/rec_hdr.hpp
store/trunk/cpp/lib/jrnl/rec_tail.hpp
store/trunk/cpp/lib/jrnl/rmgr.cpp
store/trunk/cpp/lib/jrnl/rmgr.hpp
store/trunk/cpp/lib/jrnl/rrfc.cpp
store/trunk/cpp/lib/jrnl/rrfc.hpp
store/trunk/cpp/lib/jrnl/slock.cpp
store/trunk/cpp/lib/jrnl/slock.hpp
store/trunk/cpp/lib/jrnl/time_ns.cpp
store/trunk/cpp/lib/jrnl/time_ns.hpp
store/trunk/cpp/lib/jrnl/txn_hdr.hpp
store/trunk/cpp/lib/jrnl/txn_map.cpp
store/trunk/cpp/lib/jrnl/txn_map.hpp
store/trunk/cpp/lib/jrnl/txn_rec.cpp
store/trunk/cpp/lib/jrnl/txn_rec.hpp
store/trunk/cpp/lib/jrnl/wmgr.cpp
store/trunk/cpp/lib/jrnl/wmgr.hpp
store/trunk/cpp/lib/jrnl/wrfc.cpp
store/trunk/cpp/lib/jrnl/wrfc.hpp
store/trunk/cpp/tests/OrderingTest.cpp
store/trunk/cpp/tests/SimpleTest.cpp
store/trunk/cpp/tests/TransactionalTest.cpp
store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
store/trunk/cpp/tests/jrnl/_st_basic.cpp
store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp
store/trunk/cpp/tests/jrnl/_st_read.cpp
store/trunk/cpp/tests/jrnl/_st_read_txn.cpp
store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp
store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp
store/trunk/cpp/tests/jrnl/_ut_jdir.cpp
store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp
store/trunk/cpp/tests/jrnl/_ut_jexception.cpp
store/trunk/cpp/tests/jrnl/_ut_jinf.cpp
store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp
store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp
store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp
store/trunk/cpp/tests/jrnl/jtt/args.cpp
store/trunk/cpp/tests/jrnl/jtt/args.hpp
store/trunk/cpp/tests/jrnl/jtt/data_src.cpp
store/trunk/cpp/tests/jrnl/jtt/data_src.hpp
store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp
store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp
store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp
store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp
store/trunk/cpp/tests/jrnl/jtt/main.cpp
store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp
store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp
store/trunk/cpp/tests/jrnl/jtt/test_case.cpp
store/trunk/cpp/tests/jrnl/jtt/test_case.hpp
store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp
store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp
store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp
store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp
store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp
store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp
store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp
store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp
Log:
namespace adjustment: namespace rhm is now namespace mrg; namespace rhm::bdbstore is now namespace mrg::msgstore. Added some missing GPL copyright notices.
Modified: store/trunk/cpp/lib/BindingDbt.cpp
===================================================================
--- store/trunk/cpp/lib/BindingDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/BindingDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "BindingDbt.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using qpid::broker::PersistableExchange;
using qpid::broker::PersistableQueue;
using qpid::framing::FieldTable;
Modified: store/trunk/cpp/lib/BindingDbt.h
===================================================================
--- store/trunk/cpp/lib/BindingDbt.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/BindingDbt.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -30,8 +30,8 @@
#include <qpid/framing/Buffer.h>
#include <qpid/framing/FieldTable.h>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class BindingDbt : public Dbt
{
Modified: store/trunk/cpp/lib/BufferValue.cpp
===================================================================
--- store/trunk/cpp/lib/BufferValue.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/BufferValue.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "BufferValue.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using qpid::broker::Persistable;
BufferValue::BufferValue(u_int32_t size, u_int64_t offset)
Modified: store/trunk/cpp/lib/BufferValue.h
===================================================================
--- store/trunk/cpp/lib/BufferValue.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/BufferValue.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,8 +28,8 @@
#include <qpid/broker/Persistable.h>
#include <qpid/framing/Buffer.h>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class BufferValue : public Dbt
{
Modified: store/trunk/cpp/lib/Cursor.h
===================================================================
--- store/trunk/cpp/lib/Cursor.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/Cursor.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -26,8 +26,8 @@
#include "db-inc.h"
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class Cursor
{
Modified: store/trunk/cpp/lib/DataTokenImpl.cpp
===================================================================
--- store/trunk/cpp/lib/DataTokenImpl.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/DataTokenImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "DataTokenImpl.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
DataTokenImpl::DataTokenImpl():data_tok()
{}
Modified: store/trunk/cpp/lib/DataTokenImpl.h
===================================================================
--- store/trunk/cpp/lib/DataTokenImpl.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/DataTokenImpl.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,8 +28,8 @@
#include <boost/intrusive_ptr.hpp>
#include <qpid/broker/PersistableMessage.h>
-namespace rhm {
-namespace bdbstore {
+namespace mrg {
+namespace msgstore {
class DataTokenImpl : public journal::data_tok, public qpid::RefCounted
{
@@ -45,7 +45,7 @@
{ sourceMsg = msg; }
};
-} // namespace bdbstore
-} // namespace rhm
+} // namespace msgstore
+} // namespace mrg
#endif
Modified: store/trunk/cpp/lib/IdDbt.cpp
===================================================================
--- store/trunk/cpp/lib/IdDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/IdDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "IdDbt.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
IdDbt::IdDbt() : id(0)
{
Modified: store/trunk/cpp/lib/IdDbt.h
===================================================================
--- store/trunk/cpp/lib/IdDbt.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/IdDbt.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -26,8 +26,8 @@
#include "db-inc.h"
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class IdDbt : public Dbt
{
Modified: store/trunk/cpp/lib/IdPairDbt.cpp
===================================================================
--- store/trunk/cpp/lib/IdPairDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/IdPairDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "IdPairDbt.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
IdPairDbt::IdPairDbt() : message(&ids[0], sizeof(ids[0])), queue(&ids[1], sizeof(ids[1]))
{
Modified: store/trunk/cpp/lib/IdPairDbt.h
===================================================================
--- store/trunk/cpp/lib/IdPairDbt.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/IdPairDbt.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,8 +27,8 @@
#include "db-inc.h"
#include <qpid/framing/amqp_types.h>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class IdPairDbt : public Dbt
{
Modified: store/trunk/cpp/lib/IdSequence.cpp
===================================================================
--- store/trunk/cpp/lib/IdSequence.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/IdSequence.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "IdSequence.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using qpid::sys::Mutex;
IdSequence::IdSequence() : id(1) {}
Modified: store/trunk/cpp/lib/IdSequence.h
===================================================================
--- store/trunk/cpp/lib/IdSequence.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/IdSequence.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,8 +28,8 @@
#include <qpid/sys/Mutex.h>
#include <sys/types.h>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class IdSequence
{
Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/JournalImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -32,8 +32,8 @@
#include "qpid/sys/Monitor.h"
#include "StoreException.h"
-using namespace rhm::bdbstore;
-using namespace rhm::journal;
+using namespace mrg::msgstore;
+using namespace mrg::journal;
using qpid::management::ManagementAgent;
qpid::broker::Timer* JournalImpl::journalTimerPtr = 0;
@@ -157,7 +157,7 @@
const u_int32_t wcache_pgsize_sblks,
const journal::rd_aio_cb rd_cb,
const journal::wr_aio_cb wr_cb,
- boost::ptr_list<bdbstore::PreparedTransaction>* prep_tx_list_ptr,
+ boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr,
u_int64_t& highest_rid,
u_int64_t queue_id)
{
@@ -180,7 +180,7 @@
if (prep_tx_list_ptr) {
// Create list of prepared xids
std::vector<std::string> prep_xid_list;
- for (bdbstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) {
+ for (msgstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) {
prep_xid_list.push_back(i->xid);
}
@@ -194,7 +194,7 @@
// Populate PreparedTransaction lists from _tmap
if (prep_tx_list_ptr)
{
- for (bdbstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) {
+ for (msgstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) {
try {
txn_data_list tdl = _tmap.get_tdata_list(i->xid);
assert(tdl.size()); // should never be empty
@@ -489,16 +489,16 @@
writeActivityFlag = true;
switch (r)
{
- case rhm::journal::RHM_IORES_SUCCESS:
+ case mrg::journal::RHM_IORES_SUCCESS:
return;
- case rhm::journal::RHM_IORES_ENQCAPTHRESH:
+ case mrg::journal::RHM_IORES_ENQCAPTHRESH:
{
std::ostringstream oss;
oss << "Enqueue capacity threshold exceeded on queue \"" << _jid << "\".";
log(LOG_WARN, oss.str());
THROW_STORE_FULL_EXCEPTION(oss.str());
}
- case rhm::journal::RHM_IORES_FULL:
+ case mrg::journal::RHM_IORES_FULL:
{
std::ostringstream oss;
oss << "Journal full on queue \"" << _jid << "\".";
@@ -508,7 +508,7 @@
default:
{
std::ostringstream oss;
- oss << "Unexpected I/O response (" << rhm::journal::iores_str(r) << ") on queue " << _jid << "\".";
+ oss << "Unexpected I/O response (" << mrg::journal::iores_str(r) << ") on queue " << _jid << "\".";
log(LOG_ERROR, oss.str());
THROW_STORE_FULL_EXCEPTION(oss.str());
}
Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/JournalImpl.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -36,8 +36,8 @@
#include "qpid/management/Manageable.h"
#include "Journal.h"
-namespace rhm {
- namespace bdbstore {
+namespace mrg {
+ namespace msgstore {
class JournalImpl;
@@ -119,7 +119,7 @@
const u_int32_t wcache_pgsize_sblks,
const journal::rd_aio_cb rd_cb,
const journal::wr_aio_cb wr_cb,
- boost::ptr_list<bdbstore::PreparedTransaction>* prep_tx_list_ptr,
+ boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr,
u_int64_t& highest_rid,
u_int64_t queue_id);
@@ -127,7 +127,7 @@
const u_int32_t jfsize_sblks,
const u_int16_t wcache_num_pages,
const u_int32_t wcache_pgsize_sblks,
- boost::ptr_list<bdbstore::PreparedTransaction>* prep_tx_list_ptr,
+ boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr,
u_int64_t& highest_rid,
u_int64_t queue_id) {
recover(num_jfiles, jfsize_sblks, wcache_num_pages, wcache_pgsize_sblks, 0,
@@ -229,7 +229,7 @@
inline void read_reset() { _rmgr.invalidate(); }
};
- } // namespace bdbstore
-} // namespace rhm
+ } // namespace msgstore
+} // namespace mrg
#endif
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -33,7 +33,7 @@
#define MAX_AIO_SLEEPS 1000 // ~1 second
#define AIO_SLEEP_TIME 1000 // 1 milisecond
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using namespace qpid::broker;
using boost::static_pointer_cast;
using boost::intrusive_ptr;
@@ -767,12 +767,12 @@
try {
unsigned aio_sleep_cnt = 0;
while (read) {
- rhm::journal::iores res = jc->read_data_record(&dbuff, dbuffSize, &xidbuff, xidbuffSize, transientFlag, externalFlag, &dtok);
+ mrg::journal::iores res = jc->read_data_record(&dbuff, dbuffSize, &xidbuff, xidbuffSize, transientFlag, externalFlag, &dtok);
readSize = dtok.dsize();
switch (res)
{
- case rhm::journal::RHM_IORES_SUCCESS: {
+ case mrg::journal::RHM_IORES_SUCCESS: {
msg_count++;
RecoverableMessage::shared_ptr msg;
char* data = (char*)dbuff;
@@ -842,12 +842,12 @@
aio_sleep_cnt = 0;
break;
}
- case rhm::journal::RHM_IORES_PAGE_AIOWAIT:
+ case mrg::journal::RHM_IORES_PAGE_AIOWAIT:
if (++aio_sleep_cnt > MAX_AIO_SLEEPS)
THROW_STORE_EXCEPTION("Timeout waiting for AIO in MessageStoreImpl::recoverMessages()");
::usleep(AIO_SLEEP_TIME);
break;
- case rhm::journal::RHM_IORES_EMPTY:
+ case mrg::journal::RHM_IORES_EMPTY:
read = false;
break; // done with all messages. (add call in jrnl to test that _emap is empty.)
default:
@@ -946,7 +946,7 @@
dtok.reset();
dtok.set_wstate(DataTokenImpl::ENQ);
switch (tplStorePtr->read_data_record(&dbuff, dbuffSize, &xidbuff, xidbuffSize, transientFlag, externalFlag, &dtok)) {
- case rhm::journal::RHM_IORES_SUCCESS: {
+ case mrg::journal::RHM_IORES_SUCCESS: {
// Every TPL record contains both data and an XID
assert(dbuffSize>0);
assert(xidbuffSize>0);
@@ -980,12 +980,12 @@
aio_sleep_cnt = 0;
break;
}
- case rhm::journal::RHM_IORES_PAGE_AIOWAIT:
+ case mrg::journal::RHM_IORES_PAGE_AIOWAIT:
if (++aio_sleep_cnt > MAX_AIO_SLEEPS)
THROW_STORE_EXCEPTION("Timeout waiting for AIO in MessageStoreImpl::recoverTplStore()");
::usleep(AIO_SLEEP_TIME);
break;
- case rhm::journal::RHM_IORES_EMPTY:
+ case mrg::journal::RHM_IORES_EMPTY:
done = true;
break; // done with all messages. (add call in jrnl to test that _emap is empty.)
default:
@@ -1216,7 +1216,7 @@
JournalImpl* jc = static_cast<JournalImpl*>(queue.getExternalQueueStore());
if (jc) {
// TODO: check if this result should be used...
- /*rhm::journal::iores res =*/ jc->flush();
+ /*mrg::journal::iores res =*/ jc->flush();
}
} catch (const journal::jexception& e) {
THROW_STORE_EXCEPTION(std::string("Queue ") + qn + ": flush() failed: " + e.what() );
Modified: store/trunk/cpp/lib/MessageStoreImpl.h
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/MessageStoreImpl.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -45,8 +45,8 @@
#define DB_BUFFER_SMALL ENOMEM
#endif
-namespace rhm {
-namespace bdbstore {
+namespace mrg {
+namespace msgstore {
/**
* An implementation of the MessageStore interface based on Berkeley DB
@@ -342,7 +342,7 @@
{ return qpid::management::Manageable::STATUS_OK; }
}; // class MessageStoreImpl
-} // namespace bdbstore
-} // namespace rhm
+} // namespace msgstore
+} // namespace mrg
#endif
Modified: store/trunk/cpp/lib/PreparedTransaction.cpp
===================================================================
--- store/trunk/cpp/lib/PreparedTransaction.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/PreparedTransaction.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -24,7 +24,7 @@
#include "PreparedTransaction.h"
#include <algorithm>
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using std::string;
void LockedMappings::add(queue_id queue, message_id message)
Modified: store/trunk/cpp/lib/PreparedTransaction.h
===================================================================
--- store/trunk/cpp/lib/PreparedTransaction.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/PreparedTransaction.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -31,8 +31,8 @@
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_list.hpp>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
typedef uint64_t queue_id;
typedef uint64_t message_id;
Modified: store/trunk/cpp/lib/StoreException.h
===================================================================
--- store/trunk/cpp/lib/StoreException.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/StoreException.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,8 +27,8 @@
#include "IdDbt.h"
#include <boost/format.hpp>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class StoreException : public std::exception
{
Modified: store/trunk/cpp/lib/StorePlugin.cpp
===================================================================
--- store/trunk/cpp/lib/StorePlugin.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/StorePlugin.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -35,7 +35,7 @@
struct StorePlugin : public Plugin {
- rhm::bdbstore::MessageStoreImpl::Options options;
+ mrg::msgstore::MessageStoreImpl::Options options;
MessageStore *store;
Options* getOptions() { return &options; }
@@ -43,7 +43,7 @@
void earlyInitialize (Plugin::Target& target)
{
Broker* broker = dynamic_cast<Broker*>(&target);
- store = new rhm::bdbstore::MessageStoreImpl ();
+ store = new mrg::msgstore::MessageStoreImpl ();
DataDir& dataDir = broker->getDataDir ();
if (options.storeDir.empty ())
@@ -60,7 +60,7 @@
void initialize(Plugin::Target& target)
{
Broker* broker = dynamic_cast<Broker*>(&target);
- ((rhm::bdbstore::MessageStoreImpl*) store)->initManagement (broker);
+ ((mrg::msgstore::MessageStoreImpl*) store)->initManagement (broker);
}
};
Modified: store/trunk/cpp/lib/StringDbt.cpp
===================================================================
--- store/trunk/cpp/lib/StringDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/StringDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "StringDbt.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
StringDbt::StringDbt()
{
Modified: store/trunk/cpp/lib/StringDbt.h
===================================================================
--- store/trunk/cpp/lib/StringDbt.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/StringDbt.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,8 +28,8 @@
#include <qpid/broker/Persistable.h>
#include <qpid/framing/Buffer.h>
-namespace rhm{
-namespace bdbstore{
+namespace mrg{
+namespace msgstore{
class StringDbt : public Dbt
{
Modified: store/trunk/cpp/lib/TxnCtxt.h
===================================================================
--- store/trunk/cpp/lib/TxnCtxt.h 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/TxnCtxt.h 2008-09-10 19:43:56 UTC (rev 2438)
@@ -42,8 +42,8 @@
#include "qpid/sys/Mutex.h"
#include "StoreException.h"
-namespace rhm{
-namespace bdbstore{
+namespace mrg {
+namespace msgstore {
class TxnCtxt : public qpid::broker::TransactionContext
{
Modified: store/trunk/cpp/lib/jrnl/aio.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/aio.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/aio.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -1,11 +1,41 @@
+/**
+* \file aio.cpp
+*
+* Red Hat Messaging - Message Journal
+*
+* File containing code for class mrg::journal::aio (libaio interface
+* encapsulation). See comments in file aio.hpp for details.
+*
+* Copyright (C) 2007, 2008 Red Hat Inc.
+*
+* This file is part of Red Hat Messaging.
+*
+* Red Hat Messaging is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+* USA
+*
+* The GNU Lesser General Public License is available in the file COPYING.
+*/
+
#include "aio.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/aio.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/aio.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/aio.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -1,13 +1,42 @@
+/**
+* \file aio.hpp
+*
+* Red Hat Messaging - Message Journal
+*
+* This file contains an encapsulation of the libaio interface used
+* by the journal.
+*
+* Copyright 2007, 2008 Red Hat, Inc.
+*
+* This file is part of Red Hat Messaging.
+*
+* Red Hat Messaging is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+* USA
+*
+* The GNU Lesser General Public License is available in the file COPYING.
+*/
-#ifndef rhm_journal_aio_hpp
-#define rhm_journal_aio_hpp
+#ifndef mrg_journal_aio_hpp
+#define mrg_journal_aio_hpp
#include <libaio.h>
#include <cstring>
#include <sys/types.h>
#include <string.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -81,6 +110,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif
+#endif // ifndef mrg_journal_aio_hpp
Modified: store/trunk/cpp/lib/jrnl/aio_cb.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/aio_cb.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/aio_cb.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,13 +28,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_aio_cb_hpp
-#define rhm_journal_aio_cb_hpp
+#ifndef mrg_journal_aio_cb_hpp
+#define mrg_journal_aio_cb_hpp
#include <vector>
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -47,7 +47,7 @@
*/
typedef void (*wr_aio_cb)(jcntl* journal, std::vector<data_tok*>& dtokl);
typedef void (*rd_aio_cb)(jcntl* journal, std::vector<u_int16_t>& pil);
-}
-}
+} // namespace journal
+} // namespace mrg
-#endif
+#endif // ifndef mrg_journal_aio_cb_hpp
Modified: store/trunk/cpp/lib/jrnl/arr_cnt.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/arr_cnt.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/arr_cnt.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::arr_cnt (enqueue map). See
+* File containing code for class mrg::journal::arr_cnt (enqueue map). See
* comments in file arr_cnt.hpp for details.
*
* Copyright (C) 2007, 2008 Red Hat Inc.
@@ -32,7 +32,7 @@
#include <cassert>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -166,4 +166,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/arr_cnt.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/arr_cnt.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/arr_cnt.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::arr_cnt (array counter).
+* File containing code for class mrg::journal::arr_cnt (array counter).
* See class documentation for details.
*
* \author Kim van der Riet
@@ -30,12 +30,12 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_arr_cnt_hpp
-#define rhm_journal_arr_cnt_hpp
+#ifndef mrg_journal_arr_cnt_hpp
+#define mrg_journal_arr_cnt_hpp
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -72,6 +72,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_arr_cnt_hpp
+#endif // ifndef mrg_journal_arr_cnt_hpp
Modified: store/trunk/cpp/lib/jrnl/cvar.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/cvar.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/cvar.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::cvar (condition variable). See
+* File containing code for class mrg::journal::cvar (condition variable). See
* comments in file cvar.hpp for details.
*
* Copyright (C) 2007, 2008 Red Hat Inc.
Modified: store/trunk/cpp/lib/jrnl/cvar.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/cvar.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/cvar.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,8 +27,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_cvar_hpp
-#define rhm_journal_cvar_hpp
+#ifndef mrg_journal_cvar_hpp
+#define mrg_journal_cvar_hpp
#include <cstring>
#include "jrnl/jerrno.hpp"
@@ -37,7 +37,7 @@
#include <pthread.h>
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -80,7 +80,7 @@
}
};
-}
-}
+} // namespace journal
+} // namespace mrg
-#endif
+#endif // ifndef mrg_journal_cvar_hpp
Modified: store/trunk/cpp/lib/jrnl/data_tok.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/data_tok.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/data_tok.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::data_tok (data block token).
+* File containing code for class mrg::journal::data_tok (data block token).
* See comments in file data_tok.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -35,7 +35,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -192,4 +192,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/data_tok.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/data_tok.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/data_tok.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::data_tok (data block token).
+* File containing code for class mrg::journal::data_tok (data block token).
* See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_data_tok_hpp
-#define rhm_journal_data_tok_hpp
+#ifndef mrg_journal_data_tok_hpp
+#define mrg_journal_data_tok_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -47,7 +47,7 @@
#include <string>
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
@@ -166,6 +166,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_data_tok_hpp
+#endif // ifndef mrg_journal_data_tok_hpp
Modified: store/trunk/cpp/lib/jrnl/deq_hdr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::deq_hdr (dequeue record),
+* File containing code for class mrg::journal::deq_hdr (dequeue record),
* used to dequeue a previously enqueued record.
*
* \author Kim van der Riet
@@ -30,13 +30,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_deq_hdr_hpp
-#define rhm_journal_deq_hdr_hpp
+#ifndef mrg_journal_deq_hdr_hpp
+#define mrg_journal_deq_hdr_hpp
#include <cstddef>
#include "jrnl/rec_hdr.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -136,6 +136,6 @@
#pragma pack()
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_deq_hdr_hpp
+#endif // ifndef mrg_journal_deq_hdr_hpp
Modified: store/trunk/cpp/lib/jrnl/deq_rec.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/deq_rec.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/deq_rec.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::deq_rec (journal dequeue
+* This file contains the code for the mrg::journal::deq_rec (journal dequeue
* record) class. See comments in file deq_rec.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -39,7 +39,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -451,4 +451,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/deq_rec.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/deq_rec.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/deq_rec.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::deq_rec (journal dequeue
+* This file contains the code for the mrg::journal::deq_rec (journal dequeue
* record) class. See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_deq_rec_hpp
-#define rhm_journal_deq_rec_hpp
+#ifndef mrg_journal_deq_rec_hpp
+#define mrg_journal_deq_rec_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -45,7 +45,7 @@
#include "jrnl/deq_hdr.hpp"
#include "jrnl/jrec.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -98,6 +98,6 @@
}; // class deq_rec
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_deq_rec_hpp
+#endif // ifndef mrg_journal_deq_rec_hpp
Modified: store/trunk/cpp/lib/jrnl/enq_hdr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::enq_hdr (enueue header),
+* File containing code for class mrg::journal::enq_hdr (enueue header),
* used to start an enqueue record in the journal.
*
* \author Kim van der Riet
@@ -30,13 +30,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_enq_hdr_hpp
-#define rhm_journal_enq_hdr_hpp
+#ifndef mrg_journal_enq_hdr_hpp
+#define mrg_journal_enq_hdr_hpp
#include <cstddef>
#include "jrnl/rec_hdr.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -160,6 +160,6 @@
#pragma pack()
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_enq_hdr_hpp
+#endif // ifndef mrg_journal_enq_hdr_hpp
Modified: store/trunk/cpp/lib/jrnl/enq_map.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/enq_map.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/enq_map.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::enq_map (enqueue map). See
+* File containing code for class mrg::journal::enq_map (enqueue map). See
* comments in file enq_map.hpp for details.
*
* Copyright (C) 2007, 2008 Red Hat Inc.
@@ -36,7 +36,7 @@
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -209,4 +209,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/enq_map.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/enq_map.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/enq_map.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::enq_map (enqueue map).
+* File containing code for class mrg::journal::enq_map (enqueue map).
* See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_enq_map_hpp
-#define rhm_journal_enq_map_hpp
+#ifndef mrg_journal_enq_map_hpp
+#define mrg_journal_enq_map_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -47,7 +47,7 @@
#include <pthread.h>
#include <vector>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -107,6 +107,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_enq_map_hpp
+#endif // ifndef mrg_journal_enq_map_hpp
Modified: store/trunk/cpp/lib/jrnl/enq_rec.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/enq_rec.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/enq_rec.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::enq_rec (journal enqueue
+* This file contains the code for the mrg::journal::enq_rec (journal enqueue
* record) class. See comments in file enq_rec.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -39,7 +39,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -612,4 +612,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/enq_rec.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/enq_rec.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/enq_rec.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::enq_rec (journal enqueue
+* This file contains the code for the mrg::journal::enq_rec (journal enqueue
* record) class. See class documentation for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -28,10 +28,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_enq_rec_hpp
-#define rhm_journal_enq_rec_hpp
+#ifndef mrg_journal_enq_rec_hpp
+#define mrg_journal_enq_rec_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -43,7 +43,7 @@
#include "jrnl/enq_hdr.hpp"
#include "jrnl/jrec.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -111,6 +111,6 @@
}; // class enq_rec
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_enq_rec_hpp
+#endif // ifndef mrg_journal_enq_rec_hpp
Modified: store/trunk/cpp/lib/jrnl/enums.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/enums.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/enums.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing definitions for namespace rhm::journal enums.
+* File containing definitions for namespace mrg::journal enums.
*
* \author Kim van der Riet
*
@@ -29,10 +29,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_enums_hpp
-#define rhm_journal_enums_hpp
+#ifndef mrg_journal_enums_hpp
+#define mrg_journal_enums_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -103,6 +103,6 @@
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_enums_hpp
+#endif // ifndef mrg_journal_enums_hpp
Modified: store/trunk/cpp/lib/jrnl/fcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/fcntl.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/fcntl.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::fcntl (non-logging file
+* File containing code for class mrg::journal::fcntl (non-logging file
* handle), used for controlling journal log files. See comments in file
* fcntl.hpp for details.
*
@@ -40,7 +40,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -406,4 +406,4 @@
std::string fcntl::_pool_dir;
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/fcntl.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/fcntl.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/fcntl.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::fcntl (non-logging file
+* File containing code for class mrg::journal::fcntl (non-logging file
* handle), used for controlling journal log files. See class documentation for
* details.
*
@@ -29,10 +29,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_fcntl_hpp
-#define rhm_journal_fcntl_hpp
+#ifndef mrg_journal_fcntl_hpp
+#define mrg_journal_fcntl_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -45,7 +45,7 @@
#include "jrnl/rcvdat.hpp"
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -155,6 +155,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_fcntl_hpp
+#endif // ifndef mrg_journal_fcntl_hpp
Modified: store/trunk/cpp/lib/jrnl/file_hdr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/file_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/file_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::file_hdr (file
+* File containing code for class mrg::journal::file_hdr (file
* record header), used to start a journal file. It contains some
* file metadata and information to aid journal recovery.
*
@@ -31,8 +31,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_file_hdr_hpp
-#define rhm_journal_file_hdr_hpp
+#ifndef mrg_journal_file_hdr_hpp
+#define mrg_journal_file_hdr_hpp
#include <cerrno>
#include <ctime>
@@ -41,7 +41,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -203,6 +203,6 @@
#pragma pack()
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_file_hdr_hpp
+#endif // ifndef mrg_journal_file_hdr_hpp
Modified: store/trunk/cpp/lib/jrnl/jcfg.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcfg.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jcfg.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -30,8 +30,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jcfg_hpp
-#define rhm_journal_jcfg_hpp
+#ifndef mrg_journal_jcfg_hpp
+#define mrg_journal_jcfg_hpp
#if defined(__i386__) /* little endian, 32 bits */
#define JRNL_LITTLE_ENDIAN
@@ -88,4 +88,4 @@
#define RHM_LENDIAN_FLAG 0 ///< Value of little endian flag on disk
#define RHM_BENDIAN_FLAG 1 ///< Value of big endian flag on disk
-#endif // ifndef rhm_journal_jcfg_hpp
+#endif // ifndef mrg_journal_jcfg_hpp
Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcntl.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -4,7 +4,7 @@
* Red Hat Messaging - Message Journal
*
* Messaging journal top-level control and interface class
-* rhm::journal::jcntl. See comments in file jcntl.hpp for details.
+* mrg::journal::jcntl. See comments in file jcntl.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
*
@@ -47,7 +47,7 @@
#include <sstream>
#include <unistd.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -977,4 +977,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/jcntl.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcntl.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jcntl.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -4,7 +4,7 @@
* Red Hat Messaging - Message Journal
*
* Messaging journal top-level control and interface class
-* rhm::journal::jcntl. See class documentation for details.
+* mrg::journal::jcntl. See class documentation for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
*
@@ -28,10 +28,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jcntl_hpp
-#define rhm_journal_jcntl_hpp
+#ifndef mrg_journal_jcntl_hpp
+#define mrg_journal_jcntl_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -48,7 +48,7 @@
#include "jrnl/wmgr.hpp"
#include "jrnl/wrfc.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -681,6 +681,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_jcntl_hpp
+#endif // ifndef mrg_journal_jcntl_hpp
Modified: store/trunk/cpp/lib/jrnl/jdir.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jdir.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jdir.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::jdir (journal data
+* File containing code for class mrg::journal::jdir (journal data
* directory), used for controlling and manipulating journal data
* direcories and files. See comments in file jdir.hpp for details.
*
@@ -42,7 +42,7 @@
#include <sstream>
#include <sys/stat.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -426,4 +426,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/jdir.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jdir.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jdir.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::jdir (journal data
+* File containing code for class mrg::journal::jdir (journal data
* directory), used for controlling and manipulating journal data
* directories and files. See class documentation for details.
*
@@ -31,10 +31,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jdir_hpp
-#define rhm_journal_jdir_hpp
+#ifndef mrg_journal_jdir_hpp
+#define mrg_journal_jdir_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -44,7 +44,7 @@
#include "jrnl/jinf.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -319,6 +319,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_jdir_hpp
+#endif // ifndef mrg_journal_jdir_hpp
Modified: store/trunk/cpp/lib/jrnl/jerrno.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jerrno.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jerrno.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::jerrno (journal error
+* File containing code for class mrg::journal::jerrno (journal error
* codes). See comments in file jerrno.hpp for details.
*
* See file jerrno.hpp for class details.
@@ -34,7 +34,7 @@
#include "jrnl/jerrno.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -234,4 +234,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/jerrno.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jerrno.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jerrno.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::jerrno (journal error
+* File containing code for class mrg::journal::jerrno (journal error
* codes). See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jerrno_hpp
-#define rhm_journal_jerrno_hpp
+#ifndef mrg_journal_jerrno_hpp
+#define mrg_journal_jerrno_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -45,7 +45,7 @@
#include <string>
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -149,6 +149,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_jerrno_hpp
+#endif // ifndef mrg_journal_jerrno_hpp
Modified: store/trunk/cpp/lib/jrnl/jexception.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jexception.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jexception.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* Generic journal exception class rhm::journal::jexception. See comments
+* Generic journal exception class mrg::journal::jexception. See comments
* in file jexception.hpp for details.
*
* \author Kim van der Riet
@@ -38,7 +38,7 @@
#define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -180,4 +180,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/jexception.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jexception.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jexception.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* Generic journal exception class rhm::journal::jexception (derived
+* Generic journal exception class mrg::journal::jexception (derived
* from class std::exception). Intended to serve as a common exception
* class for all more speicalized exceptions in the message journal. See
* class documentation for details.
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jrnl_exception_hpp
-#define rhm_journal_jrnl_exception_hpp
+#ifndef mrg_journal_jrnl_exception_hpp
+#define mrg_journal_jrnl_exception_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -62,7 +62,7 @@
throw jexception(jerrno::JERR__PTHREAD, oss.str(), cls, fn); \
}
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -114,6 +114,6 @@
}; // class jexception
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_jrnl_exception_hpp
+#endif // ifndef mrg_journal_jrnl_exception_hpp
Modified: store/trunk/cpp/lib/jrnl/jinf.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jinf.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jinf.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::jinf class.
+* This file contains the code for the mrg::journal::jinf class.
*
* See jinf.hpp comments for details of this class.
*
@@ -40,7 +40,7 @@
#include "jrnl/jerrno.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -378,4 +378,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/jinf.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jinf.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jinf.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::jinf class.
+* This file contains the code for the mrg::journal::jinf class.
*
* \author Kim van der Riet
*
@@ -29,14 +29,14 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jinf_hpp
-#define rhm_journal_jinf_hpp
+#ifndef mrg_journal_jinf_hpp
+#define mrg_journal_jinf_hpp
#include <ctime>
#include <string>
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -113,6 +113,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_jinf_hpp
+#endif // ifndef mrg_journal_jinf_hpp
Modified: store/trunk/cpp/lib/jrnl/jrec.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jrec.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jrec.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing source code for class rhm::journal::jrec (abstract journal
+* File containing source code for class mrg::journal::jrec (abstract journal
* jrecord). See comments in file jrec.hpp for details.
*
* \author Kim van der Riet
@@ -37,7 +37,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -116,4 +116,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/jrec.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jrec.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/jrec.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing source code for class rhm::journal::jrec (abstract journal
+* File containing source code for class mrg::journal::jrec (abstract journal
* jrecord). See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_jrec_hpp
-#define rhm_journal_jrec_hpp
+#ifndef mrg_journal_jrec_hpp
+#define mrg_journal_jrec_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -48,7 +48,7 @@
#include <string>
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -177,6 +177,6 @@
}; // class jrec
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_jrec_hpp
+#endif // ifndef mrg_journal_jrec_hpp
Modified: store/trunk/cpp/lib/jrnl/pmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/pmgr.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/pmgr.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::pmgr (page manager). See
+* File containing code for class mrg::journal::pmgr (page manager). See
* comments in file pmgr.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -39,7 +39,7 @@
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -208,4 +208,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/pmgr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/pmgr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/pmgr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::pmgr (page manager). See
+* File containing code for class mrg::journal::pmgr (page manager). See
* class documentation for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -28,10 +28,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_pmgr_hpp
-#define rhm_journal_pmgr_hpp
+#ifndef mrg_journal_pmgr_hpp
+#define mrg_journal_pmgr_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -50,7 +50,7 @@
#include "jrnl/txn_map.hpp"
#include "jrnl/txn_rec.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -133,6 +133,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_pmgr_hpp
+#endif // ifndef mrg_journal_pmgr_hpp
Modified: store/trunk/cpp/lib/jrnl/rcvdat.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rcvdat.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rcvdat.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -29,8 +29,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_rcvdat_hpp
-#define rhm_journal_rcvdat_hpp
+#ifndef mrg_journal_rcvdat_hpp
+#define mrg_journal_rcvdat_hpp
#include <cstddef>
#include <iomanip>
@@ -40,7 +40,7 @@
#include "jrnl/jcfg.hpp"
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -133,7 +133,7 @@
return oss.str();
}
};
-}
-}
+} // namespace journal
+} // namespace mrg
-#endif
+#endif // ifndef mrg_journal_rcvdat_hpp
Modified: store/trunk/cpp/lib/jrnl/rec_hdr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rec_hdr (record header),
+* File containing code for class mrg::journal::rec_hdr (record header),
* which is a common initial header used for all journal record structures
* except the record tail (rec_tail).
*
@@ -31,14 +31,14 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_rec_hdr_hpp
-#define rhm_journal_rec_hdr_hpp
+#ifndef mrg_journal_rec_hdr_hpp
+#define mrg_journal_rec_hdr_hpp
#include <cstddef>
#include "jrnl/jcfg.hpp"
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -138,6 +138,6 @@
#pragma pack()
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_rec_hdr_hpp
+#endif // ifndef mrg_journal_rec_hdr_hpp
Modified: store/trunk/cpp/lib/jrnl/rec_tail.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rec_tail.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rec_tail.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rec_tail (record tail), used to
+* File containing code for class mrg::journal::rec_tail (record tail), used to
* finalize a persistent record. The presence of a valid tail at the expected
* position in the journal file indicates that the record write was completed.
*
@@ -31,13 +31,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_rec_tail_hpp
-#define rhm_journal_rec_tail_hpp
+#ifndef mrg_journal_rec_tail_hpp
+#define mrg_journal_rec_tail_hpp
#include <cstddef>
#include "jrnl/jcfg.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -93,6 +93,6 @@
#pragma pack()
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_rec_tail_hpp
+#endif // ifndef mrg_journal_rec_tail_hpp
Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rmgr (read manager). See
+* File containing code for class mrg::journal::rmgr (read manager). See
* comments in file rmgr.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -37,7 +37,7 @@
#include "jrnl/jerrno.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -801,4 +801,4 @@
*/
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/rmgr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rmgr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rmgr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rmgr (read manager). See
+* File containing code for class mrg::journal::rmgr (read manager). See
* class documentation for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -28,10 +28,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_rmgr_hpp
-#define rhm_journal_rmgr_hpp
+#ifndef mrg_journal_rmgr_hpp
+#define mrg_journal_rmgr_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -47,7 +47,7 @@
#include "jrnl/rec_hdr.hpp"
#include "jrnl/rrfc.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -110,6 +110,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_rmgr_hpp
+#endif // ifndef mrg_journal_rmgr_hpp
Modified: store/trunk/cpp/lib/jrnl/rrfc.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rrfc.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rrfc.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rrfc (rotating
+* File containing code for class mrg::journal::rrfc (rotating
* file controller). See comments in file rrfc.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -35,7 +35,7 @@
#include "jrnl/jerrno.hpp"
#include "jrnl/jexception.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -107,4 +107,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/rrfc.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rrfc.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/rrfc.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rrfc (rotating
+* File containing code for class mrg::journal::rrfc (rotating
* file controller). See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_rrfc_hpp
-#define rhm_journal_rrfc_hpp
+#ifndef mrg_journal_rrfc_hpp
+#define mrg_journal_rrfc_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -44,7 +44,7 @@
#include <cstddef>
#include "jrnl/fcntl.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -141,6 +141,6 @@
}; // class rrfc
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_rrfc_hpp
+#endif // ifndef mrg_journal_rrfc_hpp
Modified: store/trunk/cpp/lib/jrnl/slock.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/slock.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/slock.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::slock (scoped lock). See
+* File containing code for class mrg::journal::slock (scoped lock). See
* comments in file slock.hpp for details.
*
* Copyright (C) 2007, 2008 Red Hat Inc.
Modified: store/trunk/cpp/lib/jrnl/slock.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/slock.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/slock.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,8 +3,8 @@
*
* Red Hat Messaging - Message Journal
*
-* Messaging journal scoped lock class rhm::journal::slock and scoped try-lock
-* class rhm::journal::stlock.
+* Messaging journal scoped lock class mrg::journal::slock and scoped try-lock
+* class mrg::journal::stlock.
*
* Copyright 2007, 2008 Red Hat, Inc.
*
@@ -28,8 +28,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_slock_hpp
-#define rhm_journal_slock_hpp
+#ifndef mrg_journal_slock_hpp
+#define mrg_journal_slock_hpp
#include <cerrno>
#include <cstring>
@@ -38,7 +38,7 @@
#include <pthread.h>
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -83,6 +83,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_slock_hpp
+#endif // ifndef mrg_journal_slock_hpp
Modified: store/trunk/cpp/lib/jrnl/time_ns.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/time_ns.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/time_ns.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,7 +27,7 @@
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -44,5 +44,5 @@
}
-} // namespace jtt
-} // namespace rhm
+} // namespace journal
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/time_ns.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/time_ns.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/time_ns.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -22,14 +22,14 @@
*
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_time_ns_hpp
-#define rhm_jtt_time_ns_hpp
+#ifndef mrg_jtt_time_ns_hpp
+#define mrg_jtt_time_ns_hpp
#include <cerrno>
#include <ctime>
#include <string>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -91,7 +91,7 @@
{ if(tv_sec == rhs.tv_sec) return tv_nsec <= rhs.tv_nsec; return tv_sec <= rhs.tv_sec; }
};
-} // namespace jtt
-} // namespace rhm
+} // namespace journal
+} // namespace mrg
-#endif // ifndef rhm_jtt_time_ns_hpp
+#endif // ifndef mrg_jtt_time_ns_hpp
Modified: store/trunk/cpp/lib/jrnl/txn_hdr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::txn_hdr (transaction
+* File containing code for class mrg::journal::txn_hdr (transaction
* record header), used to start a transaction (commit or abort) record.
*
* \author Kim van der Riet
@@ -30,13 +30,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_txn_hdr_hpp
-#define rhm_journal_txn_hdr_hpp
+#ifndef mrg_journal_txn_hdr_hpp
+#define mrg_journal_txn_hdr_hpp
#include <cstddef>
#include "jrnl/rec_hdr.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -120,6 +120,6 @@
#pragma pack()
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_txn_hdr_hpp
+#endif // ifndef mrg_journal_txn_hdr_hpp
Modified: store/trunk/cpp/lib/jrnl/txn_map.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_map.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/txn_map.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::txn_map (transaction map). See
+* File containing code for class mrg::journal::txn_map (transaction map). See
* comments in file txn_map.hpp for details.
*
* Copyright (C) 2007, 2008 Red Hat Inc.
@@ -36,7 +36,7 @@
#include "jrnl/slock.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -280,4 +280,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/txn_map.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::txn_map (transaction map).
+* File containing code for class mrg::journal::txn_map (transaction map).
* See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_txn_map_hpp
-#define rhm_journal_txn_map_hpp
+#ifndef mrg_journal_txn_map_hpp
+#define mrg_journal_txn_map_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -48,7 +48,7 @@
#include <sys/types.h>
#include <vector>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -150,6 +150,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_txn_map_hpp
+#endif // ifndef mrg_journal_txn_map_hpp
Modified: store/trunk/cpp/lib/jrnl/txn_rec.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_rec.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/txn_rec.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::txn_rec (journal dequeue
+* This file contains the code for the mrg::journal::txn_rec (journal dequeue
* record) class. See comments in file txn_rec.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -39,7 +39,7 @@
#include "jrnl/jexception.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -439,4 +439,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/txn_rec.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_rec.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/txn_rec.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* This file contains the code for the rhm::journal::txn_rec (journal data
+* This file contains the code for the mrg::journal::txn_rec (journal data
* record) class. See class documentation for details.
*
* \author Kim van der Riet
@@ -30,10 +30,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_txn_rec_hpp
-#define rhm_journal_txn_rec_hpp
+#ifndef mrg_journal_txn_rec_hpp
+#define mrg_journal_txn_rec_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -45,7 +45,7 @@
#include "jrnl/jrec.hpp"
#include "jrnl/txn_hdr.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -95,6 +95,6 @@
}; // class txn_rec
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_txn_rec_hpp
+#endif // ifndef mrg_journal_txn_rec_hpp
Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wmgr.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::wmgr (read manager). See
+* File containing code for class mrg::journal::wmgr (read manager). See
* comments in file wmgr.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -39,7 +39,7 @@
#include "jrnl/jerrno.hpp"
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -1123,4 +1123,4 @@
const char* wmgr::_op_str[] = {"enqueue", "dequeue", "abort", "commit"};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/wmgr.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wmgr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/wmgr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::wmgr (read manager). See
+* File containing code for class mrg::journal::wmgr (read manager). See
* class documentation for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -28,10 +28,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_wmgr_hpp
-#define rhm_journal_wmgr_hpp
+#ifndef mrg_journal_wmgr_hpp
+#define mrg_journal_wmgr_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -46,7 +46,7 @@
#include "jrnl/wrfc.hpp"
#include <set>
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -139,6 +139,6 @@
};
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_wmgr_hpp
+#endif // ifndef mrg_journal_wmgr_hpp
Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::rrfc (rotating
+* File containing code for class mrg::journal::rrfc (rotating
* file controller). See comments in file rrfc.hpp for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -34,7 +34,7 @@
#include "jrnl/jerrno.hpp"
#include "jrnl/jexception.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -185,4 +185,4 @@
}
} // namespace journal
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/lib/jrnl/wrfc.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wrfc.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/lib/jrnl/wrfc.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -3,7 +3,7 @@
*
* Red Hat Messaging - Message Journal
*
-* File containing code for class rhm::journal::wrfc (write rotating
+* File containing code for class mrg::journal::wrfc (write rotating
* file controller). See class documentation for details.
*
* Copyright 2007, 2008 Red Hat, Inc.
@@ -28,10 +28,10 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_journal_rfc_hpp
-#define rhm_journal_rfc_hpp
+#ifndef mrg_journal_rfc_hpp
+#define mrg_journal_rfc_hpp
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -43,7 +43,7 @@
#include "jrnl/enums.hpp"
#include "jrnl/rrfc.hpp"
-namespace rhm
+namespace mrg
{
namespace journal
{
@@ -131,6 +131,6 @@
}; // class wrfc
} // namespace journal
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_journal_rfc_hpp
+#endif // ifndef mrg_journal_rfc_hpp
Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/OrderingTest.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -36,7 +36,7 @@
using namespace qpid::broker;
using namespace qpid::framing;
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
QPID_AUTO_TEST_SUITE(OrderingTest)
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -40,7 +40,7 @@
using namespace qpid;
using namespace qpid::broker;
using namespace qpid::framing;
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using namespace std;
QPID_AUTO_TEST_SUITE(SimpleTest)
Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/TransactionalTest.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -35,7 +35,7 @@
#include "qpid/framing/AMQHeaderBody.h"
#include "qpid/log/Statement.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using namespace qpid::broker;
using namespace qpid::framing;
using namespace std;
Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -36,7 +36,7 @@
#include "qpid/log/Statement.h"
#include "TxnCtxt.h"
-using namespace rhm::bdbstore;
+using namespace mrg::msgstore;
using namespace qpid::broker;
using namespace qpid::framing;
using namespace std;
Modified: store/trunk/cpp/tests/jrnl/_st_basic.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -34,7 +34,7 @@
#include "jrnl/jcfg.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(journal_basic)
Modified: store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -34,7 +34,7 @@
#include "jrnl/jcfg.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(journal_basic_txn)
Modified: store/trunk/cpp/tests/jrnl/_st_read.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -35,7 +35,7 @@
#include "jrnl/jcfg.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(journal_read)
Modified: store/trunk/cpp/tests/jrnl/_st_read_txn.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -35,7 +35,7 @@
#include "jrnl/jcfg.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(journal_read_txn)
Modified: store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -33,10 +33,10 @@
#include "jrnl/arr_cnt.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
-QPID_AUTO_TEST_SUITE(eng_map_suite)
+QPID_AUTO_TEST_SUITE(arr_cnt_suite)
const string test_filename("_ut_arr_cnt");
Modified: store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -34,10 +34,10 @@
#include "jrnl/jerrno.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
-QPID_AUTO_TEST_SUITE(eng_map_suite)
+QPID_AUTO_TEST_SUITE(enq_map_suite)
const string test_filename("_ut_enq_map");
Modified: store/trunk/cpp/tests/jrnl/_ut_jdir.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -49,7 +49,7 @@
#define NUM_CLEAR_OPS 20
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(jdir_suite)
Modified: store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -34,11 +34,11 @@
#include "jrnl/jerrno.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(jerrno_suite)
-using namespace rhm::journal;
+using namespace mrg::journal;
const string test_filename("_ut_jerrno");
Modified: store/trunk/cpp/tests/jrnl/_ut_jexception.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -35,7 +35,7 @@
#include "jrnl/jexception.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(jexception_suite)
Modified: store/trunk/cpp/tests/jrnl/_ut_jinf.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -44,7 +44,7 @@
#define JFSIZE_SBLKS 128
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(jinf_suite)
Modified: store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -39,7 +39,7 @@
#include "jrnl/txn_hdr.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(rec_hdr_suite)
Modified: store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,10 +28,10 @@
#include "jrnl/time_ns.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
-QPID_AUTO_TEST_SUITE(jtt_time_ns)
+QPID_AUTO_TEST_SUITE(time_ns_suite)
const string test_filename("_ut_time_ns");
Modified: store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -35,7 +35,7 @@
#include <sstream>
using namespace boost::unit_test;
-using namespace rhm::journal;
+using namespace mrg::journal;
using namespace std;
QPID_AUTO_TEST_SUITE(txn_map_suite)
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,7 +28,7 @@
#include <iostream>
using namespace boost::unit_test;
-using namespace rhm::jtt;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_data_src)
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -26,7 +26,7 @@
#include <iostream>
using namespace boost::unit_test;
-using namespace rhm::jtt;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_jrnl_init_params)
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -30,8 +30,8 @@
#include "jrnl/jerrno.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
-using namespace rhm::jtt;
+using namespace mrg::journal;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_jrnl_instance)
@@ -50,7 +50,7 @@
const u_int32_t jfsize_sblks = 128;
args a("a1");
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
test_case::shared_ptr p(new test_case(1, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET,
test_case::JDL_INTERNAL, "t1"));
jrnl_instance ji(jid, jdir, bfn, num_jfiles, jfsize_sblks);
@@ -73,7 +73,7 @@
const u_int32_t jfsize_sblks = 128;
args a("a2");
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
test_case::shared_ptr p(new test_case(2, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET,
test_case::JDL_INTERNAL, "t2"));
jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles,
@@ -98,7 +98,7 @@
const u_int32_t jfsize_sblks = 128;
args a("a3");
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
test_case::shared_ptr p(new test_case(3, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET,
test_case::JDL_INTERNAL, "t3"));
jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles,
@@ -123,7 +123,7 @@
const u_int32_t jfsize_sblks = 128;
args a("a4");
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
test_case::shared_ptr p(new test_case(5, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET,
test_case::JDL_INTERNAL, "t5"));
jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles,
@@ -155,7 +155,7 @@
args a("a5");
a.recover_mode = true;
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
test_case::shared_ptr p(new test_case(6, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET,
test_case::JDL_INTERNAL, "t6"));
jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles,
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,7 +28,7 @@
#include <boost/program_options.hpp>
namespace po = boost::program_options;
-using namespace rhm::jtt;
+using namespace mrg::jtt;
using namespace boost::unit_test;
using namespace std;
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -29,7 +29,7 @@
#include "test_case_result.hpp"
using namespace boost::unit_test;
-using namespace rhm::jtt;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_test_case)
@@ -46,7 +46,7 @@
const bool auto_deq = true;
const std::size_t min_xid_size = 0x200;
const std::size_t max_xid_size = 0x200;
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
const test_case::transient_t transient = test_case::JTT_PERSISTNET;
const test_case::external_t external = test_case::JDL_INTERNAL;
const string comment = "This is a test";
@@ -76,7 +76,7 @@
const bool auto_deq = true;
const std::size_t min_xid_size = 0x200;
const std::size_t max_xid_size = 0x200;
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
const test_case::transient_t transient = test_case::JTT_PERSISTNET;
const test_case::external_t external = test_case::JDL_INTERNAL;
const string comment = "This is a test";
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,8 +28,8 @@
#include "test_case_result.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
-using namespace rhm::jtt;
+using namespace mrg::journal;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_test_case_result)
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,8 +27,8 @@
#include "test_case_result_agregation.hpp"
using namespace boost::unit_test;
-using namespace rhm::journal;
-using namespace rhm::jtt;
+using namespace mrg::journal;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_test_case_result_agregation)
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -29,7 +29,7 @@
#include "test_case_set.hpp"
using namespace boost::unit_test;
-using namespace rhm::jtt;
+using namespace mrg::jtt;
using namespace std;
QPID_AUTO_TEST_SUITE(jtt_test_case_set)
@@ -70,7 +70,7 @@
const bool auto_deq = true;
const std::size_t min_xid_size = 0x200;
const std::size_t max_xid_size = 0x200;
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
const test_case::transient_t transient = test_case::JTT_PERSISTNET;
const test_case::external_t external = test_case::JDL_INTERNAL;
const string comment = "This is a test";
@@ -103,7 +103,7 @@
const bool auto_deq = true;
const std::size_t min_xid_size = 0x200;
const std::size_t max_xid_size = 0x200;
- using rhm::jtt::test_case;
+ using mrg::jtt::test_case;
const test_case::transient_t transient = test_case::JTT_PERSISTNET;
const test_case::external_t external = test_case::JDL_INTERNAL;
const string comment = "This is a test";
Modified: store/trunk/cpp/tests/jrnl/jtt/args.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/args.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/args.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -28,7 +28,7 @@
namespace po = boost::program_options;
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -225,4 +225,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/args.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/args.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/args.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,13 +21,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_args_hpp
-#define rhm_jtt_args_hpp
+#ifndef mrg_jtt_args_hpp
+#define mrg_jtt_args_hpp
#include <boost/program_options.hpp>
#include "read_arg.hpp"
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -63,6 +63,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_args_hpp
+#endif // ifndef mrg_jtt_args_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,7 +27,7 @@
#include <iomanip>
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -85,5 +85,5 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,8 +21,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_data_src_hpp
-#define rhm_jtt_data_src_hpp
+#ifndef mrg_jtt_data_src_hpp
+#define mrg_jtt_data_src_hpp
#include <cstddef>
#include "jrnl/slock.hpp"
@@ -33,7 +33,7 @@
#define DATA_SIZE 1024 * 1024
#define XID_SIZE 1024 * 1024
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -65,12 +65,12 @@
private:
data_src();
- static u_int64_t get_xid_cnt() { rhm::journal::slock s(_m.m()); return _xid_cnt++; }
+ static u_int64_t get_xid_cnt() { mrg::journal::slock s(_m.m()); return _xid_cnt++; }
static const char* get_xid_content(const std::size_t offs);
static bool __init();
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_data_src_hpp
+#endif // ifndef mrg_jtt_data_src_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -23,7 +23,7 @@
#include "jrnl_init_params.hpp"
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -69,4 +69,4 @@
const u_int32_t jrnl_init_params::def_wcache_pgsize_sblks = 64;
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,14 +21,14 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_jrnl_init_params_hpp
-#define rhm_jtt_jrnl_init_params_hpp
+#ifndef mrg_jtt_jrnl_init_params_hpp
+#define mrg_jtt_jrnl_init_params_hpp
#include <boost/shared_ptr.hpp>
#include <string>
#include <sys/types.h>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -71,6 +71,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_jrnl_init_params_hpp
+#endif // ifndef mrg_jtt_jrnl_init_params_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -33,7 +33,7 @@
#define MAX_RD_WAIT 100 // in ms
#define MAX_ENQCAPTHRESH_CNT 1000 // 10s if MAX_WR_WAIT is 10 ms
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -41,7 +41,7 @@
jrnl_instance::jrnl_instance(const std::string& jid, const std::string& jdir,
const std::string& base_filename, const u_int16_t num_jfiles, const u_int32_t jfsize_sblks,
const u_int16_t wcache_num_pages, const u_int32_t wcache_pgsize_sblks):
- rhm::journal::jcntl(jid, jdir, base_filename),
+ mrg::journal::jcntl(jid, jdir, base_filename),
_jpp(new jrnl_init_params(jid, jdir, base_filename, num_jfiles, jfsize_sblks,
wcache_num_pages, wcache_pgsize_sblks)),
_args_ptr(0),
@@ -63,7 +63,7 @@
}
jrnl_instance::jrnl_instance(const jrnl_init_params::shared_ptr& p):
- rhm::journal::jcntl(p->jid(), p->jdir(), p->base_filename()),
+ mrg::journal::jcntl(p->jid(), p->jdir(), p->base_filename()),
_jpp(p),
_args_ptr(0),
_dtok_master_enq_list(),
@@ -116,9 +116,9 @@
0, highest_rid);
recover_complete();
}
- catch (const rhm::journal::jexception& e)
+ catch (const mrg::journal::jexception& e)
{
- if (e.err_code() == rhm::journal::jerrno::JERR_JDIR_STAT)
+ if (e.err_code() == mrg::journal::jerrno::JERR_JDIR_STAT)
initialize(_jpp->num_jfiles(), _jpp->jfsize_sblks(), _jpp->wcache_num_pages(),
_jpp->wcache_pgsize_sblks(), aio_rd_callback, aio_wr_callback);
else
@@ -129,7 +129,7 @@
initialize(_jpp->num_jfiles(), _jpp->jfsize_sblks(), _jpp->wcache_num_pages(),
_jpp->wcache_pgsize_sblks(), aio_rd_callback, aio_wr_callback);
}
- catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); }
+ catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); }
catch (const std::exception& e) { _tcrp->add_exception(e.what()); }
catch (...) { _tcrp->add_exception("Unknown exception"); }
}
@@ -154,7 +154,7 @@
stop(true);
_tcrp->set_stop_time();
}
- catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
+ catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); }
catch (...) { _tcrp->add_exception("Unknown exception"); panic(); }
_tcrp->set_stop_time();
@@ -169,7 +169,7 @@
unsigned sleep_cnt = 0U;
while(_tcrp->num_enq() < _tcp->num_msgs() && !_tcrp->exception())
{
- dtok_ptr p(new rhm::journal::data_tok);
+ dtok_ptr p(new mrg::journal::data_tok);
_dtok_master_enq_list.push_back(p);
const char* msgp = data_src::get_data(_tcrp->num_enq() % 10);
const std::size_t msg_size = _tcp->this_data_size();
@@ -177,7 +177,7 @@
const std::string xid(data_src::get_xid(xid_size));
const bool external = _tcp->this_external();
const bool transient = _tcp->this_transience();
- rhm::journal::iores res;
+ mrg::journal::iores res;
if (xid_size)
{
if (external)
@@ -195,13 +195,13 @@
}
switch (res)
{
- case rhm::journal::RHM_IORES_SUCCESS:
+ case mrg::journal::RHM_IORES_SUCCESS:
sleep_cnt = 0U;
_tcrp->incr_num_enq();
if (p->has_xid() && !_tcp->auto_deq())
commit(p.get());
break;
- case rhm::journal::RHM_IORES_ENQCAPTHRESH:
+ case mrg::journal::RHM_IORES_ENQCAPTHRESH:
if (++sleep_cnt > MAX_ENQCAPTHRESH_CNT)
{
_tcrp->add_exception("Timeout waiting for RHM_IORES_ENQCAPTHRESH to clear.");
@@ -209,20 +209,20 @@
}
else if (get_wr_events() == 0)
{
- rhm::journal::slock sl(&_wr_full_mutex);
+ mrg::journal::slock sl(&_wr_full_mutex);
_wr_full_cv.waitintvl(MAX_WR_WAIT * 1000000); // MAX_WR_WAIT in ms
}
break;
default:
std::ostringstream oss;
oss << "ERROR: enqueue operation in journal \"" << _jid << "\" returned ";
- oss << rhm::journal::iores_str(res) << ".";
+ oss << mrg::journal::iores_str(res) << ".";
_tcrp->add_exception(oss.str());
}
}
flush(true);
}
- catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
+ catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); }
catch (...) { _tcrp->add_exception("Unknown exception"); panic(); }
}
@@ -239,7 +239,7 @@
{
journal::data_tok* dtokp = 0;
{
- rhm::journal::slock sl(&_rd_list_mutex);
+ mrg::journal::slock sl(&_rd_list_mutex);
if (_dtok_rd_list.empty())
_rd_list_cv.wait();
if (!_dtok_rd_list.empty())
@@ -267,13 +267,13 @@
std::size_t xsize = 0;
bool tr = false;
bool ext = false;
- rhm::journal::iores res = read_data_record(&dptr, dsize, &xptr, xsize, tr,
+ mrg::journal::iores res = read_data_record(&dptr, dsize, &xptr, xsize, tr,
ext, dtokp);
switch (res)
{
- case rhm::journal::RHM_IORES_SUCCESS:
+ case mrg::journal::RHM_IORES_SUCCESS:
{
- rhm::journal::slock sl(&_deq_list_mutex);
+ mrg::journal::slock sl(&_deq_list_mutex);
_dtok_deq_list.push_back(dtokp);
_deq_list_cv.broadcast();
}
@@ -288,20 +288,20 @@
dptr = 0;
xptr = 0;
break;
- case rhm::journal::RHM_IORES_PAGE_AIOWAIT:
+ case mrg::journal::RHM_IORES_PAGE_AIOWAIT:
if (get_rd_events() == 0)
{
- rhm::journal::slock sl(&_rd_aio_mutex);
+ mrg::journal::slock sl(&_rd_aio_mutex);
_rd_aio_cv.waitintvl(MAX_RD_WAIT * 1000000); // MAX_RD_WAIT in ms
}
break;
default:
std::ostringstream oss;
oss << "ERROR: read operation in journal \"" << _jid;
- oss << "\" returned " << rhm::journal::iores_str(res) << ".";
+ oss << "\" returned " << mrg::journal::iores_str(res) << ".";
_tcrp->add_exception(oss.str());
{
- rhm::journal::slock sl(&_deq_list_mutex);
+ mrg::journal::slock sl(&_deq_list_mutex);
_deq_list_cv.broadcast(); // wake up deq thread
}
}
@@ -310,7 +310,7 @@
}
}
}
- catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
+ catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); }
catch (...) { _tcrp->add_exception("Unknown exception"); panic(); }
}
@@ -326,7 +326,7 @@
{
journal::data_tok* dtokp = 0;
{
- rhm::journal::slock sl(&_deq_list_mutex);
+ mrg::journal::slock sl(&_deq_list_mutex);
if (_dtok_deq_list.empty())
_deq_list_cv.wait();
if (!_dtok_deq_list.empty())
@@ -337,12 +337,12 @@
}
if (dtokp)
{
- rhm::journal::iores res;
+ mrg::journal::iores res;
if (dtokp->has_xid())
res = dequeue_txn_data_record(dtokp, dtokp->xid());
else
res = dequeue_data_record(dtokp);
- if (res == rhm::journal::RHM_IORES_SUCCESS)
+ if (res == mrg::journal::RHM_IORES_SUCCESS)
{
_tcrp->incr_num_deq();
commit(dtokp);
@@ -351,7 +351,7 @@
{
std::ostringstream oss;
oss << "ERROR: dequeue operation in journal \"" << _jid;
- oss << "\" returned " << rhm::journal::iores_str(res) << ".";
+ oss << "\" returned " << mrg::journal::iores_str(res) << ".";
_tcrp->add_exception(oss.str());
}
}
@@ -359,44 +359,44 @@
flush(true);
}
}
- catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
+ catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); }
catch (...) { _tcrp->add_exception("Unknown exception"); panic(); }
}
void
-jrnl_instance::abort(const rhm::journal::data_tok* dtokp)
+jrnl_instance::abort(const mrg::journal::data_tok* dtokp)
{
txn(dtokp, false);
}
void
-jrnl_instance::commit(const rhm::journal::data_tok* dtokp)
+jrnl_instance::commit(const mrg::journal::data_tok* dtokp)
{
txn(dtokp, true);
}
void
-jrnl_instance::txn(const rhm::journal::data_tok* dtokp, const bool commit)
+jrnl_instance::txn(const mrg::journal::data_tok* dtokp, const bool commit)
{
if (dtokp->has_xid())
{
- rhm::journal::data_tok* p = prep_txn_dtok(dtokp);
- rhm::journal::iores res = commit ? txn_commit(p, p->xid()) : txn_abort(p, p->xid());
- if (res != rhm::journal::RHM_IORES_SUCCESS)
+ mrg::journal::data_tok* p = prep_txn_dtok(dtokp);
+ mrg::journal::iores res = commit ? txn_commit(p, p->xid()) : txn_abort(p, p->xid());
+ if (res != mrg::journal::RHM_IORES_SUCCESS)
{
std::ostringstream oss;
oss << "ERROR: " << (commit ? "commit" : "abort") << " operation in journal \"";
- oss << _jid << "\" returned " << rhm::journal::iores_str(res) << ".";
+ oss << _jid << "\" returned " << mrg::journal::iores_str(res) << ".";
_tcrp->add_exception(oss.str());
}
}
}
-rhm::journal::data_tok*
-jrnl_instance::prep_txn_dtok(const rhm::journal::data_tok* dtokp)
+mrg::journal::data_tok*
+jrnl_instance::prep_txn_dtok(const mrg::journal::data_tok* dtokp)
{
- dtok_ptr p(new rhm::journal::data_tok);
+ dtok_ptr p(new mrg::journal::data_tok);
_dtok_master_txn_list.push_back(p);
p->set_xid(dtokp->xid());
return p.get();
@@ -429,4 +429,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,8 +21,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_jrnl_instance_hpp
-#define rhm_jtt_jrnl_instance_hpp
+#ifndef mrg_jtt_jrnl_instance_hpp
+#define mrg_jtt_jrnl_instance_hpp
#include "args.hpp"
#include "jrnl_init_params.hpp"
@@ -36,12 +36,12 @@
#include <list>
#include <vector>
-namespace rhm
+namespace mrg
{
namespace jtt
{
- class jrnl_instance : public rhm::journal::jcntl
+ class jrnl_instance : public mrg::journal::jcntl
{
public:
typedef boost::shared_ptr<jrnl_instance> shared_ptr;
@@ -55,13 +55,13 @@
std::list<journal::data_tok*> _dtok_rd_list;
std::list<journal::data_tok*> _dtok_deq_list;
pthread_mutex_t _rd_aio_mutex; ///< Mutex for read aio wait conditions
- rhm::journal::cvar _rd_aio_cv; ///< Condition var for read aio wait conditions
+ mrg::journal::cvar _rd_aio_cv; ///< Condition var for read aio wait conditions
pthread_mutex_t _wr_full_mutex; ///< Mutex for write full conditions
- rhm::journal::cvar _wr_full_cv; ///< Condition var for write full conditions
+ mrg::journal::cvar _wr_full_cv; ///< Condition var for write full conditions
pthread_mutex_t _rd_list_mutex; ///< Mutex for _dtok_rd_list
- rhm::journal::cvar _rd_list_cv; ///< Condition var for _dtok_rd_list
+ mrg::journal::cvar _rd_list_cv; ///< Condition var for _dtok_rd_list
pthread_mutex_t _deq_list_mutex; ///< Mutex for _dtok_deq_list
- rhm::journal::cvar _deq_list_cv; ///< Condition var for _dtok_deq_list
+ mrg::journal::cvar _deq_list_cv; ///< Condition var for _dtok_deq_list
pthread_t _enq_thread;
pthread_t _deq_thread;
pthread_t _read_thread;
@@ -88,36 +88,36 @@
private:
inline void handle_rd_callback()
{
- rhm::journal::slock sl(&_rd_aio_mutex);
+ mrg::journal::slock sl(&_rd_aio_mutex);
_rd_aio_cv.broadcast();
}
static inline void handle_rd_callback(jcntl* jp)
{ static_cast<jrnl_instance*>(jp)->handle_rd_callback(); }
- inline void handle_wr_callback(rhm::journal::data_tok* dtokp)
+ inline void handle_wr_callback(mrg::journal::data_tok* dtokp)
{
if (dtokp->wstate() == journal::data_tok::ENQ)
{
if (_args_ptr->read_mode.val() == read_arg::NONE)
{
- rhm::journal::slock sl(&_deq_list_mutex);
+ mrg::journal::slock sl(&_deq_list_mutex);
_dtok_deq_list.push_back(dtokp);
_deq_list_cv.broadcast();
}
else
{
- rhm::journal::slock sl(&_rd_list_mutex);
+ mrg::journal::slock sl(&_rd_list_mutex);
_dtok_rd_list.push_back(dtokp);
_rd_list_cv.broadcast();
}
}
else // DEQ
{
- rhm::journal::slock sl(&_wr_full_mutex);
+ mrg::journal::slock sl(&_wr_full_mutex);
_wr_full_cv.broadcast();
}
}
- static inline void handle_wr_callback(jcntl* jp, rhm::journal::data_tok* dtokp)
+ static inline void handle_wr_callback(jcntl* jp, mrg::journal::data_tok* dtokp)
{ static_cast<jrnl_instance*>(jp)->handle_wr_callback(dtokp); }
void run_enq() throw ();
@@ -132,10 +132,10 @@
inline static void* run_deq(void* p)
{ static_cast<jrnl_instance*>(p)->run_deq(); return 0; }
- void abort(const rhm::journal::data_tok* dtokp);
- void commit(const rhm::journal::data_tok* dtokp);
- void txn(const rhm::journal::data_tok* dtokp, const bool commit);
- rhm::journal::data_tok* prep_txn_dtok(const rhm::journal::data_tok* dtokp);
+ void abort(const mrg::journal::data_tok* dtokp);
+ void commit(const mrg::journal::data_tok* dtokp);
+ void txn(const mrg::journal::data_tok* dtokp, const bool commit);
+ mrg::journal::data_tok* prep_txn_dtok(const mrg::journal::data_tok* dtokp);
void panic();
@@ -145,6 +145,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_jrnl_instance_hpp
+#endif // ifndef mrg_jtt_jrnl_instance_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/main.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/main.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/main.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -34,19 +34,19 @@
int main(int argc, char** argv)
{
- std::signal(SIGINT, rhm::jtt::test_mgr::signal_handler);
- std::signal(SIGTERM, rhm::jtt::test_mgr::signal_handler);
+ std::signal(SIGINT, mrg::jtt::test_mgr::signal_handler);
+ std::signal(SIGTERM, mrg::jtt::test_mgr::signal_handler);
std::cout << PACKAGE_NAME << " v." << VERSION << std::endl;
std::ostringstream oss;
oss << PACKAGE_NAME << " options";
- rhm::jtt::args args(oss.str());
+ mrg::jtt::args args(oss.str());
if (args.parse(argc, argv)) return 1;
try
{
- rhm::jtt::test_mgr tm(args);
+ mrg::jtt::test_mgr tm(args);
tm.run();
}
catch (const std::exception& e)
Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,7 +27,7 @@
#include <boost/program_options.hpp>
namespace po = boost::program_options;
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -92,4 +92,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,13 +21,13 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_read_arg_hpp
-#define rhm_jtt_read_arg_hpp
+#ifndef mrg_jtt_read_arg_hpp
+#define mrg_jtt_read_arg_hpp
#include <string>
#include <map>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -59,6 +59,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_read_arg_hpp
+#endif // ifndef mrg_jtt_read_arg_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,7 +27,7 @@
#include <iomanip>
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -178,4 +178,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,8 +21,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_test_case_hpp
-#define rhm_jtt_test_case_hpp
+#ifndef mrg_jtt_test_case_hpp
+#define mrg_jtt_test_case_hpp
#include <boost/shared_ptr.hpp>
#include <cstddef>
@@ -31,7 +31,7 @@
#include "test_case_result_agregation.hpp"
#include <vector>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -107,6 +107,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_test_case_hpp
+#endif // ifndef mrg_jtt_test_case_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -26,7 +26,7 @@
#include <iomanip>
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -200,4 +200,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,8 +21,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_test_case_result_hpp
-#define rhm_jtt_test_case_result_hpp
+#ifndef mrg_jtt_test_case_result_hpp
+#define mrg_jtt_test_case_result_hpp
#include <boost/shared_ptr.hpp>
#include <deque>
@@ -30,7 +30,7 @@
#include "jrnl/time_ns.hpp"
#include <string>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -97,6 +97,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_test_case_result_hpp
+#endif // ifndef mrg_jtt_test_case_result_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -26,7 +26,7 @@
#include <iomanip>
#include <sstream>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -166,4 +166,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,14 +21,14 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_test_case_result_agregation_hpp
-#define rhm_jtt_test_case_result_agregation_hpp
+#ifndef mrg_jtt_test_case_result_agregation_hpp
+#define mrg_jtt_test_case_result_agregation_hpp
#include "test_case_result.hpp"
#include <vector>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -75,6 +75,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_test_case_result_agregation_hpp
+#endif // ifndef mrg_jtt_test_case_result_agregation_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,7 +27,7 @@
#include <fstream>
#include <iostream>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -168,4 +168,4 @@
}
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,8 +21,8 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_test_case_set_hpp
-#define rhm_jtt_test_case_set_hpp
+#ifndef mrg_jtt_test_case_set_hpp
+#define mrg_jtt_test_case_set_hpp
#include "test_case.hpp"
@@ -31,7 +31,7 @@
#include <map>
#include <vector>
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -96,6 +96,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_test_case_set_hpp
+#endif // ifndef mrg_jtt_test_case_set_hpp
Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -27,7 +27,7 @@
#include <iostream>
#include "test_case_set.hpp"
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -121,7 +121,7 @@
}
if (!_args.recover_mode && !_args.keep_jrnls)
for (ji_list_citr jii=_ji_list.begin(); jii!=_ji_list.end(); jii++)
- try { rhm::journal::jdir::delete_dir((*jii)->jrnl_dir()); }
+ try { mrg::journal::jdir::delete_dir((*jii)->jrnl_dir()); }
catch (...) {} // TODO - work out exception strategy for failure here...
print_results(*tci, summary);
@@ -190,4 +190,4 @@
volatile bool test_mgr::_abort = false;
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2008-09-10 18:20:45 UTC (rev 2437)
+++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2008-09-10 19:43:56 UTC (rev 2438)
@@ -21,15 +21,15 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
-#ifndef rhm_jtt_test_mgr_hpp
-#define rhm_jtt_test_mgr_hpp
+#ifndef mrg_jtt_test_mgr_hpp
+#define mrg_jtt_test_mgr_hpp
#include "args.hpp"
#include <csignal>
#include <cstdlib>
#include "jrnl_instance.hpp"
-namespace rhm
+namespace mrg
{
namespace jtt
{
@@ -62,6 +62,6 @@
};
} // namespace jtt
-} // namespace rhm
+} // namespace mrg
-#endif // ifndef rhm_jtt_test_mgr_hpp
+#endif // ifndef mrg_jtt_test_mgr_hpp
17 years, 7 months
- 1
- 0
rhmessaging commits: r2437 - in mgmt/trunk/mint: sql and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-09-10 14:20:45 -0400 (Wed, 10 Sep 2008)
New Revision: 2437
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Update to newest schema
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-09-09 21:44:48 UTC (rev 2436)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-09-10 18:20:45 UTC (rev 2437)
@@ -784,6 +784,7 @@
statsCurr = ForeignKey('JobStats', cascade='null', default=None)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
+ scheduler = ForeignKey('Scheduler', cascade='null', default=None)
AccountingGroup = StringCol(length=1000, default=None)
Args = StringCol(length=4000, default=None)
ClusterId = IntCol(default=None)
@@ -816,6 +817,33 @@
conn.callMethod(originalId, classInfo, "GetAd",
callback, args=actualArgs)
+ def Hold(self, model, callback, Reason):
+ actualArgs = dict()
+ actualArgs["Reason"] = Reason
+ conn = model.connections[self.managedBroker]
+ classInfo = self.classInfos[self.managedBroker]
+ originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
+ conn.callMethod(originalId, classInfo, "Hold",
+ callback, args=actualArgs)
+
+ def Release(self, model, callback, Reason):
+ actualArgs = dict()
+ actualArgs["Reason"] = Reason
+ conn = model.connections[self.managedBroker]
+ classInfo = self.classInfos[self.managedBroker]
+ originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
+ conn.callMethod(originalId, classInfo, "Release",
+ callback, args=actualArgs)
+
+ def Remove(self, model, callback, Reason):
+ actualArgs = dict()
+ actualArgs["Reason"] = Reason
+ conn = model.connections[self.managedBroker]
+ classInfo = self.classInfos[self.managedBroker]
+ originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
+ conn.callMethod(originalId, classInfo, "Remove",
+ callback, args=actualArgs)
+
class JobStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -1027,6 +1055,9 @@
classToSchemaNameMap['Job'] = 'Job'
schemaNameToClassMap['Job'] = Job
+Scheduler.sqlmeta.addJoin(SQLMultipleJoin('Job', joinMethodName='jobs'))
+
+
Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats'))
classToSchemaNameMap['Scheduler'] = 'Scheduler'
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-09-09 21:44:48 UTC (rev 2436)
+++ mgmt/trunk/mint/sql/schema.sql 2008-09-10 18:20:45 UTC (rev 2437)
@@ -243,6 +243,7 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
+ scheduler_id INT,
accounting_group VARCHAR(1000),
args VARCHAR(4000),
cluster_id INT,
@@ -763,6 +764,8 @@
ALTER TABLE job ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES job_stats (id) ON DELETE SET NULL;
+ALTER TABLE job ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL;
+
ALTER TABLE job_stats ADD CONSTRAINT job_id_exists FOREIGN KEY (job_id) REFERENCES job (id) ON DELETE SET NULL;
ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL;
17 years, 7 months
- 1
- 0
rhmessaging commits: r2436 - in mgmt/trunk: cumin/python/cumin and 2 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-09-09 17:44:48 -0400 (Tue, 09 Sep 2008)
New Revision: 2436
Modified:
mgmt/trunk/cumin/bin/cumin-admin
mgmt/trunk/cumin/bin/cumin-load-demo-data
mgmt/trunk/cumin/python/cumin/__init__.py
mgmt/trunk/cumin/python/cumin/page.py
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Add roles to the schema; rename ConsoleUser to Subject; modify MintDatabase createSchema to load standard roles
Modified: mgmt/trunk/cumin/bin/cumin-admin
===================================================================
--- mgmt/trunk/cumin/bin/cumin-admin 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/cumin/bin/cumin-admin 2008-09-09 21:44:48 UTC (rev 2436)
@@ -6,7 +6,7 @@
from getpass import getpass
from random import sample
from crypt import crypt
-from mint import MintDatabase, ConsoleUser
+from mint import MintDatabase, Subject, Role
from psycopg2 import IntegrityError
from cumin import CuminConfig
@@ -97,7 +97,7 @@
name = args[1]
- if ConsoleUser.selectBy(name=name).count():
+ if Subject.selectBy(name=name).count():
print "Error: a user called '%s' already exists" % name
sys.exit(1)
@@ -116,7 +116,15 @@
crypted = crypt(password, "".join(sample(chs, 2)))
try:
- ConsoleUser(name=name, password=crypted)
+ subject = Subject(name=name, password=crypted)
+
+ for role in Role.selectBy(name="user"):
+ subject.addRole(role)
+ break
+
+ assert role
+
+ subject.syncUpdate()
except IntegrityError:
print "Error: a user called '%s' already exists" % name
sys.exit(1)
@@ -129,11 +137,11 @@
sys.exit(1)
name = args[1]
- accounts = ConsoleUser.selectBy(name=name)
+ subjects = Subject.selectBy(name=name)
- if accounts.count():
- for account in accounts:
- account.destroySelf()
+ if subjects.count():
+ for subject in subjects:
+ subject.destroySelf()
break
else:
print "Error: no such user '%s'" % args[1]
@@ -144,7 +152,7 @@
print "Error: command remove-user requires --force yes"
sys.exit(1)
elif command == "list-users":
- accounts = ConsoleUser.select(orderBy='name')
+ accounts = Subject.select(orderBy='name')
print " id name"
print "---- " + ("-" * 20)
Modified: mgmt/trunk/cumin/bin/cumin-load-demo-data
===================================================================
--- mgmt/trunk/cumin/bin/cumin-load-demo-data 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/cumin/bin/cumin-load-demo-data 2008-09-09 21:44:48 UTC (rev 2436)
@@ -6,7 +6,7 @@
from getpass import getpass
from random import sample
from crypt import crypt
-from mint import MintDatabase, ConsoleUser
+from mint import MintDatabase
from psycopg2 import IntegrityError
from cumin import *
Modified: mgmt/trunk/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/__init__.py 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/cumin/python/cumin/__init__.py 2008-09-09 21:44:48 UTC (rev 2436)
@@ -114,7 +114,7 @@
if name:
try:
- user = ConsoleUser.selectBy(name=name)[0]
+ user = Subject.selectBy(name=name)[0]
except IndexError:
return False
Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/cumin/python/cumin/page.py 2008-09-09 21:44:48 UTC (rev 2436)
@@ -181,7 +181,7 @@
name = session.credentials.get("name")
try:
- user = ConsoleUser.selectBy(name=name)[0]
+ user = Subject.selectBy(name=name)[0]
except IndexError:
user = None
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-09-09 21:44:48 UTC (rev 2436)
@@ -116,15 +116,35 @@
name = StringCol(length=1000, default=None)
-class ConsoleUser(SQLObject):
+class Subject(SQLObject):
class sqlmeta:
lazyUpdate = True
name = StringCol(length=1000, default=None, unique=True, notNone=True)
password = StringCol(length=1000, default=None)
lastChallenged = TimestampCol(default=None)
+ lastLoggedIn = TimestampCol(default=None)
lastLoggedOut = TimestampCol(default=None)
+ roles = SQLRelatedJoin("Role", intermediateTable="subject_role_mapping",
+ createRelatedTable=False)
+class Role(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ name = StringCol(length=1000, default=None, unique=True, notNone=True)
+ subjects = SQLRelatedJoin("Subject",
+ intermediateTable="subject_role_mapping",
+ createRelatedTable=False)
+
+class SubjectRoleMapping(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ subject = ForeignKey("Subject", notNull=True, cascade=True)
+ role = ForeignKey("Role", notNull=True, cascade=True)
+ unique = index.DatabaseIndex(subject, role, unique=True)
+
class ObjectNotFound(Exception):
pass
@@ -421,9 +441,18 @@
print "Executed %i statements from file '%s'" % (count, path)
- cursor.execute("insert into mint_info (version) values ('0.1')")
+ conn.commit()
- conn.commit()
+ info = MintInfo(version="0.1")
+ info.sync()
+
+ # Standard roles
+
+ user = Role(name="user")
+ user.sync()
+
+ admin = Role(name="admin")
+ admin.sync()
finally:
conn.close()
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-09-09 21:44:48 UTC (rev 2436)
@@ -552,6 +552,13 @@
location = StringCol(length=1000, default=None)
defaultInitialFileCount = SmallIntCol(default=None)
defaultDataFileSize = IntCol(default=None)
+ tplIsInitialized = BoolCol(default=None)
+ tplDirectory = StringCol(length=1000, default=None)
+ tplWritePageSize = IntCol(default=None)
+ tplWritePages = IntCol(default=None)
+ tplInitialFileCount = SmallIntCol(default=None)
+ tplDataFileSize = IntCol(default=None)
+ tplCurrentFileCount = IntCol(default=None)
class StoreStats(SQLObject):
@@ -561,6 +568,15 @@
recTime = TimestampCol(default=None)
store = ForeignKey('Store', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
+ tplTransactionDepth = IntCol(default=None)
+ tplTransactionDepthLow = IntCol(default=None)
+ tplTransactionDepthHigh = IntCol(default=None)
+ tplTxnPrepares = BigIntCol(default=None)
+ tplTxnCommits = BigIntCol(default=None)
+ tplTxnAborts = BigIntCol(default=None)
+ tplOutstandingAIOs = IntCol(default=None)
+ tplOutstandingAIOsLow = IntCol(default=None)
+ tplOutstandingAIOsHigh = IntCol(default=None)
@@ -578,14 +594,17 @@
statsCurr = ForeignKey('JournalStats', cascade='null', default=None)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
+ queue = ForeignKey('Queue', cascade='null', default=None)
name = StringCol(length=1000, default=None)
- queue = ForeignKey('Queue', cascade='null', default=None)
directory = StringCol(length=1000, default=None)
baseFileName = StringCol(length=1000, default=None)
writePageSize = IntCol(default=None)
writePages = IntCol(default=None)
readPageSize = IntCol(default=None)
readPages = IntCol(default=None)
+ initialFileCount = SmallIntCol(default=None)
+ dataFileSize = IntCol(default=None)
+ currentFileCount = IntCol(default=None)
def expand(self, model, callback, by):
@@ -605,14 +624,15 @@
recTime = TimestampCol(default=None)
journal = ForeignKey('Journal', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- initialFileCount = SmallIntCol(default=None)
- dataFileSize = IntCol(default=None)
- currentFileCount = IntCol(default=None)
recordDepth = IntCol(default=None)
recordDepthLow = IntCol(default=None)
recordDepthHigh = IntCol(default=None)
- recordEnqueues = BigIntCol(default=None)
- recordDequeues = BigIntCol(default=None)
+ enqueues = BigIntCol(default=None)
+ dequeues = BigIntCol(default=None)
+ txnEnqueues = BigIntCol(default=None)
+ txnDequeues = BigIntCol(default=None)
+ txnCommits = BigIntCol(default=None)
+ txnAborts = BigIntCol(default=None)
outstandingAIOs = IntCol(default=None)
outstandingAIOsLow = IntCol(default=None)
outstandingAIOsHigh = IntCol(default=None)
@@ -764,7 +784,6 @@
statsCurr = ForeignKey('JobStats', cascade='null', default=None)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- scheduler = ForeignKey('Scheduler', cascade='null', default=None)
AccountingGroup = StringCol(length=1000, default=None)
Args = StringCol(length=4000, default=None)
ClusterId = IntCol(default=None)
@@ -1008,9 +1027,6 @@
classToSchemaNameMap['Job'] = 'Job'
schemaNameToClassMap['Job'] = Job
-Scheduler.sqlmeta.addJoin(SQLMultipleJoin('Job', joinMethodName='jobs'))
-
-
Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats'))
classToSchemaNameMap['Scheduler'] = 'Scheduler'
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-09-09 20:30:51 UTC (rev 2435)
+++ mgmt/trunk/mint/sql/schema.sql 2008-09-09 21:44:48 UTC (rev 2436)
@@ -38,24 +38,37 @@
type VARCHAR(1)
);
-CREATE TABLE console_user (
+CREATE TABLE mint_info (
id SERIAL PRIMARY KEY,
+ version VARCHAR(1000) NOT NULL
+);
+
+CREATE TABLE pool (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(1000)
+);
+
+CREATE TABLE role (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(1000) NOT NULL UNIQUE
+);
+
+CREATE TABLE subject (
+ id SERIAL PRIMARY KEY,
name VARCHAR(1000) NOT NULL UNIQUE,
password VARCHAR(1000),
last_challenged TIMESTAMP,
+ last_logged_in TIMESTAMP,
last_logged_out TIMESTAMP
);
-CREATE TABLE mint_info (
+CREATE TABLE subject_role_mapping (
id SERIAL PRIMARY KEY,
- version VARCHAR(1000) NOT NULL
+ subject_id INT NOT NULL,
+ role_id INT NOT NULL
);
+CREATE UNIQUE INDEX subject_role_mapping_unique ON subject_role_mapping (subject_id, role_id);
-CREATE TABLE pool (
- id SERIAL PRIMARY KEY,
- name VARCHAR(1000)
-);
-
CREATE TABLE agent (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
@@ -230,7 +243,6 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
- scheduler_id INT,
accounting_group VARCHAR(1000),
args VARCHAR(4000),
cluster_id INT,
@@ -270,28 +282,32 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
+ queue_id INT,
name VARCHAR(1000),
- queue_id INT,
directory VARCHAR(1000),
base_file_name VARCHAR(1000),
write_page_size INT,
write_pages INT,
read_page_size INT,
- read_pages INT
+ read_pages INT,
+ initial_file_count SMALLINT,
+ data_file_size INT,
+ current_file_count INT
);
CREATE TABLE journal_stats (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
journal_id INT,
- initial_file_count SMALLINT,
- data_file_size INT,
- current_file_count INT,
record_depth INT,
record_depth_low INT,
record_depth_high INT,
- record_enqueues BIGINT,
- record_dequeues BIGINT,
+ enqueues BIGINT,
+ dequeues BIGINT,
+ txn_enqueues BIGINT,
+ txn_dequeues BIGINT,
+ txn_commits BIGINT,
+ txn_aborts BIGINT,
outstanding_ai_os INT,
outstanding_ai_os_low INT,
outstanding_ai_os_high INT,
@@ -580,13 +596,29 @@
broker_id INT,
location VARCHAR(1000),
default_initial_file_count SMALLINT,
- default_data_file_size INT
+ default_data_file_size INT,
+ tpl_is_initialized BOOL,
+ tpl_directory VARCHAR(1000),
+ tpl_write_page_size INT,
+ tpl_write_pages INT,
+ tpl_initial_file_count SMALLINT,
+ tpl_data_file_size INT,
+ tpl_current_file_count INT
);
CREATE TABLE store_stats (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- store_id INT
+ store_id INT,
+ tpl_transaction_depth INT,
+ tpl_transaction_depth_low INT,
+ tpl_transaction_depth_high INT,
+ tpl_txn_prepares BIGINT,
+ tpl_txn_commits BIGINT,
+ tpl_txn_aborts BIGINT,
+ tpl_outstanding_ai_os INT,
+ tpl_outstanding_ai_os_low INT,
+ tpl_outstanding_ai_os_high INT
);
CREATE TABLE submitter (
@@ -669,6 +701,10 @@
ALTER TABLE broker_registration ADD CONSTRAINT profile_id_exists FOREIGN KEY (profile_id) REFERENCES broker_profile (id) ON DELETE SET NULL;
+ALTER TABLE subject_role_mapping ADD CONSTRAINT subject_id_exists FOREIGN KEY (subject_id) REFERENCES subject (id) ON DELETE CASCADE;
+
+ALTER TABLE subject_role_mapping ADD CONSTRAINT role_id_exists FOREIGN KEY (role_id) REFERENCES role (id) ON DELETE CASCADE;
+
ALTER TABLE agent ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES agent_stats (id) ON DELETE SET NULL;
ALTER TABLE agent ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES agent_stats (id) ON DELETE SET NULL;
@@ -727,8 +763,6 @@
ALTER TABLE job ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES job_stats (id) ON DELETE SET NULL;
-ALTER TABLE job ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL;
-
ALTER TABLE job_stats ADD CONSTRAINT job_id_exists FOREIGN KEY (job_id) REFERENCES job (id) ON DELETE SET NULL;
ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL;
17 years, 7 months
- 1
- 0