rhmessaging commits: r3146 - in store/trunk/java: bdbstore and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 08:14:47 -0400 (Wed, 11 Mar 2009)
New Revision: 3146
Added:
store/trunk/java/bdbstore/
store/trunk/java/bdbstore/java/
Removed:
store/trunk/java/bdbstore/
store/trunk/java/bdbstore/java/
Log:
Moved broker-queue-refactor to trunk
Copied: store/trunk/java/bdbstore (from rev 2537, store/branches/java/broker-queue-refactor)
Property changes on: store/trunk/java/bdbstore
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/java (from rev 2923, store/branches/java/broker-queue-refactor/java)
15 years, 9 months
rhmessaging commits: r3145 - in store: trunk/java and 2 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 08:13:42 -0400 (Wed, 11 Mar 2009)
New Revision: 3145
Added:
store/trunk/java/bdbstore/
store/trunk/java/bdbstore/java/
store/trunk/java/bdbstore/java/bdbstore/
Removed:
store/branches/java/broker-queue-refactor/
store/trunk/java/bdbstore/java/
store/trunk/java/bdbstore/java/bdbstore/
store/trunk/java/bdbstore/java/bdbstorebackup/
store/trunk/java/bdbstore/maven/
Log:
Moved broker-queue-refactor to trunk
Copied: store/trunk/java/bdbstore (from rev 2537, store/branches/java/broker-queue-refactor)
Property changes on: store/trunk/java/bdbstore
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/java (from rev 2923, store/branches/java/broker-queue-refactor/java)
Copied: store/trunk/java/bdbstore/java/bdbstore (from rev 3143, store/branches/java/broker-queue-refactor/java/bdbstore)
15 years, 9 months
rhmessaging commits: r3144 - store/trunk/java.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 08:08:40 -0400 (Wed, 11 Mar 2009)
New Revision: 3144
Removed:
store/trunk/java/Building with qpid java with bdb.txt
store/trunk/java/bdbstore/
Log:
Removed old trunk BDBStore module
Deleted: store/trunk/java/Building with qpid java with bdb.txt
===================================================================
--- store/trunk/java/Building with qpid java with bdb.txt 2009-03-11 11:23:01 UTC (rev 3143)
+++ store/trunk/java/Building with qpid java with bdb.txt 2009-03-11 12:08:40 UTC (rev 3144)
@@ -1,32 +0,0 @@
-Email from Rafael Schloming <rafaels(a)redhat.com> to dev(a)etp.108.redhat.com
---------------------------------------------------------------------------
-
-At the moment you can do this by checking out the following url from the
-subversion repository:
-
-https://etp.108.redhat.com/svn/etp/messaging/trunk
-
-There is currently an svn:externals definition that will check out the
-qpid code from the apache repository and overlay the bdbstore module
-onto that checkout. From that checkout you can build the code exactly as
-it used to be in the etp repository with the following command:
-
-ant -Dmodules.extra=bdbstore,bdbstore/test
-
-You can also put that modules.extra definition into build.properties,
-just don't check it in accidentally because it will end up going into
-the apache repository.
-
-There are a couple of gotchas to this system. For one thing local tags,
-branches, and revision numbers have no meaning in external repositories.
-That means if you want to tag, branch, or snapshot the etp repository
-you also need to coordinate with a tag, branch, or snapshot of any
-external repos.
-
-Also, the default config.xml no longer uses the BDB message store, so
-that needs to be modified locally as well.
-
-Obviously this system could use some improvement, but I believe it all
-works for the moment.
-
---Rafael
\ No newline at end of file
15 years, 9 months
rhmessaging commits: r3143 - in store/branches/java/broker-queue-refactor/java/bdbstore/src: test/java/org/apache/qpid/server/store/berkeleydb and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 07:23:01 -0400 (Wed, 11 Mar 2009)
New Revision: 3143
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java
store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
Update to comments, removed unused getNewMessageId() method
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-03-10 15:08:30 UTC (rev 3142)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-03-11 11:23:01 UTC (rev 3143)
@@ -42,7 +42,6 @@
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.ContentChunk;
import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.queue.MessageFactory;
@@ -244,7 +243,7 @@
{
stateTransition(State.CONFIGURING, State.CONFIGURED);
- //If we have loaded an environment and have virtualHost configured then recover environment
+ //If we have loaded an environment and have virtualHost configured then load environment
if (!newEnvironment && virtualHost != null)
{
// this recovers durable queues and persistent messages
@@ -1299,16 +1298,6 @@
}
/**
- * Return a valid, currently unused message id.
- *
- * @return A fresh message id.
- */
- public Long getNewMessageId()
- {
- return _messageId.getAndIncrement();
- }
-
- /**
* Stores a chunk of message data.
*
* @param context The transactional context for the operation.
@@ -1944,7 +1933,7 @@
}
catch (AMQException e)
{
- //todo As we are jus swallowing exception need to add clean up in recover().
+ //todo As we are jus swallowing exception need to add clean up in load().
// This should purge any message content that doesn't have any delivery records.
_log.debug("Error occured removing unreferenced message:" + e.getMessage());
}
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java 2009-03-10 15:08:30 UTC (rev 3142)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java 2009-03-11 11:23:01 UTC (rev 3143)
@@ -69,7 +69,7 @@
{
try
{
- //Stop the connection to prevent flow
+ //Stop the connection to prevent unload
connection.stop();
//Create Consumer to receive msgs
MessageConsumer consumer = session.createConsumer(_queue);
@@ -88,7 +88,7 @@
Thread.sleep(1000);
_logger.info("***** SLEEP");
- //Allw the messages to flow to us
+ //Allw the messages to unload to us
connection.start();
_logger.info("***** START Consumer");
//*** Starts Async process
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2009-03-10 15:08:30 UTC (rev 3142)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2009-03-11 11:23:01 UTC (rev 3143)
@@ -417,7 +417,7 @@
//
// queue.stop();
//
- // An alternative approach was taken here: If we don't recover the store
+ // An alternative approach was taken here: If we don't load the store
_count++;
}
};
15 years, 9 months
rhmessaging commits: r3142 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-03-10 11:08:30 -0400 (Tue, 10 Mar 2009)
New Revision: 3142
Modified:
mgmt/trunk/cumin/python/cumin/brokerlink.strings
Log:
Adding an updatePeer javascript function that was missing.
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.strings 2009-03-05 21:26:36 UTC (rev 3141)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.strings 2009-03-10 15:08:30 UTC (rev 3142)
@@ -47,6 +47,34 @@
<div>{hidden_inputs}</div>
</form>
+[PeerView.javascript]
+function updatePeer(data) {
+ var model = data.objectify();
+ var peers = model.peer;
+ var peer;
+
+ for (var key in peers) {
+ peer = peers[key];
+ break;
+ }
+
+ cumin.runModelListeners(model);
+ cumin.runObjectListeners(peer);
+
+ //throw new Error();
+}
+[PeerView.html]
+<script type="text/javascript">
+{script}
+</script>
+
+{status}
+
+{summary}
+
+{tabs}
+
+
[PeerRouteSet.sql]
select
b.id,
@@ -132,9 +160,7 @@
</div>
</form>
<script type="text/javascript">
-<![CDATA[
wooly.doc().elembyid("{id}").node.elements[0].focus();
-]]>
</script>
[PeerRouteSetClose.item_html]
15 years, 9 months
rhmessaging commits: r3141 - mgmt/trunk/wooly/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-03-05 16:26:36 -0500 (Thu, 05 Mar 2009)
New Revision: 3141
Modified:
mgmt/trunk/wooly/python/wooly/parameters.py
Log:
Allow DictParameter values of ""
Modified: mgmt/trunk/wooly/python/wooly/parameters.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/parameters.py 2009-03-05 21:22:19 UTC (rev 3140)
+++ mgmt/trunk/wooly/python/wooly/parameters.py 2009-03-05 21:26:36 UTC (rev 3141)
@@ -36,7 +36,7 @@
keys[stuff_1] = dict()
self.split_stuff(keys[stuff_1], stuff_2, value)
else:
- if value:
+ if value is not None:
keys[stuff_1] = value
elif stuff_1 in keys:
del keys[stuff_1]
15 years, 9 months
rhmessaging commits: r3140 - in mgmt/trunk: wooly/python/wooly and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-03-05 16:22:19 -0500 (Thu, 05 Mar 2009)
New Revision: 3140
Modified:
mgmt/trunk/cumin/python/cumin/binding.py
mgmt/trunk/wooly/python/wooly/forms.strings
Log:
Fix for when there are more than one set of Submit/Cancel buttons on the page.
Modified: mgmt/trunk/cumin/python/cumin/binding.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.py 2009-03-05 20:46:28 UTC (rev 3139)
+++ mgmt/trunk/cumin/python/cumin/binding.py 2009-03-05 21:22:19 UTC (rev 3140)
@@ -332,30 +332,50 @@
for exchange in form_binding_info:
type = form_binding_info[exchange]["type"]
if (type == "topic") or (type == "direct"):
- if not "key" in form_binding_info[exchange]:
+ try:
+ val = form_binding_info[exchange]["key"]
+ if not val:
+ raise KeyError
+ except KeyError:
name = form_binding_info[exchange]["name"]
errs = berrs.setdefault(name, list())
errs.append("A binding key is required")
elif type == "headers":
- if not "key" in form_binding_info[exchange]:
+ try:
+ val = form_binding_info[exchange]["key"]
+ if not val:
+ raise KeyError
+ except KeyError:
name = form_binding_info[exchange]["name"]
errs = berrs.setdefault(name, dict())
errs["key"] = ["A binding key is required"]
for key_num in ("1", "2", "3"):
mkey = "mkey."+key_num
mkeynv = mkey+".nv"
- if mkeynv in binding_info[exchange]:
- if not mkey in binding_info[exchange]:
+ if mkeynv in binding_info[exchange] and binding_info[exchange][mkeynv]:
+ try:
+ val = binding_info[exchange][mkey]
+ if not val:
+ raise KeyError
+ except KeyError:
name = binding_info[exchange]["name"]
if not name in berrs:
berrs.setdefault(name, dict())
berrs[name][mkey] = ["Missing key"]
elif type == "xml":
- if not "key" in form_binding_info[exchange]:
+ try:
+ val = form_binding_info[exchange]["key"]
+ if not val:
+ raise KeyError
+ except KeyError:
name = form_binding_info[exchange]["name"]
errs = berrs.setdefault(name, dict())
errs["key"] = ["A binding key is required"]
- if not "xquery" in binding_info[exchange]:
+ try:
+ val = binding_info[exchange]["xquery"]
+ if not val:
+ raise KeyError
+ except KeyError:
name = binding_info[exchange]["name"]
if not name in berrs:
berrs.setdefault(name, dict())
@@ -379,7 +399,7 @@
form_binding_info[this_exchange] = dict()
form_binding_info[this_exchange]["name"] = binding_info[this_exchange]["name"]
- if "key" in binding_info[this_exchange]:
+ if "key" in binding_info[this_exchange] and binding_info[this_exchange]["key"]:
form_binding_info[this_exchange]["key"] = binding_info[this_exchange]["key"]
form_binding_info[this_exchange]["type"] = type
Modified: mgmt/trunk/wooly/python/wooly/forms.strings
===================================================================
--- mgmt/trunk/wooly/python/wooly/forms.strings 2009-03-05 20:46:28 UTC (rev 3139)
+++ mgmt/trunk/wooly/python/wooly/forms.strings 2009-03-05 21:22:19 UTC (rev 3140)
@@ -12,17 +12,22 @@
[FormButton.javascript]
// needed because IE will send the content instead of the value for form buttons
-function click_button(id, value) {
- var oHidden = document.getElementById(id);
- if (oHidden) {
+function click_button(name, value) {
+ var oHidden = document.forms[0].elements[name];
+ // in case there is more than one submit or cancel button
+ if (oHidden.length > 1) {
+ for (var i=0; i<oHidden.length; i++) {
+ oHidden[i].value = value;
+ }
+ } else {
oHidden.value = value;
}
return true;
}
[FormButton.html]
-<button class="{class}" type="{type}" tabindex="{tab_index}" {disabled_attr} onclick="return {onclick}('{id}', '{value}')">{content}</button>
-<input type="hidden" id="{id}" name="{name}" value="" />
+<button class="{class}" type="{type}" tabindex="{tab_index}" {disabled_attr} onclick="return {onclick}('{name}', '{value}')">{content}</button>
+<input type="hidden" name="{name}" value="" />
[ScalarInput.html]
<input type="text" name="{name}" value="{value}" tabindex="{tab_index}" {disabled_attr} size="{size}"/>
15 years, 9 months
rhmessaging commits: r3139 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2009-03-05 15:46:28 -0500 (Thu, 05 Mar 2009)
New Revision: 3139
Modified:
mgmt/trunk/cumin/python/cumin/tools.py
Log:
Allow passing in a password non-interactively
Modified: mgmt/trunk/cumin/python/cumin/tools.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/tools.py 2009-02-26 17:19:48 UTC (rev 3138)
+++ mgmt/trunk/cumin/python/cumin/tools.py 2009-03-05 20:46:28 UTC (rev 3139)
@@ -122,7 +122,7 @@
command.description = "List existing QMF servers"
command = self.AddUser(self, "add-user")
- command.arguments = ("NAME",)
+ command.arguments = ("NAME", "[PASSWORD]")
command.description = "Add a new user called NAME"
command = self.RemoveUser(self, "remove-user")
@@ -289,7 +289,12 @@
print "Error: a user called '%s' already exists" % name
sys.exit(1)
- crypted = crypt_password(prompt_password())
+ try:
+ password = args[2]
+ except IndexError:
+ password = prompt_password()
+
+ crypted = crypt_password(password)
try:
subject = Subject(name=name, password=crypted)
15 years, 9 months