rhmessaging commits: r2415 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 12:32:40 -0400 (Thu, 04 Sep 2008)
New Revision: 2415
Modified:
mgmt/trunk/cumin/python/cumin/job.py
Log:
Uncommenting call to model.job.setad
Converting Ad keys and string values back to unicode for the SetAd call
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-09-04 16:31:03 UTC (rev 2414)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-04 16:32:40 UTC (rev 2415)
@@ -489,11 +489,13 @@
if fval is None:
ads[field]["error"] = "Numeric value expected"
errors = True
- just_ads[field] = fval
+ else:
+ fval = unicode(fval)
+ just_ads[unicode(field)] = fval
if not errors:
- #action = self.app.model.job.saveads
- #action.invoke(job, just_ads)
+ action = self.app.model.job.savead
+ action.invoke(job, just_ads)
self.process_cancel(session, job)
def process_cancel(self, session, job):
17 years, 8 months
rhmessaging commits: r2414 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 12:31:03 -0400 (Thu, 04 Sep 2008)
New Revision: 2414
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Adding call to Job.SetAd
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-09-04 15:47:09 UTC (rev 2413)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-09-04 16:31:03 UTC (rev 2414)
@@ -1551,6 +1551,8 @@
action = self.Remove(self, "remove")
action.summary = True
+
+ action = self.SaveAd(self, "savead")
def get_title(self, session):
return "Job"
@@ -1624,6 +1626,13 @@
def do_invoke(self, job, args, completion):
job.remove(self.cumin_model.data, completion)
+ class SaveAd(CuminAction):
+ def get_title(self, session):
+ return "Save Ad for"
+
+ def do_invoke(self, job, args, completion):
+ job.SaveAd(self.cumin_model.data, completion, args)
+
class CuminScheduler(RemoteClass):
def __init__(self, model):
super(CuminScheduler, self).__init__(model, "scheduler",
17 years, 8 months
rhmessaging commits: r2413 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 11:47:09 -0400 (Thu, 04 Sep 2008)
New Revision: 2413
Modified:
mgmt/trunk/cumin/python/wooly/widgets.py
Log:
Inspect optional 3rd element when displaying properties to determine if value needs to be escaped.
Modified: mgmt/trunk/cumin/python/wooly/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/wooly/widgets.py 2008-09-04 15:45:54 UTC (rev 2412)
+++ mgmt/trunk/cumin/python/wooly/widgets.py 2008-09-04 15:47:09 UTC (rev 2413)
@@ -417,8 +417,12 @@
def render_value(self, session, prop):
value = prop[1]
+ try:
+ escapable = prop[2]
+ except IndexError:
+ escapable = True
- if type(value) is str:
+ if type(value) is str and escapable:
value = escape(value)
elif value is None:
value = "<em>None</em>"
17 years, 8 months
rhmessaging commits: r2412 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 11:45:54 -0400 (Thu, 04 Sep 2008)
New Revision: 2412
Modified:
mgmt/trunk/cumin/python/cumin/widgets.py
Log:
Pass 3rd element in get_items for properties to avoid escaping links
Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py 2008-09-04 15:43:54 UTC (rev 2411)
+++ mgmt/trunk/cumin/python/cumin/widgets.py 2008-09-04 15:45:54 UTC (rev 2412)
@@ -388,7 +388,7 @@
def do_get_items(self, session, object):
cls = self.app.model.get_class_by_object(object)
- return [(x.get_title(session), x.value(session, object))
+ return [(x.get_title(session), x.value(session, object), x.escape)
for x in cls.properties]
class CuminActions(ActionSet):
@@ -437,7 +437,7 @@
class SummaryProperties(CuminProperties):
def do_get_items(self, session, object):
cls = self.app.model.get_class_by_object(object)
- return [(x.get_title(session), x.value(session, object))
+ return [(x.get_title(session), x.value(session, object), x.escape)
for x in cls.properties if x.summary]
class SummaryActions(CuminActions):
17 years, 8 months
rhmessaging commits: r2411 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 11:43:54 -0400 (Thu, 04 Sep 2008)
New Revision: 2411
Modified:
mgmt/trunk/cumin/python/cumin/page.strings
Log:
Style changes for JobEditAds page
Modified: mgmt/trunk/cumin/python/cumin/page.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.strings 2008-09-04 15:42:56 UTC (rev 2410)
+++ mgmt/trunk/cumin/python/cumin/page.strings 2008-09-04 15:43:54 UTC (rev 2411)
@@ -434,19 +434,22 @@
width: 100% !important;
}
+div.inline_help {
+ margin: 1em;
+}
+
div.inline_help span.edit_string,
div.inline_help span.edit_number,
div.inline_help span.numeric_error {
color: #444444;
font-weight: normal;
+ margin-right: 0.5em;
padding:0.05em 0.2em;
}
-div.inline_help ul.legend {
- margin:0.5em 1em;
+div.inline_help h2 {
+ margin-right: 1em;
}
-div.inline_help ul.legend li {
- line-height: 1.75em;
-}
+
span.prop_example {
font-size: 0.9em;
}
17 years, 8 months
rhmessaging commits: r2410 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 11:42:56 -0400 (Thu, 04 Sep 2008)
New Revision: 2410
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Fix escaping of links in properties
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-09-04 15:31:36 UTC (rev 2409)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-09-04 15:42:56 UTC (rev 2410)
@@ -1,6 +1,7 @@
from mint.schema import *
from wooly import *
from wooly.parameters import *
+from wooly.widgets import *
from time import *
from datetime import datetime, timedelta
from types import *
@@ -122,6 +123,7 @@
self.title = None
self.category = "general"
self.summary = False
+ self.escape = True
self.cumin_class.add_property(self)
@@ -1467,6 +1469,9 @@
prop = AdProperty(self, "CondorVersion")
prop.writable = False
+ prop = AdProperty(self, "CondorPlatform")
+ prop.writable = False
+
prop = AdProperty(self, "Owner")
prop.writable = False
@@ -1481,9 +1486,10 @@
prop.renderer = prop.render_status
prop.description = "The current job status"
- #prop = self.SchedulerProperty(self, "Scheduler")
- #prop.title = "Scheduler"
- #prop.summary = True
+ prop = self.SchedulerProperty(self, "scheduler")
+ prop.title = "Scheduler"
+ prop.summary = True
+ prop.escape = False
#prop = self.SubmitterProperty(self, "Owner")
#prop.title = "Submitter"
@@ -1553,32 +1559,38 @@
return str(job.idOriginal)
def show_object(self, session, job):
- return self.cumin_model.show_main(session).show_job(session, job)
+ frame = self.get_pool_frame(session)
+ return frame.show_job(session, job)
+
+ def get_pool_frame(self, session):
+#TODO: # XXX temporary solution
+ for pool in Pool.selectBy(name="main"):
+ break
+
+ frame = self.cumin_model.show_main(session)
+ return frame.show_pool(session, pool)
+
class JobStatusProperty(AdProperty):
def render_status(self, session, status):
return JobStatusInfo.get_status_string(status)
class SubmitterProperty(CuminProperty):
def value(self, session, job):
- value = super(CuminJob.SubmitterProperty, self).value(session, job)
-#TODO: get a Submitter .
- submitter = None
+ submitter = super(CuminJob.SubmitterProperty, self).value(session, job)
branch = session.branch()
- frame = self.cumin_class.show_object(branch, job)
+ frame = self.cumin_class.get_pool_frame(branch)
frame.show_submitter(branch, submitter)
- return value and fmt_olink(branch, job, name=value) or fmt_none()
+ return submitter and escape_amp(fmt_olink(branch, submitter, name=submitter.Name))
class SchedulerProperty(CuminProperty):
def value(self, session, job):
- value = super(CuminJob.SchedulerProperty, self).value(session, job)
-#TODO: get a Scheduler .
- scheduler = None
+ scheduler = job.scheduler
branch = session.branch()
- frame = self.cumin_class.show_object(branch, job)
+ frame = self.cumin_class.get_pool_frame(branch)
frame.show_scheduler(branch, scheduler)
- return value and fmt_olink(branch, job, name=value) or fmt_none()
-
+ return scheduler and escape_amp(fmt_olink(branch, scheduler, name=scheduler.Name))
+
class Hold(CuminAction):
def show(self, session, job):
frame = self.cumin_class.show_object(session, job)
17 years, 8 months
rhmessaging commits: r2409 - store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2008-09-04 11:31:36 -0400 (Thu, 04 Sep 2008)
New Revision: 2409
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
RHM-6 : Added additional info to upgrade error message to help identify the store requiring upgraded.
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 2008-09-04 15:18:26 UTC (rev 2408)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2008-09-04 15:31:36 UTC (rev 2409)
@@ -1127,7 +1127,8 @@
catch (Throwable ioobe)
{
abortTran(context);
- throw new AMQException("Invalid database format. Please use upgrade tool.", ioobe);
+ throw new AMQException("Invalid database format. Please use upgrade tool for store in Virtualhost:'"
+ + _virtualHost.getName() + "'", ioobe);
}
stateTransition(State.RECOVERING, State.STARTED);
17 years, 8 months
rhmessaging commits: r2408 - store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2008-09-04 11:18:26 -0400 (Thu, 04 Sep 2008)
New Revision: 2408
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
RHM-6 : Updated the long parameter option format to be more unix standard.
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 2008-09-04 15:15:09 UTC (rev 2407)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 15:18:26 UTC (rev 2408)
@@ -53,8 +53,8 @@
*/
public class BDBStoreUpgrade
{
- private static final String FROM_DIR = "-input";
- private static final String TO_DIR = "-output";
+ private static final String FROM_DIR = "--input";
+ private static final String TO_DIR = "--output";
private static final Logger _logger = LoggerFactory.getLogger(BDBStoreUpgrade.class);
/** The Store Directory that needs upgrading */
17 years, 8 months
rhmessaging commits: r2407 - in store/branches/java/broker-queue-refactor/java/bdbstore: etc/scripts and 2 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2008-09-04 11:15:09 -0400 (Thu, 04 Sep 2008)
New Revision: 2407
Added:
store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/build.xml
store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh
store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
RHM-6 : Improved user feedback and added JE jar to classpath.
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/build.xml
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-04 15:14:49 UTC (rev 2406)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-04 15:15:09 UTC (rev 2407)
@@ -61,19 +61,25 @@
<target name="build-main" depends="init">
<javac srcdir="${src.main.dir}"
destdir="${build.classes}"
- classpathref="test.class.path"/>
+ classpathref="test.class.path" debug="on"/>
</target>
<target name="build-tests" depends="init,build-main">
<javac srcdir="${src.test.dir}"
destdir="${build.test.classes}"
- classpathref="test.class.path"/>
+ classpathref="test.class.path" debug="on"/>
</target>
<target name="build-tools" depends="init,build-main">
<javac srcdir="${src.tools.dir}"
destdir="${build.tools.classes}"
- classpathref="tools.class.path"/>
+ classpathref="tools.class.path" debug="on"/>
+ <copy todir="${build.tools.classes}" >
+ <fileset dir="${src.tools.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
+ </fileset>
+ </copy>
</target>
<target name="jar" depends="build">
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh 2008-09-04 15:14:49 UTC (rev 2406)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh 2008-09-04 15:15:09 UTC (rev 2407)
@@ -18,4 +18,4 @@
export BDB_HOME=$(dirname $(dirname $(readlink -f $0)))
fi
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx256m -Damqj.logging.level=warn ${JAVA_OPTS} -cp $BDB_HOME/lib/qpid-bdbtools-M3.jar:$QPID_HOME/lib/qpid-bdbstore-M3.jar:$BDB_HOME/lib/qpid-incubating.jar org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS}
+java -Xms256m -Dlog4j.configuration=BDBStoreUpgrade.log4j.xml -Xmx256m -Damqj.logging.level=warn ${JAVA_OPTS} -cp $BDB_HOME/lib/qpid-bdbtools-M3.jar:$QPID_HOME/lib/je-3.3.62.jar:$QPID_HOME/lib/qpid-bdbstore-M3.jar:$BDB_HOME/lib/qpid-incubating.jar org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS}
Added: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml (rev 0)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml 2008-09-04 15:15:09 UTC (rev 2407)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p - %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade">
+ <priority value="info"/>
+ </category>
+
+ <!-- Only show errors from the BDB Store -->
+ <category name="org.apache.qpid.server.store.berkeleydb.berkeleydb.BDBMessageStore">
+ <priority value="error"/>
+ </category>
+
+ <!-- Provide warnings to standard output -->
+ <category name="org.apache.qpid">
+ <priority value="error"/>
+ </category>
+
+ <!-- Log all info events to file -->
+ <root>
+ <priority value="info"/>
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</log4j:configuration>
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 2008-09-04 15:14:49 UTC (rev 2406)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 15:15:09 UTC (rev 2407)
@@ -76,7 +76,7 @@
_fromDir = new File(fromDir);
if (!_fromDir.exists())
{
- throw new IllegalArgumentException("BDBStore path " + fromDir + " could not be read. "
+ throw new IllegalArgumentException("BDBStore path '" + fromDir + "' could not be read. "
+ "Ensure the path is correct and that the permissions are correct.");
}
@@ -85,13 +85,13 @@
{
if (!_toDir.mkdirs())
{
- throw new IllegalArgumentException("Environment path " + toDir + " could not be created. "
+ throw new IllegalArgumentException("Environment path '" + toDir + "' could not be created. "
+ "Ensure the path is correct and that the permissions are correct.");
}
}
else
{
- throw new IllegalArgumentException("Environment path " + toDir + " already exists. ");
+ throw new IllegalArgumentException("Environment path '" + toDir + "' already exists. ");
}
@@ -154,12 +154,15 @@
private void upgradeFromVersion_1() throws AMQException, DatabaseException
{
+ _logger.info("Migrating Message Metadata");
//Migrate _messageMetaDataDb;
moveContents(_oldMessageStore.getMetaDataDb(), _newMessageStore.getMetaDataDb());
+ _logger.info("Migrating Message Contents");
//Migrate _messageContentDb;
moveContents(_oldMessageStore.getContentDb(), _newMessageStore.getContentDb());
+ _logger.info("Migrating Queues");
//Migrate _queueDb;
//Get the oldMessageStore Tuple Binding which does the parsing
final TupleBinding queueTupleBinding = _oldMessageStore.getQueueTupleBindingFactory().getInstance();
@@ -179,12 +182,15 @@
}
});
+ _logger.info("Migrating Delivery Records");
//Migrate _deliveryDb;
moveContents(_oldMessageStore.getDeliveryDb(), _newMessageStore.getDeliveryDb());
+ _logger.info("Migrating Exchanges");
//Migrate _exchangeDb;
moveContents(_oldMessageStore.getExchangesDb(), _newMessageStore.getExchangesDb());
+ _logger.info("Migrating QueueBindings");
//Migrate _queueBindingsDb;
final TupleBinding bindingTupleBinding = _oldMessageStore.getBindingTupleBindingFactory().getInstance();
_oldMessageStore.visitBindings(new BDBMessageStore.DatabaseVisitor()
@@ -238,7 +244,7 @@
}
}
- public static void main(String[] args) throws Exception
+ public static void main(String[] args)
{
String fromDir, toDir;
@@ -259,8 +265,19 @@
System.exit(1);
}
- new BDBStoreUpgrade(fromDir, toDir).upgradeFromVersion(1);
+ try
+ {
+ new BDBStoreUpgrade(fromDir, toDir).upgradeFromVersion(1);
+ _logger.info("Upgrade complete.");
+ }
+ catch (IllegalArgumentException iae)
+ {
+ _logger.error("Upgrade Not Started: " + iae.getMessage());
+ }
+ catch (Exception e)
+ {
+ _logger.error("Upgrade failed: " + e.getMessage());
+ }
- System.out.println("Upgrade complete");
}
}
17 years, 8 months
rhmessaging commits: r2406 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 11:14:49 -0400 (Thu, 04 Sep 2008)
New Revision: 2406
Modified:
mgmt/trunk/cumin/python/cumin/job.strings
Log:
Add Legend to JobEditAd page
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-09-04 15:14:07 UTC (rev 2405)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-09-04 15:14:49 UTC (rev 2406)
@@ -145,17 +145,21 @@
[JobEditAds.css]
div.inline_help {
- position:fixed;
+ float: right;
}
-div.inline_help h2.legend {
- margin-top: 1em;
+div.inline_help h2 {
+ display: inline;
}
[JobEditAds.html]
<form id="{id}" class="mform editform" method="post" action="?">
+<div class="inline_help">
+<h2>Legend</h2>
+ <span class="edit_string">String input expected</span>
+ <span class="edit_number">Numeric input expected</span>
+</div>
{help} {submit} {cancel}
-
<table class="CuminDetails">
<tbody>
<tr>
17 years, 8 months