Branch: refs/heads/release/jon3.2.x Home: https://github.com/rhq-project/rhq Commit: a3d6c31fe7f3662165491d9b0d270c0acb453a55 https://github.com/rhq-project/rhq/commit/a3d6c31fe7f3662165491d9b0d270c0acb... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/common/SystemConfiguration.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.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: ----------- Work on ITest-2 Failures: - I think the recent work for 1071330 which added caching and last-update logic around SystemSettings adversely affected the LDAP tests which where doing direct update of read-only system settings. Adding a new inetrnal-only local SLSB for safely updating a read-only SystemSetting and refactoring test class to use it. - Removed now-obsolete NamedQuery that supported the old test-class logic. (cherry picked from commit e81c703599425f6d720b9568d4d79db94d46d35f)
Conflicts:
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
Signed-off-by: Simeon Pinder spinder@fulliautomatix.conchfritter.com
Commit: 598ef9973f81626072b500236f9fff002fcc4ee4 https://github.com/rhq-project/rhq/commit/598ef9973f81626072b500236f9fff002f... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths: M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.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: ----------- Work on ITest-2 Failures: - More work around 1071330 which added caching and last-update logic around SystemSettings. Adding an internal-only local SLSB method which allows write of readOnly system settings. This is analogous to the one I added a few minutes ago for a single setting. - Convert SynchronizationManagerbeanTest to use SystemSettings as opposed to the deprecated systemConfig API, and use the internal SLSB methods as needed. (cherry picked from commit 5f29fcc4d5e69bea2b3c0950b55abc015fe8a261)
Signed-off-by: Simeon Pinder spinder@fulliautomatix.conchfritter.com
Commit: c5a5410e00d2e4b123161a36fb236741e370d10d https://github.com/rhq-project/rhq/commit/c5a5410e00d2e4b123161a36fb236741e3... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths: M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
Log Message: ----------- Work on ITest-2 Failures: - More work around 1071330, use new local SLSBs as needed in test code (cherry picked from commit 9475e5c9d28e4381438e68ff22f93a596d73c2ba)
Signed-off-by: Simeon Pinder spinder@fulliautomatix.conchfritter.com
Commit: 8a1e9e636f96aa43b51cbf6f098f8abfe15f616e https://github.com/rhq-project/rhq/commit/8a1e9e636f96aa43b51cbf6f098f8abfe1... Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths: M modules/core/plugin-container-itest/pom.xml M modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
Log Message: ----------- Itests still not resolving the correct dependencies. Another fix. - updated Abstract classes to consistently use the same properties - update plugin container itests to check before going to classpath.
Compare: https://github.com/rhq-project/rhq/compare/a12a4fb80346...8a1e9e636f96
rhq-commits@lists.fedorahosted.org