[rhq-project/rhq] bc99ce: Some unsolicited slsb code cleanup
by Jay Shaughnessy
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: bc99cefbd19a58b159d0c6ac3e3ca7358f1df749
https://github.com/rhq-project/rhq/commit/bc99cefbd19a58b159d0c6ac3e3ca73...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
Log Message:
-----------
Some unsolicited slsb code cleanup
- remove unnecessary/duplicate class level datasource annotations
- use DatabaseTypeFactory.getDefaultDatabseType() where appropriate
- add missing statement close in ResourceAvailabilityManagerBean
- use util safeClose methods as appropriate
Commit: 1106141fb59aefa027602c138f59b33f4347466a
https://github.com/rhq-project/rhq/commit/1106141fb59aefa027602c138f59b33...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java
Log Message:
-----------
[1127029] Agent [null] would like to connect to this server
The issue here is that 'rhqctl install' does not make provisions for an
existing agent on the machine. When installing an RHQ Server or Storage
Node it is then expected that RHQ components be managed by the rhqctl
facility. This is made possible when upgrading from pre-rhqctl versions
by the 'rhqctl upgrade' --from-server-dir and --from-agent-dir options,
which allow an upgrade to "pull in" the existing components on the machine.
The missing use case is this one, when not upgrading but rather installing.
So, this commit adds the --from-agent-dir option to 'rhqctl install'.
Allowing a formerly installed RHQ Agent to be updated (as needed) and
pulled under rhqctl, moving it to the expected location of sibling
directory to the rhq-server installation directory (and not installing
a new agent, which caused the reported issue)
- Also, fix an issue in 'rhqctl upgrade --from-agent-dir' where the new
agent was not actually moved to the proper sibling directory. I believe
this affected RHQ 4.12 (and possibly JON 3.2)
Compare: https://github.com/rhq-project/rhq/compare/9c2868cc0d54...1106141fb59a
9 years, 9 months
[rhq-project/rhq] edb1ac: Bug 1124845 - EAP6 with secured management - confu...
by Thomas Segismont
Branch: refs/heads/release/jon3.2.x
Home: https://github.com/rhq-project/rhq
Commit: edb1ac4d9764295142e8174dfc76091a4dd9f3c6
https://github.com/rhq-project/rhq/commit/edb1ac4d9764295142e8174dfc76091...
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SchemeRegistryBuilder.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/util/SecurityUtil.java
Log Message:
-----------
Bug 1124845 - EAP6 with secured management - confusing error msg when incorrect Truststore Type is set
Now trying to load the truststore/keystore when validating the
connection settings and retun correct message in case of failure
(cherry picked from commit 62986312e18a2f02e7336fe33acdbd535b85016a)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
9 years, 10 months
[rhq-project/rhq] 2fee4b: Bug 1124845 - EAP6 with secured management - confu...
by Thomas Segismont
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 2fee4bf48a801bc30fe67ac53deb105bb4251791
https://github.com/rhq-project/rhq/commit/2fee4bf48a801bc30fe67ac53deb105...
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SchemeRegistryBuilder.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/util/SecurityUtil.java
Log Message:
-----------
Bug 1124845 - EAP6 with secured management - confusing error msg when incorrect Truststore Type is set
Now trying to load the truststore/keystore when validating the
connection settings and retun correct message in case of failure
(cherry picked from commit 62986312e18a2f02e7336fe33acdbd535b85016a)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
9 years, 10 months
[rhq-project/rhq] 912c71: [BZ 1120411] Only allow selecting a proper jdbc dr...
by Michael Burman
Branch: refs/heads/release/jon3.2.x
Home: https://github.com/rhq-project/rhq
Commit: 912c719465fa1f9a1efe11e6f814a38cfa6bf5a5
https://github.com/rhq-project/rhq/commit/912c719465fa1f9a1efe11e6f814a38...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java
M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java
Log Message:
-----------
[BZ 1120411] Only allow selecting a proper jdbc driver in the datasource configuration
(cherry picked from commit 28df962ff235511387aff36d79133ed503dc7769)
[BZ 1120411] Cherry-picked commits a106392596b6f8e717ee57c7a7b33d8ea891b9e4 and c83e8c4536b07b7ea9b6571ef68af11c41018234 to fix integration tests
9 years, 10 months
[rhq-project/rhq] 6640ea: Bug 1074632 - RFE: Manage storage node snapshots
by Libor Zoubek
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 6640eabc6735327f8261f0fed23afd942d0ce801
https://github.com/rhq-project/rhq/commit/6640eabc6735327f8261f0fed23afd9...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M modules/core/dbutils/pom.xml
M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
M modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageClusterSettings.java
M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/ClusterConfigurationEditor.java
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
M modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java
Log Message:
-----------
Bug 1074632 - RFE: Manage storage node snapshots
2nd piece of impl above BZ. This patch adds server side capability to manage
snapshots for storage cluster. This basically means that we regularly run
takeSnaphost operation with several parameters - so user can decide whether
to keep all of them, keep last or move older ones to specified location.
6 new private/readonly system settings have been introduced - those settings
can be updated only via Storage admin pages.
User can enable/disable snapshots management of storage cluster and set cron
expression to run management task regulary (additional 4 settings are
basically parameters for takeSnapshot operation introduced within previous
commit for this BZ). When Cluster Setting is saved in UI we re-schedule
takeSnapshot operations on all StorageNode resources in inventory.
Snapshot related code was removed from
StorageNodeManagerBean#runClusterMaintenance()
Commit: d9d0bd3ddfb075a96ff76a641bce2d18afc8c2e3
https://github.com/rhq-project/rhq/commit/d9d0bd3ddfb075a96ff76a641bce2d1...
Author: Libor Zoubek <lzoubek(a)jezzovo.net>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M modules/core/dbutils/pom.xml
M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
M modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageClusterSettings.java
M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/ClusterConfigurationEditor.java
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
M modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java
Log Message:
-----------
Merge pull request #97 from lzoubek/bugs/1074632
Bug 1074632 - RFE: Manage storage node snapshots (part. 2)
Compare: https://github.com/rhq-project/rhq/compare/2d3a7af20783...d9d0bd3ddfb0
9 years, 10 months