Branch: refs/heads/release/jon3.3.x
Home:
https://github.com/rhq-project/rhq
Commit: 2c024accc57d27c86667fea238bb1be668f60f59
https://github.com/rhq-project/rhq/commit/2c024accc57d27c86667fea238bb1be...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M modules/core/domain/intentional-api-changes-since-4.12.0.xml
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConnectorDiscoveryGroupValidatorComponent.java
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TemplatedComponent.java
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[1033404] Updating Blocking Bounded Queue and Bounded Queue Thread Pools fails without
core-threads value
This is a partial fix for the reported issue, and contains two associated
fixes for issues hit while working the issue.
- First, The plugin descriptor needs to specify required="false" for the
optional simples in a map of simples, otherwise they will be set to
required="true" by default (I don't know if this is true for all props,
it
may be, but it was definitely true for the keepalive-time map-of-simples for
AS7 ThreadPools). Otherwise values will be expected. Fix this because this
prevents the create child from working unless you sepcify keepalive-time.
- Second, a map-of-Simples in a resource configuration always generates
a Map in the Configuration, even if the Map is "empty" because the Simples
are all "unset" (set to null values). This was not being handled well in
the create resource code, where an unset map should be ignored as if the
entire PropertyMap is "unset". Note that an empty MapProperty in a
configuration update should be processed, because we may be trying to unset
one or more of Simples that currently have a value.
- Third, to work around the fact that AS can't currently handle an undefine
(i.e update to null) of core-threads (and possibly other attributes), add
an optimization such that we don't try to update undefined (null)
attributes to be undefined, since they are undefined already.
- There was another issue in that the plugin code was actually modifying
the ConfigurationDefinition held in the ResourceContext (which is a
weakness in our design that we even let that happen). Changed to use a
copy of the ConfigurationDefinition (and added a copy() method in the
Entity, migrating it from plugin code where it was previously defined).
So, the partial fix is that we can now create with empty maps and we can
update without setting core-threads to a value, leaving it unset. But once
set core-threads can *not* be unset until the AS bug is fixed and the
fixed version is a version being managed.
(cherry picked from commit e7a641350e155c7cd6ed6c566491ef425aeee3e2)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
Commit: eb0eee822e93b5a4820e5c411639dc737004c72a
https://github.com/rhq-project/rhq/commit/eb0eee822e93b5a4820e5c411639dc7...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/configuration/ConfigurationEditor.java
Log Message:
-----------
[822173, 1146846] Broken layout on JBossAS7 resource configuration page
Work done for Bug 1144459 was unknowingly trying to fix the problem
reported in Bug 822173. It succeeded in fixing the column header issue
but caused the regression reported in Bug 1146846. This (finally) seems
to have fixed the problems for all three BZs, working around the Smartgwt
bug at the root of all of the problems.
(cherry picked from commit 29368f3515fc3cf00b545ad56c83e08e9dc6fcf6)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
Compare:
https://github.com/rhq-project/rhq/compare/b3133b41dce8...eb0eee822e93