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 5f29fcc)

Signed-off-by: Simeon Pinder <spinder@fulliautomatix.conchfritter.com>

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java

@@ -432,7 +432,7 @@ public void testFindGroupsForUser8BitAsciiChar() throws Throwable {
      * Helper methods
      ---------------*/
     private void setSystemSetting(final SystemSetting setting, final String value) throws Exception {
-        systemManager.setSystemSetting(setting, value);
+        systemManager.setAnySystemSetting(setting, value);
     }
 
     private void setLdapGroupFilter(String filter) throws Exception {

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java

@@ -32,7 +32,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
 import java.util.zip.GZIPInputStream;
@@ -60,6 +59,8 @@
 import org.xml.sax.InputSource;
 
 import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.common.composite.SystemSetting;
+import org.rhq.core.domain.common.composite.SystemSettings;
 import org.rhq.core.domain.configuration.Configuration;
 import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
 import org.rhq.core.domain.criteria.MeasurementDefinitionCriteria;
@@ -121,13 +122,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
     private static final String METRIC_NAME = "SynchronizationManagerBeanTest";
 
     private static class TestData {
-        public Properties systemSettings;
+        public SystemSettings systemSettings;
         public ResourceType fakeType;
         public Resource fakePlatform;
         public TestServerPluginService testServerPluginService;
     }
 
-    //this can't be mocked out because the config sync machinery has to be able to 
+    //this can't be mocked out because the config sync machinery has to be able to
     //instantiate this class
     public static class ImportConfigurationCheckingSynchronizer implements Synchronizer<NoSingleEntity, String> {
 
@@ -309,7 +310,7 @@ private void setup(boolean createExport) throws Exception {
         //make sure the system manager is in sync w/ the db we just changed in dbsetup
         systemManager.loadSystemConfigurationCache();
 
-        testData.systemSettings = systemManager.getSystemConfiguration(freshUser());
+        testData.systemSettings = systemManager.getUnmaskedSystemSettings(false);
 
         if (createExport) {
             export = synchronizationManager.exportAllSubsystems(freshUser());
@@ -320,7 +321,7 @@ private void tearDown() throws Exception {
         try {
             getTransactionManager().begin();
             try {
-                LookupUtil.getSystemManager().setSystemConfiguration(freshUser(), testData.systemSettings, true);
+                LookupUtil.getSystemManager().setAnySystemSettings(testData.systemSettings, true, true);
 
                 EntityManager em = getEntityManager();
 
@@ -370,7 +371,7 @@ public void testImportWithDefaultConfiguration() throws Exception {
             MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
                 .getMeasurementDefinitionManager();
 
-            Properties beforeSystemSettings = systemManager.getSystemConfiguration(freshUser());
+            SystemSettings beforeSystemSettings = systemManager.getUnmaskedSystemSettings(false);
             MeasurementDefinitionCriteria criteria = new MeasurementDefinitionCriteria();
             criteria.setPageControl(PageControl.getUnlimitedInstance());
             criteria.fetchResourceType(true);
@@ -383,7 +384,7 @@ public void testImportWithDefaultConfiguration() throws Exception {
             //this is to work around BZ 735810
             systemManager.loadSystemConfigurationCache();
 
-            Properties afterSystemSettings = systemManager.getSystemConfiguration(freshUser());
+            SystemSettings afterSystemSettings = systemManager.getUnmaskedSystemSettings(false);
             List<MeasurementDefinition> afterMeasurementDefinitions = measurementDefinitionManager
                 .findMeasurementDefinitionsByCriteria(freshUser(), criteria);
 
@@ -419,9 +420,9 @@ public void testImportWithRedefinedConfigurationInExportFile() throws Exception
 
             //now check that everything got imported according to the changed configuration
             SystemManagerLocal systemManager = LookupUtil.getSystemManager();
-            Properties settings = systemManager.getSystemConfiguration(freshUser());
+            SystemSettings settings = systemManager.getUnmaskedSystemSettings(false);
 
-            assertEquals(settings.getProperty("CAM_BASE_URL"), "http://testing.domain:7080");
+            assertEquals(settings.get(SystemSetting.BASE_URL), "http://testing.domain:7080");
 
             MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
                 .getMeasurementDefinitionManager();
@@ -467,9 +468,9 @@ public void testManuallyPassedImportConfigurationHasPrecendenceOverTheInlinedOne
         try {
             //let's read the original values from the database, so that we know what to compare against
             SystemManagerLocal systemManager = LookupUtil.getSystemManager();
-            Properties settings = systemManager.getSystemConfiguration(freshUser());
+            SystemSettings settings = systemManager.getUnmaskedSystemSettings(false);
 
-            String originalBaseUrl = settings.getProperty("CAM_BASE_URL");
+            String originalBaseUrl = settings.get(SystemSetting.BASE_URL);
 
             MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
                 .getMeasurementDefinitionManager();
@@ -506,9 +507,9 @@ public void testManuallyPassedImportConfigurationHasPrecendenceOverTheInlinedOne
             }
 
             //now check that we import using the manually create configurations, not the inlined ones
-            settings = systemManager.getSystemConfiguration(freshUser());
+            settings = systemManager.getUnmaskedSystemSettings(false);
 
-            assertEquals(settings.getProperty("CAM_BASE_URL"), originalBaseUrl);
+            assertEquals(settings.get(SystemSetting.BASE_URL), originalBaseUrl);
 
             measurementDefinitionManager = LookupUtil.getMeasurementDefinitionManager();
             distroNameDef = measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), crit).get(0);

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java

@@ -254,18 +254,18 @@ public SystemSettings getObfuscatedSystemSettings(boolean includePrivateSettings
     @Override
     @RequiredPermission(Permission.MANAGE_SETTINGS)
     public void setSystemSettings(Subject subject, SystemSettings settings) {
-        setSystemSettings(removePrivateSettings(settings), false, false);
+        setAnySystemSettings(removePrivateSettings(settings), false, false);
     }
 
     @Override
-    public void setSystemSetting(SystemSetting setting, String value) {
+    public void setAnySystemSetting(SystemSetting setting, String value) {
         if (SystemSetting.LAST_SYSTEM_CONFIG_UPDATE_TIME == setting) {
             return;
         }
 
         SystemSettings settings = getUnmaskedSystemSettings(true);
         settings.put(setting, value);
-        setSystemSettings(settings, true, true);
+        setAnySystemSettings(settings, true, true);
     }
 
     private SystemSettings removePrivateSettings(SystemSettings settings) {
@@ -287,10 +287,11 @@ public void setStorageClusterSettings(Subject subject, SystemSettings settings)
                     + "only allows updating of storage cluster settings.");
             }
         }
-        setSystemSettings(settings, false, true);
+        setAnySystemSettings(settings, false, true);
     }
 
-    private void setSystemSettings(SystemSettings settings, boolean skipValidation, boolean ignoreReadOnly) {
+    @Override
+    public void setAnySystemSettings(SystemSettings settings, boolean skipValidation, boolean ignoreReadOnly) {
         // first, we need to get the current settings so we'll know if we need to persist or merge the new ones
         @SuppressWarnings("unchecked")
         List<SystemConfiguration> configs = entityManager.createNamedQuery(SystemConfiguration.QUERY_FIND_ALL)
@@ -482,7 +483,7 @@ public void setSystemConfiguration(Subject subject, Properties properties, boole
 
         SystemSettings settings = SystemSettings.fromMap(map);
 
-        setSystemSettings(settings, skipValidation, false);
+        setAnySystemSettings(settings, skipValidation, false);
     }
 
     @Override

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java

@@ -200,5 +200,17 @@ public interface SystemManagerLocal extends SystemManagerRemote {
      * @param setting
      * @param value
      */
-    void setSystemSetting(SystemSetting setting, String value);
+    void setAnySystemSetting(SystemSetting setting, String value);
+
+    /**
+     * Internal use only.  Like {@link SystemManagerRemote#setSystemSettings(Subject, SystemSettings)} but can
+     * bypass validation and also ignore the readOnly constraint.
+     *
+     * @param settings
+     * @param skipValidation if true, skip validation
+     * @param ignoreReadOnly if true, ignore the readOnly constraint and set new values if supplied
+     * @param value
+     */
+    void setAnySystemSettings(SystemSettings settings, boolean skipValidation, boolean ignoreReadOnly);
+
 }