[rhq] Branch 'rhq-on-as7' - 2 commits - modules/enterprise

mazz mazz at fedoraproject.org
Mon Aug 13 15:49:26 UTC 2012


 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml                          |    4 --
 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerService.java |   17 +++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 444ff5fe38425e982c17a0c9ae9b4ef2cb96993f
Author: John Mazzitelli <mazz at redhat.com>
Date:   Mon Aug 13 11:49:23 2012 -0400

    no sense leaving this in the .properties file - we don't want this to be anything other than 1 anyway

diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index 2b1a5bb..50303b5 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -508,10 +508,6 @@ rhq.server.startup.ajp.port=9009
 rhq.server.startup.unifiedinvoker.port=5446
 rhq.server.startup.aspectdeployer.bind-port=4873
 
-# The number of concurrent threads used to deploy plugins.
-# Currently, it is not recommended to increase this value.
-rhq.server.plugin-deployer-threads=1
-
 # RHQ Server's remote endpoint for agents to talk to
 # bind-address and bind-port are derived from the HA server definition,
 # if you set the address/port here, they will override the HA server definition found in the database


commit 01781ed1dc05faefd20730865399b03ff40acb76
Author: John Mazzitelli <mazz at redhat.com>
Date:   Mon Aug 13 11:49:07 2012 -0400

    JIRA AS7-5343 forces us to explicitly replace ${x} ourselves

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerService.java
index 5d3143d..30ad995 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerService.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.server.scheduler;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
@@ -44,6 +45,8 @@ import org.quartz.UnableToInterruptJobException;
 import org.quartz.impl.StdSchedulerFactory;
 import org.quartz.spi.JobFactory;
 
+import org.jboss.util.StringPropertyReplacer;
+
 /**
  * Scheduler MBean service that simply wraps the Quartz scheduler.
  */
@@ -68,7 +71,19 @@ public class SchedulerService implements SchedulerServiceMBean, MBeanRegistratio
         return quartzProperties;
     }
 
-    public void setQuartzProperties(final Properties quartzProps) throws SchedulerException {
+    public void setQuartzProperties(Properties quartzProps) throws SchedulerException {
+        // we need to replace ${var} notations because AS7 doesn't - see https://issues.jboss.org/browse/AS7-5343
+        if (quartzProps != null) {
+            Properties overrides = new Properties();
+            for (Map.Entry<Object, Object> entry : quartzProps.entrySet()) {
+                String key = entry.getKey().toString();
+                String value = entry.getValue().toString();
+                value = StringPropertyReplacer.replaceProperties(value);
+                overrides.put(key, value);
+            }
+            quartzProps = overrides;
+        }
+
         this.quartzProperties = quartzProps;
         schedulerFactory.initialize(quartzProps);
 




More information about the rhq-commits mailing list