rhmessaging commits: r3263 - store/trunk/java/bdbstore/etc/scripts.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-04-03 14:20:09 -0400 (Fri, 03 Apr 2009)
New Revision: 3263
Modified:
store/trunk/java/bdbstore/etc/scripts/bdbtest.sh
Log:
Update BDBTest Script to use qpid-run
Modified: store/trunk/java/bdbstore/etc/scripts/bdbtest.sh
===================================================================
--- store/trunk/java/bdbstore/etc/scripts/bdbtest.sh 2009-04-03 17:47:28 UTC (rev 3262)
+++ store/trunk/java/bdbstore/etc/scripts/bdbtest.sh 2009-04-03 18:20:09 UTC (rev 3263)
@@ -1,5 +1,28 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+if [ -z "$QPID_HOME" ]; then
+ export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+ export PATH=${PATH}:${QPID_HOME}/bin
+fi
+
# Parse arguements taking all - prefixed args as JAVA_OPTS
for arg in "$@"; do
if [[ $arg == -java:* ]]; then
@@ -9,4 +32,12 @@
fi
done
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx256m -Dbadger.level=warn -Damqj.test.logging.level=warn -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-bdbstore-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar org.apache.qpid.ping.PingDurableClient -o $QPID_WORK/results ${ARGS}
+VERSION=0.5
+
+# Set classpath to include Qpid jar with all required jars in manifest
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar
+
+# Set other variables used by the qpid-run script before calling
+export JAVA=java JAVA_MEM=-Xmx256m QPID_CLASSPATH=$QPID_LIBS
+
+. qpid-run -Dlog4j.configuration=perftests.log4j -Dbadger.level=warn -Damqj.test.logging.level=warn -Damqj.logging.level=warn ${JAVA_OPTS} org.apache.qpid.ping.PingDurableClient -o $QPID_WORK/results ${ARGS}
15 years, 3 months
rhmessaging commits: r3262 - store/branches/java/0.5-release.
by rhmessaging-commits＠lists.jboss.org
Author: aidanskinner
Date: 2009-04-03 13:47:28 -0400 (Fri, 03 Apr 2009)
New Revision: 3262
Added:
store/branches/java/0.5-release/bdbstore/
Log:
branch for 0.5 baby
Copied: store/branches/java/0.5-release/bdbstore (from rev 3261, store/trunk/java/bdbstore)
15 years, 3 months
rhmessaging commits: r3261 - in store/trunk/java/bdbstore/src: test/java/org/apache/qpid/server/store/berkeleydb and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-04-03 13:46:30 -0400 (Fri, 03 Apr 2009)
New Revision: 3261
Added:
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestableBDBMessageStore.java
Modified:
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
QPID-1764 : Created TestableBDBMessageStore to be in line with TestableMMS using the TestTransactionLog interface. This will allow us to keep the testing code out of the main TransactionLogs.
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 17:35:57 UTC (rev 3260)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 17:46:30 UTC (rev 3261)
@@ -86,52 +86,50 @@
*/
public class BDBMessageStore implements TransactionLog, RoutingTable
{
- private static final Logger _log = Logger.getLogger(BDBMessageStore.class);
+ protected static final Logger _log = Logger.getLogger(BDBMessageStore.class);
private static final int DATABASE_FORMAT_VERSION = 2;
private static final String DATABASE_FORMAT_VERSION_PROPERTY = "version";
public static final String ENVIRONMENT_PATH_PROPERTY = "environment-path";
- private Environment _environment;
+ protected Environment _environment;
- private String MESSAGEMETADATADB_NAME = "messageMetaDataDb";
+ protected String MESSAGEMETADATADB_NAME = "messageMetaDataDb";
/**
* Maps from messageId to an AMQMessage (note we don't use serialisation but this is what it roughly corresponds
* to)
*/
- private Database _messageMetaDataDb;
+ protected Database _messageMetaDataDb;
- private String MESSAGECONTENTDB_NAME = "messageContentDb";
+ protected String MESSAGECONTENTDB_NAME = "messageContentDb";
- private Database _messageContentDb;
+ protected Database _messageContentDb;
private String QUEUEDB_NAME = "queueDb";
/** Maps from name (which uniquely identifies a queue) to an AMQQueue */
- private Database _queueDb;
+ protected Database _queueDb;
- private String DELIVERYDB_NAME = "deliveryDb";
+ protected String DELIVERYDB_NAME = "deliveryDb";
/** Maps from a queue name to a message id. This is what stores the pending deliveries for a given queue */
- private Database _deliveryDb;
+ protected Database _deliveryDb;
- private String EXCHANGEDB_NAME = "exchangeDb";
- private Database _exchangeDb;
+ protected String EXCHANGEDB_NAME = "exchangeDb";
+ protected Database _exchangeDb;
- private String QUEUEBINDINGSDB_NAME = "queueBindingsDb";
- private Database _queueBindingsDb;
+ protected String QUEUEBINDINGSDB_NAME = "queueBindingsDb";
+ protected Database _queueBindingsDb;
- private VirtualHost _virtualHost;
+ protected VirtualHost _virtualHost;
- private final AtomicLong _messageId = new AtomicLong(1);
+ protected final AtomicLong _queueId = new AtomicLong(1);
- private final AtomicLong _queueId = new AtomicLong(1);
-
private final CommitThread _commitThread = new CommitThread("Commit-Thread");
- private Map<AMQShortString, Long> _queueNameToIdMap = new ConcurrentHashMap<AMQShortString, Long>();
+ protected Map<AMQShortString, Long> _queueNameToIdMap = new ConcurrentHashMap<AMQShortString, Long>();
// Factory Classes to create the TupleBinding objects that relfect the version instance of this BDBStore
private QueueTupleBindingFactory _queueTupleBindingFactory;
@@ -1388,7 +1386,7 @@
*
* @throws AMQException If the operation fails for any reason, or if the specified message does not exist.
*/
- public MessageMetaData getMessageMetaData(StoreContext context, Long messageId) throws AMQException
+ protected MessageMetaData getMessageMetaData(StoreContext context, Long messageId) throws AMQException
{
if (_log.isDebugEnabled())
{
@@ -1692,8 +1690,6 @@
queue.enqueue(context, message);
}
-
- _messageId.set(maxId + 1);
}
catch (DatabaseException e)
{
Added: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestableBDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestableBDBMessageStore.java (rev 0)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestableBDBMessageStore.java 2009-04-03 17:46:30 UTC (rev 3261)
@@ -0,0 +1,128 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.store.berkeleydb;
+
+import com.sleepycat.bind.EntryBinding;
+import com.sleepycat.je.Cursor;
+import com.sleepycat.je.DatabaseEntry;
+import com.sleepycat.je.DatabaseException;
+import com.sleepycat.je.LockMode;
+import com.sleepycat.je.OperationStatus;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.MessageMetaData;
+import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.store.TestTransactionLog;
+import org.apache.qpid.server.transactionlog.BaseTransactionLog;
+import org.apache.qpid.server.transactionlog.TransactionLog;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class TestableBDBMessageStore extends BDBMessageStore implements TestTransactionLog
+{
+
+ public void setBaseTransactionLog(BaseTransactionLog base)
+ {
+ //no-op as we don't care what the base TransactionLog is.
+ }
+
+ public List<AMQQueue> getMessageReferenceMap(Long messageID)
+ {
+ Cursor cursor = null;
+ try
+ {
+ cursor = _deliveryDb.openCursor(null, null);
+
+ DatabaseEntry key = new DatabaseEntry();
+
+ QueueEntryKey dd = new QueueEntryKey(null, messageID);
+
+ EntryBinding keyBinding = new QueueEntryKey.TupleBinding();
+ keyBinding.objectToEntry(dd, key);
+
+ DatabaseEntry value = new DatabaseEntry();
+
+ List<AMQQueue> queues = new LinkedList<AMQQueue>();
+
+ OperationStatus status = cursor.getSearchKeyRange(key, value, LockMode.DEFAULT);
+ dd = (QueueEntryKey) keyBinding.entryToObject(key);
+
+ while ((status == OperationStatus.SUCCESS) && dd.messageId == messageID)
+ {
+ queues.add(_virtualHost.getQueueRegistry().getQueue(dd.queueName));
+ status = cursor.getNext(key, value, LockMode.DEFAULT);
+ if (status == OperationStatus.SUCCESS)
+ {
+ dd = (QueueEntryKey) keyBinding.entryToObject(key);
+ }
+ }
+
+ return queues;
+ }
+ catch (DatabaseException e)
+ {
+ throw new RuntimeException("Database error: " + e, e);
+ }
+ finally
+ {
+ if (cursor != null)
+ {
+ try
+ {
+ cursor.close();
+ }
+ catch (DatabaseException e)
+ {
+ throw new RuntimeException("Error closing cursor: " + e, e);
+ }
+ }
+ }
+ }
+
+ public MessageMetaData getMessageMetaData(StoreContext context, Long messageId) throws AMQException
+ {
+ return super.getMessageMetaData(context, messageId);
+ }
+
+ public ContentChunk getContentBodyChunk(StoreContext context, Long messageId, int index) throws AMQException
+ {
+ return super.getContentBodyChunk(context, messageId, index);
+ }
+
+ public long getMessageMetaDataSize()
+ {
+ try
+ {
+ return _messageMetaDataDb.count();
+ }
+ catch (DatabaseException e)
+ {
+ throw new RuntimeException("Unable to get count of database");
+ }
+ }
+
+ public TransactionLog getDelegate()
+ {
+ return this;
+ }
+}
15 years, 3 months
rhmessaging commits: r3259 - in store/trunk/java/bdbstore/src: test/java/org/apache/qpid/server/store/berkeleydb and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: aidanskinner
Date: 2009-04-03 12:37:37 -0400 (Fri, 03 Apr 2009)
New Revision: 3259
Modified:
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
Log:
QPID-1730: Queues lose their configuration on recovery since it's not peristed to disk.
BDBMessageStore.recovery: reconfigure queues with their virtual host on recovery.
BDBStoreTest.testRecovery: check that queues get the correct MaximumMessageAge set.
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 14:06:39 UTC (rev 3258)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 16:37:37 UTC (rev 3259)
@@ -41,6 +41,7 @@
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.server.configuration.QueueConfiguration;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.queue.AMQQueue;
@@ -68,6 +69,7 @@
import java.util.Map;
import java.util.Queue;
import java.util.TreeMap;
+import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -244,7 +246,7 @@
if (!newEnvironment && virtualHost != null)
{
// this recovers durable queues and persistent messages
- recover();
+ recover(virtualHost);
}
}
@@ -1248,7 +1250,7 @@
}
}
- public void recover() throws AMQException
+ public void recover(VirtualHost virtualHost) throws AMQException
{
stateTransition(State.CONFIGURED, State.RECOVERING);
@@ -1259,6 +1261,11 @@
beginTran(context);
Map<AMQShortString, AMQQueue> queues = loadQueues();
+ for (AMQQueue q : queues.values())
+ {
+ q.configure(virtualHost.getConfiguration().getQueueConfiguration(q.getName().asString()));
+ }
+
recoverExchanges();
deliverMessages(context, queues);
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2009-04-03 14:06:39 UTC (rev 3258)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2009-04-03 16:37:37 UTC (rev 3259)
@@ -38,6 +38,7 @@
import org.apache.qpid.server.routing.RoutingTable;
import org.apache.qpid.server.transactionlog.TestableTransactionLog;
import org.apache.qpid.server.transactionlog.TransactionLog;
+import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
import org.apache.qpid.server.exchange.DirectExchange;
@@ -101,8 +102,15 @@
_routingTable = _bdbMessageStore;
- VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration("test", new PropertiesConfiguration());
-
+ PropertiesConfiguration config = new PropertiesConfiguration();
+
+ // This is used to test that recovery will correctly reapply configuration to the queues
+ // in testRecovery
+ config.setProperty("queues.maximumMessageAge", "23");
+
+ VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration("test", config, new ServerConfiguration(config));
+
+
_transactionLog = new TestableTransactionLog(_bdbMessageStore.configure(BDB_DIR));
_virtualHost = new VirtualHost(vhostConfig, _transactionLog);
@@ -122,7 +130,7 @@
env.addProperty("store.class", "org.apache.qpid.server.transactionlog.TestableTransactionLog");
env.addProperty("store.delegate", "org.apache.qpid.server.store.berkeleydb.BDBMessageStore");
-
+ env.setProperty("queues.maximumMessageAge", 23);
_virtualHost = new VirtualHost(new VirtualHostConfiguration("test", env));
_transactionLog = _virtualHost.getTransactionLog();
}
@@ -474,6 +482,9 @@
Assert.assertEquals("Queue1 has incorrect message count", 3, q1.getMessageCount());
Assert.assertNotNull("Queue2 is was not recovered", q2);
Assert.assertEquals("Queue2 has incorrect message count", 1, q2.getMessageCount());
+
+ // Message age is set in setUp
+ assertEquals("q1 has an incorrect maximum message age", 23, q1.getMaximumMessageAge());
}
catch (Exception e)
{
15 years, 3 months
rhmessaging commits: r3258 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2009-04-03 10:06:39 -0400 (Fri, 03 Apr 2009)
New Revision: 3258
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Fix mint model reference
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2009-04-03 13:59:17 UTC (rev 3257)
+++ mgmt/trunk/cumin/python/cumin/model.py 2009-04-03 14:06:39 UTC (rev 3258)
@@ -312,7 +312,7 @@
def get_session_by_object(self, object):
assert object
- broker = self.mint.model.mintBrokersById[object.qmfBrokerId]
+ broker = self.model.mint.model.mintBrokersById[object.qmfBrokerId]
return broker.getAmqpSession()
15 years, 3 months
rhmessaging commits: r3257 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2009-04-03 09:59:17 -0400 (Fri, 03 Apr 2009)
New Revision: 3257
Removed:
mgmt/trunk/cumin/python/cumin/brokercluster.py
mgmt/trunk/cumin/python/cumin/brokercluster.strings
mgmt/trunk/cumin/python/cumin/brokerprofile.py
mgmt/trunk/cumin/python/cumin/brokerprofile.strings
mgmt/trunk/cumin/python/cumin/configproperty.py
mgmt/trunk/cumin/python/cumin/realm.py
mgmt/trunk/cumin/python/cumin/realm.strings
mgmt/trunk/cumin/python/cumin/virtualhost.py
mgmt/trunk/cumin/python/cumin/virtualhost.strings
Modified:
mgmt/trunk/cumin/python/cumin/broker.py
mgmt/trunk/cumin/python/cumin/broker.strings
mgmt/trunk/cumin/python/cumin/demo.py
mgmt/trunk/cumin/python/cumin/page.py
mgmt/trunk/cumin/python/cumin/parameters.py
Log:
Remove dead code
Modified: mgmt/trunk/cumin/python/cumin/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/broker.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -4,7 +4,6 @@
from random import random
from psycopg2 import IntegrityError
-from configproperty import *
from queue import *
from exchange import *
from brokerlink import *
@@ -418,8 +417,6 @@
super(BrokerBrowser, self).__init__(app, name)
self.group_tmpl = Template(self, "group_html")
- self.profile_tmpl = Template(self, "profile_html")
- self.cluster_tmpl = Template(self, "cluster_html")
self.brokers = NewBrokerSet(app, "brokers")
self.add_child(self.brokers)
@@ -439,20 +436,6 @@
def render_group_link(self, session, group):
return self._render_filter_link(session, group, self.brokers.group)
- def render_profile_filters(self, session):
- profiles = BrokerProfile.select()
- return self._render_filters(session, profiles, self.profile_tmpl)
-
- def render_profile_link(self, session, profile):
- return self._render_filter_link(session, profile, self.profile)
-
- def render_cluster_filters(self, session):
- clusters = BrokerCluster.select()
- return self._render_filters(session, clusters, self.cluster_tmpl)
-
- def render_cluster_link(self, session, cluster):
- return self._render_filter_link(session, cluster, self.cluster)
-
def _render_filters(self, session, collection, template):
writer = Writer()
Modified: mgmt/trunk/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.strings 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/broker.strings 2009-04-03 13:59:17 UTC (rev 3257)
@@ -148,12 +148,6 @@
[BrokerBrowser.group_html]
<li>{group_link}</li>
-[BrokerBrowser.profile_html]
-<li>{profile_link}</li>
-
-[BrokerBrowser.cluster_html]
-<li>{cluster_link}</li>
-
[BrokerSetForm.css]
table.BrokerSetForm td, table.BrokerSetForm th {
padding: 0.25em;
Deleted: mgmt/trunk/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokercluster.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/brokercluster.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,170 +0,0 @@
-from mint import *
-from wooly import *
-from wooly.widgets import *
-from random import random
-
-from virtualhost import *
-from broker import *
-from widgets import *
-from parameters import *
-from formats import *
-from util import *
-
-strings = StringCatalog(__file__)
-
-class BrokerClusterSet(ItemSet):
- def render_cluster_add_href(self, session, *args):
- branch = session.branch()
- self.page.show_broker_cluster_add(branch)
- return branch.marshal()
-
- def render_title(self, session, *args):
- return "Broker Clusters %s" % fmt_count(BrokerCluster.select().count())
-
- def do_get_items(self, session, *args):
- return BrokerCluster.select()
-
- def render_item_link(self, session, cluster):
- branch = session.branch()
- self.page.show_broker_cluster(branch, cluster).show_view(branch)
- return fmt_olink(branch, cluster)
-
- def render_item_config(self, session, cluster):
- return len(cluster.brokers)
-
- def render_item_status(self, session, cluster):
- writer = Writer()
-
- for broker in sorted_by(cluster.brokers):
- writer.write(fmt_ostatus(broker))
-
- return writer.to_string()
-
-class BrokerClusterFrame(CuminFrame):
- def __init__(self, app, name):
- super(BrokerClusterFrame, self).__init__(app, name)
-
- self.object = BrokerClusterParameter(app, "id")
- self.add_parameter(self.object)
-
- view = BrokerClusterView(app, "view")
- self.add_mode(view)
- self.set_view_mode(view)
-
- edit = BrokerClusterEdit(app, "edit")
- self.add_mode(edit)
- self.set_edit_mode(edit)
-
- remove = BrokerClusterRemove(app, "remove")
- self.add_mode(remove)
- self.set_remove_mode(remove)
-
- self.broker = BrokerFrame(app, "broker")
- self.add_mode(self.broker)
-
- def show_broker(self, session, broker):
- self.broker.set_object(session, broker)
- return self.show_mode(session, self.broker)
-
-class BrokerClusterStatus(CuminStatus):
- pass
-
-class BrokerClusterView(CuminView):
- def __init__(self, app, name):
- super(BrokerClusterView, self).__init__(app, name)
-
- self.status = BrokerClusterStatus(app, "status")
- self.add_child(self.status)
-
- self.tabs = TabbedModeSet(app, "tabs")
- self.add_child(self.tabs)
-
- self.tabs.add_tab(self.ClusterBrokerTab(app, "brokers"))
- self.tabs.add_tab(self.ClusterStatsTab(app, "stats"))
-
- class ClusterBrokerTab(BrokerSet):
- def get_args(self, session):
- return self.frame.get_args(session)
-
- def render_title(self, session, cluster):
- return "Brokers %s" % fmt_count(len(cluster.brokers))
-
- def do_get_items(self, session, cluster):
- return cluster.brokers
-
- class ClusterStatsTab(Widget):
- def get_args(self, session):
- return self.frame.get_args(session)
-
- def render_title(self, session, cluster):
- return "Statistics"
-
-class BrokerClusterForm(CuminForm):
- def __init__(self, app, name):
- super(BrokerClusterForm, self).__init__(app, name)
-
- self.cluster_name = StringInput(app, "name")
- self.add_child(self.cluster_name)
-
- def process_cluster(self, session, cluster):
- cluster.name = self.cluster_name.get(session)
-
- branch = session.branch()
- self.page.show_broker_cluster(branch, cluster).show_view(branch)
- self.page.set_redirect_url(session, branch.marshal())
-
-class BrokerClusterAdd(BrokerClusterForm, Frame):
- def render_title(self, session):
- return "Add Cluster"
-
- def process_cancel(self, session):
- branch = session.branch()
- self.page.main.show(branch)
- self.page.set_redirect_url(session, branch.marshal())
-
- def process_submit(self, session):
- cluster = BrokerCluster()
- self.process_cluster(session, cluster)
-
-class BrokerClusterEdit(BrokerClusterForm, Frame):
- def get_args(self, session):
- return self.frame.get_args(session)
-
- def process_cancel(self, session, cluster):
- branch = session.branch()
- self.parent.show_view(branch)
- self.page.set_redirect_url(session, branch.marshal())
-
- def process_submit(self, session, cluster):
- self.process_cluster(session, cluster)
-
- def process_display(self, session, cluster):
- self.cluster_name.set(session, cluster.name)
-
- def render_title(self, session, cluster):
- return "Edit Cluster '%s'" % cluster.name
-
-class BrokerClusterRemove(CuminConfirmForm):
- def get_args(self, session):
- return self.get_args(session)
-
- def process_cancel(self, session, cluster):
- branch = session.branch()
- self.page.show_broker_cluster(branch, cluster).show_view(branch)
- self.page.set_redirect_url(session, branch.marshal())
-
- def process_submit(self, session, cluster):
- cluster.destroySelf()
-
- branch = session.branch()
- self.page.main.show(branch)
- self.page.set_redirect_url(session, branch.marshal())
-
- def render_title(self, session, cluster):
- return "Remove Broker Cluster '%s'" % cluster.name
-
- def render_submit_content(self, session, cluster):
- return "Yes, Remove Broker Cluster '%s'" % cluster.name
-
- def render_cancel_content(self, session, cluster):
- return "No, Cancel"
Deleted: mgmt/trunk/cumin/python/cumin/brokercluster.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokercluster.strings 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/brokercluster.strings 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,107 +0,0 @@
-[BrokerClusterSet.css]
-div.brokerlight {
- float: left;
- width: 1em;
- height: 1em;
- margin: 0.25em 1px 0 0;
- padding: 0;
- background-color: #6f6;
-}
-
-div.brokerlight.red {
- background-color: red;
-}
-
-[BrokerClusterSet.html]
-<ul class="actions">
- <li><a class="nav" href="{cluster_add_href}">Add Broker Cluster</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Name</th>
- <th>Brokers</th>
- <th>Status</th>
- </tr>
-
- {items}
-</table>
-
-[BrokerClusterSet.item_html]
-<tr>
- <td>{item_link}</td>
- <td>{item_config}</td>
- <td>{item_status}</td>
-</tr>
-
-[BrokerClusterSet.broker_html]
-<div class="brokerlight {broker_status}"></div>
-
-[BrokerClusterView.html]
-{status}
-
-<h1><img src="resource?name=cluster-36.png" alt="cluster" />{title}</h1>
-
-<table class="props">
- <tr><th>Name</th><td>{name}</td></tr>
- <tr>
- <th class="actions" colspan="2">
- <h2>Act on This Cluster:</h2>
- <a class="nav" href="{edit_href}">Edit</a>
- <a href="{remove_href}">Remove</a>
- <a href="{href}">Start</a>
- <a href="{href}">Stop</a>
- </th>
- </tr>
-</table>
-
-{tabs}
-
-[ClusterVirtualHostTab.html]
-<ul class="actions">
- <li><a href="">Add Functional Host</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Functional Host</th>
- <th>Configuration</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ClusterVirtualHostTab.item_html]
-<tr>
- <td>{item_link}</td>
- <td>10 queues, 5 exchanges</td>
- <td><a class="action" href="">Remove</a></td>
-</tr>
-
-[BrokerClusterForm.html]
-<form id="{id}" class="mform" method="post" action="?">
- <div class="head">
- <h1>{title}</h1>
- </div>
- <div class="body">
- <span class="legend">Name</span>
- <fieldset>{name}</fieldset>
-
- {hidden_inputs}
- </div>
- <div class="foot">
- {help}
- {submit}
- {cancel}
- </div>
-</form>
-<script type="text/javascript" defer="defer">
-//<![CDATA[
-(function() {
- var elem = wooly.doc().elembyid("{id}").node.elements[1];
- elem.focus();
- elem.select();
-}())
-//]]>
-</script>
Deleted: mgmt/trunk/cumin/python/cumin/brokerprofile.py
===================================================================
Deleted: mgmt/trunk/cumin/python/cumin/brokerprofile.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerprofile.strings 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/brokerprofile.strings 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,103 +0,0 @@
-[BrokerProfileSet.html]
-<ul class="actions">
- <li><a class="nav" href="{profile_add_href}">Add Broker Profile</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Name</th>
- </tr>
-
- {items}
-</table>
-
-[BrokerProfileSet.item_html]
-<tr>
- <td>{item_link}</td>
-</tr>
-
-[BrokerProfileView.html]
-<h1><img src="resource?name=profile-36.png" alt="profile" /> {title}</h1>
-
-<table class="props">
- <tr><th>Name</th><td>{name}</td></tr>
- <tr>
- <th class="actions" colspan="2">
- <h2>Act on This Profile:</h2>
- <a class="nav" href="{edit_href}">Edit</a>
- <a href="{remove_href}">Remove</a>
- </th>
- </tr>
-</table>
-
-{tabs}
-
-[ProfileConfigTab.html]
-<ul class="actions">
- <li><a href="">Add Property</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Name</th>
- <th>Configured Value</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ProfileConfigTab.item_html]
-<tr>
- <td>{item_name}</td>
- <td>{item_value}</td>
- <td><a class="action" href="">Edit</a></td>
-</tr>
-
-[ProfileBrokerTab.html]
-<ul class="actions">
- <li><a href="">Apply Profile Configuration to Brokers</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Name</th>
- <th>Configuration Status</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ProfileBrokerTab.item_html]
-<tr>
- <td>{item_link}</td>
- <td><a href="{item_config_href}">{item_config_status}</a></td>
-</tr>
-
-[BrokerProfileForm.html]
-<form id="{id}" class="mform" method="post" action="?">
- <div class="head">
- <h1>{title}</h1>
- </div>
- <div class="body">
- <span class="legend">Name</span>
- <fieldset>{name}</fieldset>
-
- {hidden_inputs}
- </div>
- <div class="foot">
- {help}
- {submit}
- {cancel}
- </div>
-</form>
-<script type="text/javascript" defer="defer">
-//<![CDATA[
-(function() {
- var elem = wooly.doc().elembyid("{id}").node.elements[1];
- elem.focus();
- elem.select();
-}())
-//]]>
-</script>
Deleted: mgmt/trunk/cumin/python/cumin/configproperty.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/configproperty.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/configproperty.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,16 +0,0 @@
-from wooly import *
-from wooly.widgets import *
-
-from widgets import *
-from parameters import *
-from util import *
-
-class ConfigPropertySet(ItemSet):
- def do_get_items(self, session, *args):
- return sorted_by(model.get_config_properties())
-
- def render_item_name(self, session, prop):
- return prop.name
-
- def render_item_value(self, session, prop):
- return prop.value
Modified: mgmt/trunk/cumin/python/cumin/demo.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/demo.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/demo.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -21,20 +21,6 @@
CollectorRegistration(name="main", collectorId="main")
- #profiles = list()
-
- #for name in ("4S Xserve", "2S ProLiant"):
- # profile = BrokerProfile(name=name)
- # profiles.append(profile)
-
- # self.load_props(profile)
-
- #clusters = list()
-
- #for cluster_count in range(3):
- # cluster = BrokerCluster(name=fmt("cluster", cluster_count))
- # clusters.append(cluster)
-
def load_props(self, obj):
prop = ConfigProperty()
prop.name = "max_threads"
Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/page.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -337,8 +337,6 @@
self.add_tab(BrokerBrowser(app, "brokers"))
self.add_tab(BrokerGroupSet(app, "groups"))
- #self.add_tab(BrokerProfileSet(app, "profiles"))
- #self.add_tab(BrokerClusterSet(app, "clusters"))
class Heading(CuminHeading):
def render_title(self, session):
Modified: mgmt/trunk/cumin/python/cumin/parameters.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/parameters.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/parameters.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -19,13 +19,6 @@
def do_marshal(self, cls):
return cls.cumin_name
-class BrokerClusterParameter(Parameter):
- def do_unmarshal(self, string):
- return BrokerCluster.get(int(string))
-
- def do_marshal(self, cluster):
- return str(cluster.id)
-
class BrokerGroupParameter(Parameter):
def do_unmarshal(self, string):
if string == "__none__":
@@ -55,13 +48,6 @@
def do_marshal(self, broker):
return str(broker.id)
-class BrokerProfileParameter(Parameter):
- def do_unmarshal(self, string):
- return BrokerProfile.get(int(string))
-
- def do_marshal(self, profile):
- return str(profile.id)
-
class ConnectionParameter(Parameter):
def do_unmarshal(self, string):
return ClientConnection.get(int(string))
@@ -183,10 +169,3 @@
def do_marshal(self, session):
return str(session.id)
-
-class VirtualHostParameter(Parameter):
- def do_unmarshal(self, string):
- return Vhost.get(int(string))
-
- def do_marshal(self, vhost):
- return str(vhost.id)
Deleted: mgmt/trunk/cumin/python/cumin/realm.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/realm.py 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/realm.py 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,40 +0,0 @@
-from wooly import *
-from wooly.widgets import *
-from wooly.forms import *
-from wooly.resources import *
-
-from widgets import *
-from parameters import *
-from util import *
-
-strings = StringCatalog(__file__)
-
-class RealmSet(ItemSet):
- def render_title(self, session, vhost):
- return "Realms %s" % fmt_count(len(vhost.realm_items()))
-
- def do_get_items(self, session, vhost):
- return sorted_by(vhost.realm_items())
-
- def render_item_name(self, session, realm):
- return realm.name
-
-class RealmInputSet(CheckboxInputSet):
- def __init__(self, app, name):
- super(RealmInputSet, self).__init__(app, name)
-
- param = ListParameter(app, "param", RealmParameter(app, "item"))
- self.add_parameter(param)
- self.set_parameter(param)
-
- def do_get_items(self, session, vhost):
- return sorted_by(vhost.realm_items())
-
- def render_item_value(self, session, realm):
- return realm.id
-
- def render_item_content(self, session, realm):
- return realm.name
-
- def render_item_checked_attr(self, session, realm):
- return realm in self.param.get(session) and "checked=\"checked\""
Deleted: mgmt/trunk/cumin/python/cumin/realm.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/realm.strings 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/realm.strings 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,13 +0,0 @@
-[RealmInputSet.item_html]
-<div class="field">
- <input type="checkbox" name="{name}" value="{item_value}" tabindex="{tab_index}" {item_checked_attr}/>
- {item_content}
-</div>
-
-[RealmSet.html]
-<ul class="RealmSet mobjects">{items}</ul>
-
-[RealmSet.item_html]
-<li>
- <strong><a href="{item_href}">{item_name}</a></strong>
-</li>
Deleted: mgmt/trunk/cumin/python/cumin/virtualhost.py
===================================================================
Deleted: mgmt/trunk/cumin/python/cumin/virtualhost.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/virtualhost.strings 2009-04-03 11:02:44 UTC (rev 3256)
+++ mgmt/trunk/cumin/python/cumin/virtualhost.strings 2009-04-03 13:59:17 UTC (rev 3257)
@@ -1,34 +0,0 @@
-[VirtualHostSet.html]
-<table class="VirtualHostSet mobjects">
- <tr>
- <th>Functional Host</th>
- <th>Configuration</th>
- <th>Status</th>
- </tr>
-
- {items}
-</table>
-
-[VirtualHostSet.item_html]
-<tr>
- <td>{item_link}</td>
- <td>10 queues, 5 exchanges</td>
- <td>2 errors, 10 warnings</td>
-</tr>
-
-[VirtualHostView.html]
-<div class="mstatus green" id="{id}">
- <h2>Functional Host Status</h2>
-
- <div>0 errors, 0 warnings</div>
-</div>
-
-<h1>{title}</h1>
-
-<table class="props">
- <tr><th>Name</th><td>{name}</td></tr>
- <tr><th>Broker</th><td>{broker_link}</td></tr>
- <tr><th>Cluster</th><td>{cluster_link}</td></tr>
-</table>
-
-{tabs}
15 years, 3 months
rhmessaging commits: r3256 - in store/trunk/java/bdbstore: src/main/java/org/apache/qpid/server/store/berkeleydb and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-04-03 07:02:44 -0400 (Fri, 03 Apr 2009)
New Revision: 3256
Modified:
store/trunk/java/bdbstore/build.xml
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
Removed debug lines that were left in last commit.
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2009-04-03 10:14:17 UTC (rev 3255)
+++ store/trunk/java/bdbstore/build.xml 2009-04-03 11:02:44 UTC (rev 3256)
@@ -39,8 +39,6 @@
<property file="${project.root}/default.testprofile"/>
- <echo message="${project.root} ${file}"/>
-
<path id="class.path">
<fileset dir="lib">
<include name="**/*.jar"/>
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 10:14:17 UTC (rev 3255)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 11:02:44 UTC (rev 3256)
@@ -1145,7 +1145,6 @@
if (_log.isDebugEnabled())
{
_log.debug("commit tran Async(" + context.isAsync() + ") completed");
- new Exception("Async Transaction:"+tx).printStackTrace(System.out);
}
}
catch (DatabaseException e)
15 years, 3 months
rhmessaging commits: r3255 - in store/trunk/java/bdbstore: src/main/java/org/apache/qpid/server/store/berkeleydb and 2 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-04-03 06:14:17 -0400 (Fri, 03 Apr 2009)
New Revision: 3255
Modified:
store/trunk/java/bdbstore/build.xml
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java
store/trunk/java/bdbstore/test-provider.properties
Log:
Update based on QPID-1764 to correct tests and ensure testing can be carried out correctly
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/build.xml 2009-04-03 10:14:17 UTC (rev 3255)
@@ -39,6 +39,8 @@
<property file="${project.root}/default.testprofile"/>
+ <echo message="${project.root} ${file}"/>
+
<path id="class.path">
<fileset dir="lib">
<include name="**/*.jar"/>
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03 10:14:17 UTC (rev 3255)
@@ -1145,6 +1145,7 @@
if (_log.isDebugEnabled())
{
_log.debug("commit tran Async(" + context.isAsync() + ") completed");
+ new Exception("Async Transaction:"+tx).printStackTrace(System.out);
}
}
catch (DatabaseException e)
@@ -1279,10 +1280,11 @@
}
catch (Throwable ioobe)
{
- abortTran(context);
+ abortTran(context);
- throw new AMQException("Invalid database format. Please use upgrade tool for store in Virtualhost:'"
- + _virtualHost.getName() + "'", ioobe.getCause() != null ? ioobe.getCause() : ioobe);
+ Throwable cause = ioobe.getCause() != null ? ioobe.getCause() : ioobe;
+ throw new AMQException("A database error occured during recovery:'" + cause.getMessage() + "'"
+ + _virtualHost.getName() + "'", cause);
}
stateTransition(State.RECOVERING, State.STARTED);
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2009-04-03 10:14:17 UTC (rev 3255)
@@ -111,6 +111,7 @@
}
catch (Exception e)
{
+ System.err.println("Showing stack trace. expecting Unable to load BDBStore error");
e.printStackTrace();
assertTrue("Incorrect Exception Thrown:" + e.getMessage(),
e.getMessage().contains("Unable to load BDBStore as version 1. Store on disk contains version 2 data"));
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java 2009-04-03 10:14:17 UTC (rev 3255)
@@ -240,7 +240,7 @@
// Check that it is enqueued
List<AMQQueue> queueList = _transactionLog.getMessageReferenceMap(messageId);
- assertNotNull(queueList);
+ assertNotNull("Reference map should contain two queues.", queueList);
assertEquals("Message should be enqueued on both queues.", 2, queueList.size());
assertTrue("Queue1 not contained in list.", queueList.contains(_queue1));
assertTrue("Queue2 not contained in list.", queueList.contains(_queue2));
Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java
===================================================================
--- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java 2009-04-03 10:14:17 UTC (rev 3255)
@@ -75,10 +75,24 @@
}
//Reset BDB_WORK
- System.setProperty(BDB_WORK, BDB_WORK_PRE_TEST == null ? "" : BDB_WORK_PRE_TEST);
+ if (BDB_WORK_PRE_TEST == null)
+ {
+ System.clearProperty(BDB_WORK);
+ }
+ else
+ {
+ System.setProperty(BDB_WORK, BDB_WORK_PRE_TEST);
+ }
//Reset QPID_WORK
- System.setProperty(QPID_WORK, QPID_WORK_PRE_TEST == null ? "" : QPID_WORK_PRE_TEST);
+ if (QPID_WORK_PRE_TEST == null)
+ {
+ System.clearProperty(QPID_WORK);
+ }
+ else
+ {
+ System.setProperty(QPID_WORK, QPID_WORK_PRE_TEST);
+ }
}
public void setupWorkDirectory()
Modified: store/trunk/java/bdbstore/test-provider.properties
===================================================================
--- store/trunk/java/bdbstore/test-provider.properties 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/test-provider.properties 2009-04-03 10:14:17 UTC (rev 3255)
@@ -19,16 +19,21 @@
#
#
-connectionfactory.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
+connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5671?ssl='true''
-connectionfactory.vmfailover = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
-connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='vm://:1'
-connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='vm://:2'
+connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673;tcp://localhost:5672'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20''
+connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
+connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
+connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673'
+connectionfactory.connection1.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.connection2.vm = amqp://username:password@clientid/test?brokerlist='vm://:2'
-#queue.MyQueue = example.MyQueue
+queue.MyQueue = example.MyQueue
queue.queue = example.queue
-#queue.xaQueue = xaQueue
+queue.xaQueue = xaQueue
-#topic.xaTopic = xaTopic
-#topic.durableSubscriberTopic = durableSubscriberTopic
+topic.xaTopic = xaTopic
+topic.durableSubscriberTopic = durableSubscriberTopic
15 years, 3 months
rhmessaging commits: r3254 - mgmt/trunk/mint/instance/etc.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2009-04-02 15:52:24 -0400 (Thu, 02 Apr 2009)
New Revision: 3254
Modified:
mgmt/trunk/mint/instance/etc/mint.conf
Log:
(This message was supposed to go with change 3253. I'm doing a
trade.)
Reorganize mint code. A similar change is in the pipeline for cumin.
- Move the main threads onto Mint, from MintModel.
- Rename RegistrationThread to PollThread. Rename ModelUpdateThread
to just UpdateThread. A new simpler naming scheme!
- Rename DBExpireThread to just ExpireThread, to make it symmetric in
the new scheme.
- Now we have the update, poll, and expire threads, in modules of the
same name.
- Move model stuff into its own file, out of __init__.
- Move database stuff into its own file.
- Adapt cumin's model to use Mint.
- Turn on the init-time database and model checks.
Modified: mgmt/trunk/mint/instance/etc/mint.conf
===================================================================
--- mgmt/trunk/mint/instance/etc/mint.conf 2009-04-02 19:49:59 UTC (rev 3253)
+++ mgmt/trunk/mint/instance/etc/mint.conf 2009-04-02 19:52:24 UTC (rev 3254)
@@ -1,3 +1,2 @@
[main]
data: postgresql://cumin@localhost/cumin
-#debug: True
15 years, 3 months