rhmessaging commits: r1898 - in mgmt: cumin/python/wooly and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 16:31:55 -0400 (Wed, 09 Apr 2008)
New Revision: 1898
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/model.py
mgmt/cumin/python/cumin/widgets.py
mgmt/cumin/python/wooly/widgets.strings
mgmt/notes/justin-todo.txt
Log:
Only display actions marked navigable.
Change property styling a little.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2008-04-09 19:40:49 UTC (rev 1897)
+++ mgmt/cumin/python/cumin/broker.py 2008-04-09 20:31:55 UTC (rev 1898)
@@ -349,13 +349,13 @@
def do_get_items(self, session, reg):
cls = self.app.model.get_class_by_object(reg)
acts = [(x.get_href(session, reg), x.get_title(session))
- for x in cls.actions]
+ for x in cls.actions if x.navigable]
if reg.broker:
cls = self.app.model.get_class_by_object(reg.broker)
acts.extend([(x.get_href(session, reg.broker),
x.get_title(session))
- for x in cls.actions])
+ for x in cls.actions if x.navigable])
return acts
Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py 2008-04-09 19:40:49 UTC (rev 1897)
+++ mgmt/cumin/python/cumin/model.py 2008-04-09 20:31:55 UTC (rev 1898)
@@ -111,7 +111,8 @@
self.name = name
self.title = None
self.summary = False
-
+ self.navigable = True
+
self.cumin_class.add_action(self)
def show(self, session, object):
@@ -394,6 +395,8 @@
def __init__(self, cls, name):
super(LocalClass.Add, self).__init__(cls, name)
+ self.navigable = False
+
def show(self, session, object):
frame = self.cumin_class.show_object(session, object)
return frame.show_add(session)
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2008-04-09 19:40:49 UTC (rev 1897)
+++ mgmt/cumin/python/cumin/widgets.py 2008-04-09 20:31:55 UTC (rev 1898)
@@ -258,7 +258,7 @@
def do_get_items(self, session, object):
cls = self.app.model.get_class_by_object(object)
return [(x.get_href(session, object), x.get_title(session))
- for x in cls.actions]
+ for x in cls.actions if x.navigable]
class CuminDetails(Widget):
def __init__(self, app, name):
@@ -304,7 +304,7 @@
def do_get_items(self, session, object):
cls = self.app.model.get_class_by_object(object)
return [(x.get_href(session, object), x.get_title(session))
- for x in cls.actions if x.summary]
+ for x in cls.actions if x.summary and x.navigable]
class StateSwitch(ItemSet):
def __init__(self, app, name):
Modified: mgmt/cumin/python/wooly/widgets.strings
===================================================================
--- mgmt/cumin/python/wooly/widgets.strings 2008-04-09 19:40:49 UTC (rev 1897)
+++ mgmt/cumin/python/wooly/widgets.strings 2008-04-09 20:31:55 UTC (rev 1898)
@@ -137,7 +137,8 @@
}
table.PropertySet th {
- color: #333;
+ color: #444;
+ font-weight: normal;
}
[PropertySet.html]
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2008-04-09 19:40:49 UTC (rev 1897)
+++ mgmt/notes/justin-todo.txt 2008-04-09 20:31:55 UTC (rev 1898)
@@ -30,6 +30,8 @@
Deferred
+ * En dashes don't disappear on stat update
+
* Change the way CuminAction.invoke works
* Resolve design questions around view navigation
16 years, 9 months
rhmessaging commits: r1897 - mgmt/cumin/bin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 15:40:49 -0400 (Wed, 09 Apr 2008)
New Revision: 1897
Modified:
mgmt/cumin/bin/cumin
Log:
Repair a reference to config.home.
Add a --profile option to profile the cumin server.
Modified: mgmt/cumin/bin/cumin
===================================================================
--- mgmt/cumin/bin/cumin 2008-04-09 18:25:42 UTC (rev 1896)
+++ mgmt/cumin/bin/cumin 2008-04-09 19:40:49 UTC (rev 1897)
@@ -25,8 +25,8 @@
server = CuminServer(app, config.addr, config.port)
if config.ssl:
- cpath = os.path.join(home, "etc", "cumin.crt")
- kpath = os.path.join(home, "etc", "cumin.key")
+ cpath = os.path.join(config.home, "etc", "cumin.crt")
+ kpath = os.path.join(config.home, "etc", "cumin.key")
if os.path.isfile(cpath):
server.set_ssl_cert_path(cpath)
@@ -70,7 +70,28 @@
do_main(config)
if __name__ == "__main__":
- try:
- main()
- except KeyboardInterrupt:
- pass
+ if "--profile" in sys.argv:
+ from profile import Profile
+ from pstats import Stats
+
+ prof = Profile()
+
+ try:
+ prof.run("main()")
+ except KeyboardInterrupt:
+ pass
+
+ file = "/tmp/cumin-stats"
+ prof.dump_stats(file)
+
+ stats = Stats(file)
+
+ stats.sort_stats("cumulative").print_stats(15)
+ stats.sort_stats("time").print_stats(15)
+
+ stats.strip_dirs()
+ else:
+ try:
+ main()
+ except KeyboardInterrupt:
+ pass
16 years, 9 months
rhmessaging commits: r1896 - mgmt/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 14:25:42 -0400 (Wed, 09 Apr 2008)
New Revision: 1896
Modified:
mgmt/cumin/python/wooly/wsgiserver.py
Log:
Add some state to HTTPConnection, so that we can mark it aborted and
close existing keepalive connections abruptbly. This avoids an
interminable server shutdown.
Modified: mgmt/cumin/python/wooly/wsgiserver.py
===================================================================
--- mgmt/cumin/python/wooly/wsgiserver.py 2008-04-09 16:50:25 UTC (rev 1895)
+++ mgmt/cumin/python/wooly/wsgiserver.py 2008-04-09 18:25:42 UTC (rev 1896)
@@ -601,6 +601,7 @@
self.socket = sock
self.addr = addr
self.server = server
+ self.__aborted = False
# Copy the class environ into self.
self.environ = self.environ.copy()
@@ -633,11 +634,17 @@
# Until we do DNS lookups, omit REMOTE_HOST
self.environ["REMOTE_ADDR"] = self.addr[0]
self.environ["REMOTE_PORT"] = str(self.addr[1])
+
+ def abort(self):
+ self.__aborted = True
def communicate(self):
"""Read each request and respond appropriately."""
try:
while True:
+ if self.__aborted:
+ return
+
# (re)set req to None so that if something goes wrong in
# the RequestHandlerClass constructor, the error doesn't
# get written to the previous request.
@@ -645,6 +652,7 @@
req = self.RequestHandlerClass(self)
# This order of operations should guarantee correct pipelining.
req.parse_request()
+
if not req.ready:
return
req.respond()
@@ -703,6 +711,7 @@
def __init__(self, server):
self.ready = False
self.server = server
+ self.currentConnection = None
threading.Thread.__init__(self)
def run(self):
@@ -713,6 +722,8 @@
if conn is _SHUTDOWNREQUEST:
return
+ self.currentConnection = conn
+
try:
conn.communicate()
finally:
@@ -998,6 +1009,8 @@
worker = self._workerThreads.pop()
if worker is not current and worker.isAlive():
try:
+ if worker.currentConnection:
+ worker.currentConnection.abort()
worker.join()
except AssertionError:
pass
16 years, 9 months
rhmessaging commits: r1895 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 12:50:25 -0400 (Wed, 09 Apr 2008)
New Revision: 1895
Modified:
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/queue.py
Log:
Add the messaging banner logo to the top messaging page
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2008-04-09 16:50:03 UTC (rev 1894)
+++ mgmt/cumin/python/cumin/page.strings 2008-04-09 16:50:25 UTC (rev 1895)
@@ -714,11 +714,18 @@
[MainFrame.frame_html]
<li><a href="{frame_href}">{frame_title}</a></li>
+[MessagingView.css]
+img#msg_logo {
+ margin: 0 0 1em 0;
+}
+
[MessagingView.html]
<script>
wooly.setIntervalUpdate("{data_url}", updateMain, 3000);
</script>
<div class="oblock">
+ <img id="msg_logo" src="resource?name=rh_messaging_logo.png"/>
+
<ul class="TabbedModeSet tabs">{tabs}</ul>
<div class="TabbedModeSet mode">{mode}</div>
</div>
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2008-04-09 16:50:03 UTC (rev 1894)
+++ mgmt/cumin/python/cumin/queue.py 2008-04-09 16:50:25 UTC (rev 1895)
@@ -245,6 +245,7 @@
def render_script(self, session, queue):
data = "model.xml?class=queue;id=%i" % queue.id
return "wooly.setIntervalUpdate('%s', updateQueue, 3000)" % data
+
class QueueBindingSet(BindingSet):
def get_args(self, session):
return self.frame.get_args(session)
16 years, 9 months
rhmessaging commits: r1894 - store/trunk/cpp/tests/jrnl.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-04-09 12:50:03 -0400 (Wed, 09 Apr 2008)
New Revision: 1894
Modified:
store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
Log:
F9 fix
Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-04-09 16:01:41 UTC (rev 1893)
+++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-04-09 16:50:03 UTC (rev 1894)
@@ -206,7 +206,7 @@
unsigned aio_sleep_cnt = 0;
while (handle_jcntl_response(jc.read_data_record(&mp, msize, &xp, xsize, transient, external,
- dtp), jc, aio_sleep_cnt, "read_msg", exp_ret));
+ dtp), jc, aio_sleep_cnt, "read_msg", exp_ret)) ;
if (mp)
msg.assign((char*)mp, msize);
if (xp)
16 years, 9 months
rhmessaging commits: r1893 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 12:01:41 -0400 (Wed, 09 Apr 2008)
New Revision: 1893
Modified:
mgmt/cumin/python/cumin/stat.strings
Log:
bz435991 - Label the rate column in stat displays.
Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings 2008-04-09 16:00:46 UTC (rev 1892)
+++ mgmt/cumin/python/cumin/stat.strings 2008-04-09 16:01:41 UTC (rev 1893)
@@ -46,7 +46,7 @@
<tr>
<th style="width: 45%;">Statistic</th>
<th style="width: 20%;" class="ralign">Current</th>
- <th style="width: 35%;" class="ralign"></th>
+ <th style="width: 35%;" class="ralign">Rate</th>
</tr>
{items}
16 years, 9 months
rhmessaging commits: r1892 - mgmt/cumin/resources.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 12:00:46 -0400 (Wed, 09 Apr 2008)
New Revision: 1892
Modified:
mgmt/cumin/resources/sort-arrows.svg
Log:
Save the svg export parameters
Modified: mgmt/cumin/resources/sort-arrows.svg
===================================================================
--- mgmt/cumin/resources/sort-arrows.svg 2008-04-09 15:57:21 UTC (rev 1891)
+++ mgmt/cumin/resources/sort-arrows.svg 2008-04-09 16:00:46 UTC (rev 1892)
@@ -79,8 +79,8 @@
d="M 196.37724,481.91923 L 192.85917,475.82575 L 189.34109,469.73226 L 196.37724,469.73226 L 203.41339,469.73226 L 199.89532,475.82575 L 196.37724,481.91923 z"
transform="matrix(0.8574412,0,0,1.1203754,32.770882,-76.380025)"
inkscape:export-filename="/home/jross/checkouts/mgmt/cumin/resources/sort-arrow-down.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
+ inkscape:export-xdpi="61.500217"
+ inkscape:export-ydpi="61.500217" />
<path
sodipodi:type="star"
style="fill:#4e9fdd;fill-opacity:1;stroke:#bfdce8;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -98,7 +98,7 @@
d="M 196.37724,481.91923 L 192.85917,475.82575 L 189.34109,469.73226 L 196.37724,469.73226 L 203.41339,469.73226 L 199.89532,475.82575 L 196.37724,481.91923 z"
transform="matrix(0.8574412,0,0,-1.1203754,52.606205,989.8269)"
inkscape:export-filename="/home/jross/checkouts/mgmt/cumin/resources/sort-arrow-up.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
+ inkscape:export-xdpi="61.500217"
+ inkscape:export-ydpi="61.500217" />
</g>
</svg>
16 years, 9 months
rhmessaging commits: r1891 - in mgmt/cumin: resources and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-09 11:57:21 -0400 (Wed, 09 Apr 2008)
New Revision: 1891
Added:
mgmt/cumin/resources/sort-arrow-down.png
mgmt/cumin/resources/sort-arrow-up.png
mgmt/cumin/resources/sort-arrows.svg
Removed:
mgmt/cumin/resources/ajax-test.html
mgmt/cumin/resources/ajax.js
mgmt/cumin/resources/exchange.svg
mgmt/cumin/resources/object-20.png
mgmt/cumin/resources/object-36.png
mgmt/cumin/resources/object.svg
mgmt/cumin/resources/purple.png
mgmt/cumin/resources/queue.svg
Modified:
mgmt/cumin/python/wooly/tables.py
Log:
Add images for sort arrows.
Remove no longer used files in the resources dir.
Modified: mgmt/cumin/python/wooly/tables.py
===================================================================
--- mgmt/cumin/python/wooly/tables.py 2008-04-09 15:55:20 UTC (rev 1890)
+++ mgmt/cumin/python/wooly/tables.py 2008-04-09 15:57:21 UTC (rev 1891)
@@ -143,9 +143,9 @@
if sel is self.column:
if self.parent.reversed.get(session):
- return "^"
+ return "<img src=\"resource?name=sort-arrow-up.png\">"
else:
- return "v"
+ return "<img src=\"resource?name=sort-arrow-down.png\">"
class SqlTable(ItemTable):
def __init__(self, app, name):
Deleted: mgmt/cumin/resources/ajax-test.html
===================================================================
--- mgmt/cumin/resources/ajax-test.html 2008-04-09 15:55:20 UTC (rev 1890)
+++ mgmt/cumin/resources/ajax-test.html 2008-04-09 15:57:21 UTC (rev 1891)
@@ -1,32 +0,0 @@
-<html>
- <head>
- <title>test</title>
- <script>
- var xhr = new XMLHttpRequest()
-
- function getCount() {
- xhr.open("get", "http://localhost:8080/count", true)
- xhr.onreadystatechange = updateCount
- xhr.send(null)
- }
-
- function updateCount() {
- if (xhr.readyState == 4 && xhr.status == 200) {
- countNode = xhr.responseXML.getElementsByTagName("count")[0]
- count = countNode.firstChild.nodeValue
-
- var body = document.getElementsByTagName("body")
-
- var div = document.createElement("div")
- div.appendChild(document.createTextNode(count))
-
- body[0].appendChild(div)
- }
- }
-
- setInterval(getCount, 5000)
- </script>
- </head>
- <body>
- </body>
-</html>
Deleted: mgmt/cumin/resources/ajax.js
===================================================================
--- mgmt/cumin/resources/ajax.js 2008-04-09 15:55:20 UTC (rev 1890)
+++ mgmt/cumin/resources/ajax.js 2008-04-09 15:57:21 UTC (rev 1891)
@@ -1,67 +0,0 @@
-// Rename this to wooly.js
-
-wooly = {};
-wooly.updaters = {};
-
-function WoolyUpdater(id, url, callback, interval) {
- this.id = id;
- this.url = url;
- this.interval = interval;
- this.callback = callback;
- this.request = new XMLHttpRequest();
-
- this.init = function() {
- setInterval(this.fetch, this.interval);
- }
-
- this.fetch = function() {
- this.request.open("get", this.url, true);
- this.request.onreadystatechange = this.update
- this.send(null)
- }
-
- this.update = function() {
- if (request.readyState == 4 && request.status == 200) {
- elem = document.getElementById(this.id)
- this.callback(xml, elem)
- }
- }
-}
-
-function AjaxRequest() {
- try {
- this.request = window.XMLHttpRequest();
- } catch (e) {
- try {
- this.request = new ActiveXObject("Msxml2.XMLHTTP");
- } catch (ie) {
- try {
- this.request = new ActiveXObject("Microsoft.XMLHTTP");
- } catch (iie) {
- throw new Error("XMLHttpRequest not found");
- }
- }
- }
-
- // XXX configure with an xpath expression? pg 515 in the big js
- // book
-
- this.get = function(url, callback) {
- this.request.open("GET", url, true);
-
- // XXX set some headers
- //this.request.setRequestHeader("If-Modified-Since",
- // lastRequested.toString());
-
- this.onreadystatechange = function() {
- if (this.request.readyState == 4 && this.request.status == 200) {
- callback(request.responseXML)
- }
- }
-
- this.request.send(null)
- }
-}
-
-req = new AjaxRequest();
-req.get("queue-xml?id={{id}}", updateStatus)
\ No newline at end of file
Deleted: mgmt/cumin/resources/exchange.svg
===================================================================
--- mgmt/cumin/resources/exchange.svg 2008-04-09 15:55:20 UTC (rev 1890)
+++ mgmt/cumin/resources/exchange.svg 2008-04-09 15:57:21 UTC (rev 1891)
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="744.09448819"
- height="1052.3622047"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.45.1"
- sodipodi:docbase="/home/justin/cumindev/cumin/resources"
- sodipodi:docname="exchange.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="549.10742"
- inkscape:cy="503.26882"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1418"
- inkscape:window-height="956"
- inkscape:window-x="29"
- inkscape:window-y="45" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g3181"
- inkscape:export-filename="/home/justin/cumindev/cumin/resources/exchange-20.png"
- inkscape:export-xdpi="3.506865"
- inkscape:export-ydpi="3.506865">
- <path
- sodipodi:nodetypes="cccccccccccccc"
- d="M 313.86973,832.3721 C 312.11118,709.27939 279.68924,569.91252 207.1601,445.66059 L 168.9849,468.05869 L 205.55073,331.59313 L 342.95181,368.40964 L 305.42972,390.07303 C 344.62364,462.24138 365.78921,497.41554 391.10471,587.93301 C 409.27317,551.38754 456.55215,499.0514 474.28581,483.53568 L 444.90847,454.15833 L 585.197,454.15833 L 585.197,590.33585 L 554.87823,560.01708 C 484.07919,636.62814 448.21282,711.11613 446.96398,832.3721 C 446.96398,832.3721 446.4501,832.3721 313.86973,832.3721 z "
- style="fill:#ffaa66;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path2164" />
- <path
- transform="translate(47.55914,-118.77957)"
- d="M 296 598.36218 A 54 54 0 1 1 188,598.36218 A 54 54 0 1 1 296 598.36218 z"
- sodipodi:ry="54"
- sodipodi:rx="54"
- sodipodi:cy="598.36218"
- sodipodi:cx="242"
- id="path2190"
- style="fill:#ff5577;fill-opacity:1;stroke:#000000;stroke-width:12.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="translate(229.66129,-27.66129)"
- d="M 296 598.36218 A 54 54 0 1 1 188,598.36218 A 54 54 0 1 1 296 598.36218 z"
- sodipodi:ry="54"
- sodipodi:rx="54"
- sodipodi:cy="598.36218"
- sodipodi:cx="242"
- id="path3165"
- style="fill:#77aaff;fill-opacity:1;stroke:#000000;stroke-width:12.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
-</svg>
Deleted: mgmt/cumin/resources/object-20.png
===================================================================
(Binary files differ)
Deleted: mgmt/cumin/resources/object-36.png
===================================================================
(Binary files differ)
Deleted: mgmt/cumin/resources/object.svg
===================================================================
--- mgmt/cumin/resources/object.svg 2008-04-09 15:55:20 UTC (rev 1890)
+++ mgmt/cumin/resources/object.svg 2008-04-09 15:57:21 UTC (rev 1891)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="744.09448819"
- height="1052.3622047"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.45.1"
- sodipodi:docbase="/home/justin/cumindev/cumin/resources"
- sodipodi:docname="object.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35"
- inkscape:cx="375"
- inkscape:cy="520"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="814"
- inkscape:window-height="619"
- inkscape:window-x="0"
- inkscape:window-y="25" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g3139"
- transform="translate(-194.28571,31.428571)"
- inkscape:export-filename="/home/justin/cumindev/cumin/resources/object-20.png"
- inkscape:export-xdpi="3.4734666"
- inkscape:export-ydpi="3.4734666">
- <rect
- y="100.93361"
- x="317.14285"
- height="505.71429"
- width="505.71429"
- id="rect2166"
- style="fill:#ffaa66;fill-opacity:1;stroke:#000000;stroke-width:12.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)"
- y="438.85617"
- x="79.941772"
- height="147.90282"
- width="147.90282"
- id="rect2160"
- style="fill:#77aaff;fill-opacity:1;stroke:#000000;stroke-width:12.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- transform="translate(485.71428,-20)"
- d="M 282.85715 492.36218 A 88.571434 88.571434 0 1 1 105.71429,492.36218 A 88.571434 88.571434 0 1 1 282.85715 492.36218 z"
- sodipodi:ry="88.571434"
- sodipodi:rx="88.571434"
- sodipodi:cy="492.36218"
- sodipodi:cx="194.28572"
- id="path2162"
- style="fill:#ff5577;fill-opacity:1;stroke:#000000;stroke-width:12.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
-</svg>
Deleted: mgmt/cumin/resources/purple.png
===================================================================
(Binary files differ)
Deleted: mgmt/cumin/resources/queue.svg
===================================================================
--- mgmt/cumin/resources/queue.svg 2008-04-09 15:55:20 UTC (rev 1890)
+++ mgmt/cumin/resources/queue.svg 2008-04-09 15:57:21 UTC (rev 1891)
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="744.09448819"
- height="1052.3622047"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.45.1"
- sodipodi:docbase="/home/justin/cumindev/cumin/resources"
- sodipodi:docname="queue.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.68801116"
- inkscape:cx="441.43343"
- inkscape:cy="526.18109"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="814"
- inkscape:window-height="892"
- inkscape:window-x="33"
- inkscape:window-y="41" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g3146">
- <path
- transform="matrix(0.9063078,0.4226182,-0.4226182,0.9063078,86.342292,293.33708)"
- d="M 552.93207 223.99181 A 195.27341 52.415497 0 1 1 162.38525,223.99181 A 195.27341 52.415497 0 1 1 552.93207 223.99181 z"
- sodipodi:ry="52.415497"
- sodipodi:rx="195.27341"
- sodipodi:cy="223.99181"
- sodipodi:cx="357.65866"
- id="path3134"
- style="fill:#ffaa66;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.50000018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="matrix(0.9063078,0.4226182,-0.4226182,0.9063078,116.01145,231.71374)"
- d="M 552.93207 223.99181 A 195.27341 52.415497 0 1 1 162.38525,223.99181 A 195.27341 52.415497 0 1 1 552.93207 223.99181 z"
- sodipodi:ry="52.415497"
- sodipodi:rx="195.27341"
- sodipodi:cy="223.99181"
- sodipodi:cx="357.65866"
- id="path4105"
- style="fill:#ffaa66;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.50000018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="matrix(0.9063078,0.4226182,-0.4226182,0.9063078,145.68064,170.09034)"
- d="M 552.93207 223.99181 A 195.27341 52.415497 0 1 1 162.38525,223.99181 A 195.27341 52.415497 0 1 1 552.93207 223.99181 z"
- sodipodi:ry="52.415497"
- sodipodi:rx="195.27341"
- sodipodi:cy="223.99181"
- sodipodi:cx="357.65866"
- id="path4109"
- style="fill:#ffaa66;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.50000018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="matrix(0.9063078,0.4226182,-0.4226182,0.9063078,175.34983,108.467)"
- d="M 552.93207 223.99181 A 195.27341 52.415497 0 1 1 162.38525,223.99181 A 195.27341 52.415497 0 1 1 552.93207 223.99181 z"
- sodipodi:ry="52.415497"
- sodipodi:rx="195.27341"
- sodipodi:cy="223.99181"
- sodipodi:cx="357.65866"
- id="path4113"
- style="fill:#ffaa66;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.50000018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- sodipodi:nodetypes="cccccccc"
- id="path5088"
- d="M 454.10516,344.26002 L 399.27203,461.85003 L 359.20085,443.16454 L 406.83279,566.23776 L 529.50338,522.5779 L 489.4322,503.89241 L 544.76381,385.23338 L 454.10516,344.26002 z "
- style="fill:#ff5577;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccccccc"
- id="path4117"
- d="M 310.19505,419.15001 L 365.02818,301.56001 L 324.95699,282.87451 L 449.85377,240.25274 L 495.25952,362.28789 L 455.18834,343.60238 L 399.85673,462.26141 L 310.19505,419.15001 z "
- style="fill:#77aaff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
-</svg>
Added: mgmt/cumin/resources/sort-arrow-down.png
===================================================================
(Binary files differ)
Property changes on: mgmt/cumin/resources/sort-arrow-down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: mgmt/cumin/resources/sort-arrow-up.png
===================================================================
(Binary files differ)
Property changes on: mgmt/cumin/resources/sort-arrow-up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: mgmt/cumin/resources/sort-arrows.svg
===================================================================
--- mgmt/cumin/resources/sort-arrows.svg (rev 0)
+++ mgmt/cumin/resources/sort-arrows.svg 2008-04-09 15:57:21 UTC (rev 1891)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docbase="/home/jross/cumindev/cumin/resources"
+ sodipodi:docname="sort-arrows.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="TRUE">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2843" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="9.8376319"
+ inkscape:cx="216.45321"
+ inkscape:cy="595.66642"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ inkscape:window-width="1222"
+ inkscape:window-height="685"
+ inkscape:window-x="15"
+ inkscape:window-y="159"
+ showgrid="false" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ sodipodi:type="star"
+ style="fill:#4e9fdd;fill-opacity:1;stroke:#bfdce8;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path3635"
+ sodipodi:sides="3"
+ sodipodi:cx="196.37724"
+ sodipodi:cy="473.79459"
+ sodipodi:r1="8.1246452"
+ sodipodi:r2="4.0623226"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.6179939"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 196.37724,481.91923 L 192.85917,475.82575 L 189.34109,469.73226 L 196.37724,469.73226 L 203.41339,469.73226 L 199.89532,475.82575 L 196.37724,481.91923 z"
+ transform="matrix(0.8574412,0,0,1.1203754,32.770882,-76.380025)"
+ inkscape:export-filename="/home/jross/checkouts/mgmt/cumin/resources/sort-arrow-down.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="star"
+ style="fill:#4e9fdd;fill-opacity:1;stroke:#bfdce8;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path3639"
+ sodipodi:sides="3"
+ sodipodi:cx="196.37724"
+ sodipodi:cy="473.79459"
+ sodipodi:r1="8.1246452"
+ sodipodi:r2="4.0623226"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.6179939"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 196.37724,481.91923 L 192.85917,475.82575 L 189.34109,469.73226 L 196.37724,469.73226 L 203.41339,469.73226 L 199.89532,475.82575 L 196.37724,481.91923 z"
+ transform="matrix(0.8574412,0,0,-1.1203754,52.606205,989.8269)"
+ inkscape:export-filename="/home/jross/checkouts/mgmt/cumin/resources/sort-arrow-up.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+</svg>
16 years, 9 months
rhmessaging commits: r1890 - store/trunk/cpp/tests/jrnl/jtt.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-04-09 11:55:20 -0400 (Wed, 09 Apr 2008)
New Revision: 1890
Modified:
store/trunk/cpp/tests/jrnl/jtt/data_src.cpp
store/trunk/cpp/tests/jrnl/jtt/data_src.hpp
Log:
F9 fix
Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-04-09 15:36:42 UTC (rev 1889)
+++ store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-04-09 15:55:20 UTC (rev 1890)
@@ -51,7 +51,7 @@
return true;
}
-const char* const
+const char*
data_src::get_data(const std::size_t offs)
{
if (offs >= max_dsize) return 0;
@@ -77,7 +77,7 @@
return oss.str();
}
-const char* const
+const char*
data_src::get_xid_content(const std::size_t offs)
{
if (offs >= max_xsize) return 0;
Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-04-09 15:36:42 UTC (rev 1889)
+++ store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-04-09 15:55:20 UTC (rev 1890)
@@ -60,13 +60,13 @@
static mutex _m;
public:
- static const char* const get_data(const std::size_t offs);
+ static const char* get_data(const std::size_t offs);
static std::string get_xid(const std::size_t xid_size);
private:
data_src();
static u_int64_t get_xid_cnt() { rhm::journal::slock s(_m.m()); return _xid_cnt++; }
- static const char* const get_xid_content(const std::size_t offs);
+ static const char* get_xid_content(const std::size_t offs);
static bool __init();
};
16 years, 9 months
rhmessaging commits: r1889 - store/trunk/cpp/lib/jrnl.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-04-09 11:36:42 -0400 (Wed, 09 Apr 2008)
New Revision: 1889
Modified:
store/trunk/cpp/lib/jrnl/txn_map.hpp
Log:
F9 fix
Modified: store/trunk/cpp/lib/jrnl/txn_map.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-04-09 15:32:49 UTC (rev 1888)
+++ store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-04-09 15:36:42 UTC (rev 1889)
@@ -43,6 +43,7 @@
#include <map>
#include <pthread.h>
+#include <string>
#include <sys/types.h>
#include <vector>
16 years, 9 months