From: <jma...@rh...> - 2009-03-26 22:10:50
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3542] [RHQ-1871] - update the build to use quartz-1.6.5 (instead of the 1.5.2 version that comes with the jbossas server by default) to resolve issues with row contention and deadlocks when executing group configuration updates and group operations in large environments; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3542</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-03-26 17:10:48 -0500 (Thu, 26 Mar 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1871] - update the build to use quartz-1.6.5 (instead of the 1.5.2 version that comes with the jbossas server by default) to resolve issues with row contention and deadlocks when executing group configuration updates and group operations in large environments; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoredbutilspomxml">rhq/trunk/modules/core/dbutils/pom.xml</a></li> <li><a href="#rhqtrunkmodulescoredbutilssrcmainscriptsdbsetupschedulerschemaxml">rhq/trunk/modules/core/dbutils/src/main/scripts/dbsetup/scheduler-schema.xml</a></li> <li><a href="#rhqtrunkmodulescoredbutilssrcmainscriptsdbupgradedbupgradexml">rhq/trunk/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseservercontainerpomxml">rhq/trunk/modules/enterprise/server/container/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseservercontainersrcmainscriptsrhqcontainerbuildxml">rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoredbutilspomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/dbutils/pom.xml (3541 => 3542)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/dbutils/pom.xml 2009-03-26 21:00:49 UTC (rev 3541) +++ rhq/trunk/modules/core/dbutils/pom.xml 2009-03-26 22:10:48 UTC (rev 3542) </span><span class="lines">@@ -22,7 +22,7 @@ </span><span class="cx"> <properties> <scm.module.path>modules/core/dbutils/</scm.module.path> </span><span class="rem">- <db.schema.version>2.50</db.schema.version> </span><span class="add">+ <db.schema.version>2.51</db.schema.version> </span><span class="cx"> </properties> <dependencies> </span></pre></div> <a id="rhqtrunkmodulescoredbutilssrcmainscriptsdbsetupschedulerschemaxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/dbutils/src/main/scripts/dbsetup/scheduler-schema.xml (3541 => 3542)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/dbutils/src/main/scripts/dbsetup/scheduler-schema.xml 2009-03-26 21:00:49 UTC (rev 3541) +++ rhq/trunk/modules/core/dbutils/src/main/scripts/dbsetup/scheduler-schema.xml 2009-03-26 22:10:48 UTC (rev 3542) </span><span class="lines">@@ -49,6 +49,7 @@ </span><span class="cx"> <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/> <column name="NEXT_FIRE_TIME" type="LONG" required="false"/> <column name="PREV_FIRE_TIME" type="LONG" required="false"/> </span><span class="add">+ <column name="PRIORITY" type="INTEGER" required="false"/> </span><span class="cx"> <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/> <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/> <column name="START_TIME" type="LONG" required="true"/> </span><span class="lines">@@ -212,6 +213,7 @@ </span><span class="cx"> <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/> <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/> <column name="FIRED_TIME" type="LONG" required="true"/> </span><span class="add">+ <column name="PRIORITY" type="INTEGER" required="false"/> </span><span class="cx"> <column name="STATE" type="VARCHAR2" size="16" required="true"/> <column name="IS_VOLATILE" type="BOOLEAN" required="true"/> <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/> </span></pre></div> <a id="rhqtrunkmodulescoredbutilssrcmainscriptsdbupgradedbupgradexml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml (3541 => 3542)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml 2009-03-26 21:00:49 UTC (rev 3541) +++ rhq/trunk/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml 2009-03-26 22:10:48 UTC (rev 3542) </span><span class="lines">@@ -1356,6 +1356,11 @@ </span><span class="cx"> </schema-directSQL> </schemaSpec> </span><span class="add">+ <schemaSpec version="2.51"> + <schema-addColumn table="RHQ_QRTZ_TRIGGERS" column="PRIORITY" columnType="INTEGER" /> + <schema-addColumn table="RHQ_QRTZ_FIRED_TRIGGERS" column="PRIORITY" columnType="INTEGER" /> + </schemaSpec> + </span><span class="cx"> </dbupgrade> </target> </span></pre></div> <a id="rhqtrunkmodulesenterpriseservercontainerpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/pom.xml (3541 => 3542)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/pom.xml 2009-03-26 21:00:49 UTC (rev 3541) +++ rhq/trunk/modules/enterprise/server/container/pom.xml 2009-03-26 22:10:48 UTC (rev 3542) </span><span class="lines">@@ -80,6 +80,12 @@ </span><span class="cx"> </dependency> <dependency> </span><span class="add">+ <groupId>org.opensymphony.quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.6.5</version> + </dependency> + + <dependency> </span><span class="cx"> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span></pre></div> <a id="rhqtrunkmodulesenterpriseservercontainersrcmainscriptsrhqcontainerbuildxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml (3541 => 3542)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml 2009-03-26 21:00:49 UTC (rev 3541) +++ rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml 2009-03-26 22:10:48 UTC (rev 3542) </span><span class="lines">@@ -231,6 +231,10 @@ </span><span class="cx"> <copy file="${settings.localRepository}/org/jboss/jboss-faces/${jboss-faces.version}/jboss-faces-${jboss-faces.version}.jar" tofile="${jsf-libs.dir}/jboss-faces.jar" overwrite="true" verbose="true" /> </span><span class="add">+ <echo>Upgrading quartz.jar to v1.6.5 ...</echo> + <copy file="${settings.localRepository}/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar" + tofile="${jboss.home}/server/default/lib/quartz.jar" overwrite="true" verbose="true" /> + </span><span class="cx"> <echo>Preparing JMS backend ...</echo> <mkdir dir="${jboss.deploy.dir}/jms"/> <copy todir="${jboss.deploy.dir}/${jms.oracle.dir}"> </span> </pre> </div> </div> </body> </html> |