[rhq] modules/common modules/enterprise
by snegrea
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 1
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java | 12 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 8393b06c97a9602a2bfed65b75354f2ddb78d3d2
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Oct 1 17:44:41 2013 -0500
Fix for itest failures dues to properties not being correctly set for storage nodes.
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
index a49d77d..dcecf5e 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
@@ -235,6 +235,7 @@ public class CassandraClusterManager {
private void getStorageClusterConfiguration() {
this.nodes = new String[deploymentOptions.getNumNodes()];
+ this.jmxPorts = new int[deploymentOptions.getNumNodes()];
for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) {
this.nodes[i] = getLocalIPAddress(i + 1);
this.jmxPorts[i] = deploymentOptions.getJmxPort() + i;
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
index 2db60d8..50a57dd 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
@@ -132,12 +132,20 @@ public class StrippedDownStartupBeanPreparation {
}
String cqlPort = System.getProperty("rhq.storage.cql-port");
- String gossipPort = System.getProperty("rhq.storage.gossip-port");
-
entityManager.createNativeQuery("update rhq_system_config set property_value = '" + cqlPort +
"', default_property_value = '" + cqlPort + "' where property_key = 'STORAGE_CQL_PORT'").executeUpdate();
+
+ String gossipPort = System.getProperty("rhq.storage.gossip-port");
entityManager.createNativeQuery("update rhq_system_config set property_value = '" + gossipPort +
"', default_property_value = '" + gossipPort + "' where property_key = 'STORAGE_GOSSIP_PORT'").executeUpdate();
+
+ String storageUserName = System.getProperty("rhq.storage.username");
+ entityManager.createNativeQuery("update rhq_system_config set property_value = '" + storageUserName +
+ "', default_property_value = '" + storageUserName + "' where property_key = 'STORAGE_USERNAME'").executeUpdate();
+
+ String storagePassword = System.getProperty("rhq.storage.password");
+ entityManager.createNativeQuery("update rhq_system_config set property_value = '" + storagePassword +
+ "', default_property_value = '" + storagePassword + "' where property_key = 'STORAGE_PASSWORD'").executeUpdate();
}
@Timeout
10 years, 7 months
[rhq] modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 3a81b7be6c2a86d41908e3df74d504c6b2133877
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Oct 1 14:35:21 2013 -0700
[BZ 1014292] - Cancelling the confirmation dialog causes that buttons become inactive. The third state of SC.ask -> BooleanCallback(confirm) was not being handled. It can also be null when the close [x] button is hit. A refreshTableInfo was added to properly handle this state.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 9aeef30..91f836c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -595,7 +595,10 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements
SC.ask(message, new BooleanCallback() {
public void execute(Boolean confirmed) {
- if (confirmed) {
+ if(null == confirmed){
+ refreshTableInfo();
+ }else if (confirmed) {
+ refreshTableInfo();
tableAction.action.executeAction(listGrid.getSelectedRecords(), null);
} else {
refreshTableInfo();
10 years, 7 months
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java | 9 +++++----
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png |binary
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit a11451c05fdf837b4f67a49d72c61b0c9e71f641
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Oct 1 15:32:47 2013 -0400
Bug 1006594 - use new tree icons for auto-groups and subcategories
work in the new UX provided icons for a clearer tree.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
index d751587..bfad2a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
@@ -24,8 +24,8 @@ import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.Resource;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.AutoGroupTreeNode;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.SubCategoryTreeNode;
/**
* @author Greg Hinkle
@@ -52,10 +52,11 @@ public class CustomResourceTreeGrid extends TreeGrid {
return ImageManager.getResourceIcon(resource.getResourceType().getCategory(), resource
.getCurrentAvailability().getAvailabilityType());
}
- } else if (record instanceof SubCategoryTreeNode) {
- return "resources/folder_mixed_" + (open ? "opened" : "closed") + ".png";
+ } else if (record instanceof AutoGroupTreeNode) {
+ return "resources/folder_autogroup_" + (open ? "opened" : "closed") + ".png";
} else {
- return "resources/folder_group_" + (open ? "opened" : "closed") + ".png";
+ // note - subcategory nodes use default folder icons
+ return super.getIcon(record, defaultState);
}
}
return null;
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png
new file mode 100644
index 0000000..d85404d
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png
new file mode 100644
index 0000000..33856c8
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png differ
10 years, 7 months
[rhq] modules/enterprise
by Jiri Kremser
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 12 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit ad3703f5f88f547d397dc3612647970c8621b238
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Oct 1 18:55:27 2013 +0200
[BZ 958169] - Modified alert definition is not saved on confirming the save message after clicking on 'Back to List' button - overriding the behavior of destroy method of the enhanced layout, because this class needs to get the data from child components before the destroy() is called. This was causing various JavaScript exceptions.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
index d501787..379e83d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
@@ -261,5 +261,4 @@ public class GeneralPropertiesAlertDefinitionForm extends DynamicForm implements
public boolean validate() {
return super.validate() && nameField.validate();
}
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index e24d1b4..9457e48 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -64,12 +64,23 @@ public class SingleAlertDefinitionView extends EnhancedVLayout {
private TabSet tabSet;
private Tab generalPropertiesTab;
private HandlerRegistration handlerRegistration;
+ private boolean needsCleanup = false;
private boolean isAuthorizedToModifyAlertDefinitions;
public SingleAlertDefinitionView(AbstractAlertDefinitionsView alertDefView) {
this(alertDefView, null);
}
+
+ @Override
+ public void destroy() {
+ if (handlerRegistration == null) { // the leaving dialog has been answered
+ super.destroy();
+ needsCleanup = false;
+ } else {
+ needsCleanup = true;
+ }
+ }
public SingleAlertDefinitionView(final AbstractAlertDefinitionsView alertDefView, AlertDefinition alertDefinition) {
super();
@@ -285,6 +296,7 @@ public class SingleAlertDefinitionView extends EnhancedVLayout {
if (handlerRegistration != null) {
handlerRegistration.removeHandler();
handlerRegistration = null;
+ if (needsCleanup) destroy();
}
}
}
10 years, 7 months
[rhq] Changes to 'bug/1014300'
by Thomas Segismont
New branch 'bug/1014300' available with the following commits:
commit 514fef0f46c9d5e0c4546a7a08f27ca6b629614e
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Tue Oct 1 18:51:20 2013 +0200
Bug 1014300 - java.util.NoSuchElementException thrown when deleting RHQ plugins
Do not use the criteria query iterator remove function
10 years, 7 months
[rhq] modules/common
by snegrea
modules/common/cassandra-installer/pom.xml | 2
modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 24 ++++++----
2 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 10ebd20b9ec54d734e038f75c4043433d71545a9
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Oct 1 11:13:50 2013 -0500
[BZ 1010265] One more update to align the exception handling with the current storage installer exception and error mechanism. The error handling is now local to where it occurs.
diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml
index 46d2035..0524802 100644
--- a/modules/common/cassandra-installer/pom.xml
+++ b/modules/common/cassandra-installer/pom.xml
@@ -123,7 +123,7 @@
<id>dev</id>
<properties>
- <rhq.rootDir>../../../..</rhq.rootDir>
+ <rhq.rootDir>../../..</rhq.rootDir>
<rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir>
<rhq.deploymentDir>${rhq.containerDir}/modules/org/rhq/rhq-cassandra-installer/main</rhq.deploymentDir>
</properties>
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
index 29aa8d4..abf57e3 100644
--- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
+++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
@@ -104,6 +104,8 @@ public class StorageInstaller {
public static final int STATUS_GOSSIP_PORT_CONFLICT = 10;
+ public static final int STATUS_UNKNOWN_HOST = 11;
+
private final String STORAGE_BASEDIR = "rhq-storage";
private final Log log = LogFactory.getLog(StorageInstaller.class);
@@ -437,8 +439,12 @@ public class StorageInstaller {
deployer.updateStorageAuthConf(addresses);
return installerInfo;
+ } catch (UnknownHostException unknownHostException) {
+ throw new StorageInstallerException(
+ "Failed to resolve requested binding address. Please check the installation instructions and host DNS settings. Unknown host "
+ + unknownHostException.getMessage(), unknownHostException, STATUS_UNKNOWN_HOST);
} catch (IOException e) {
- throw new StorageInstallerException("The upgrade cannot proceed. An unexpected I/O error occurred", e,
+ throw new StorageInstallerError("The upgrade cannot proceed. An unexpected I/O error occurred", e,
STATUS_IO_ERROR);
} catch (DeploymentException e) {
throw new StorageInstallerException("The installation cannot proceed. An error occurred during storage "
@@ -549,12 +555,17 @@ public class StorageInstaller {
deployer.updateStorageAuthConf(addresses);
return installerInfo;
+
+ } catch (UnknownHostException unknownHostException) {
+ throw new StorageInstallerException(
+ "Failed to resolve requested binding address. Please check the installation instructions and host DNS settings. Unknown host "
+ + unknownHostException.getMessage(), unknownHostException, STATUS_UNKNOWN_HOST);
+ } catch (IOException e) {
+ throw new StorageInstallerError("The upgrade cannot proceed. An unexpected I/O error occurred", e,
+ STATUS_IO_ERROR);
} catch (DeploymentException e) {
throw new StorageInstallerException("THe upgrade cannot proceed. An error occurred during the storage "
+ "node deployment", e, STATUS_DEPLOYMENT_ERROR);
- } catch (IOException e) {
- throw new StorageInstallerException("The upgrade cannot proceed. An unexpected I/O error occurred", e,
- STATUS_IO_ERROR);
}
}
@@ -935,11 +946,6 @@ public class StorageInstaller {
CommandLine cmdLine = parser.parse(installer.getOptions(), args);
int status = installer.run(cmdLine);
System.exit(status);
- } catch (UnknownHostException unknownHostException) {
- installer.log
- .error("Failed to resolve requested binding address. Please check the installation instructions and host DNS settings. "
- + unknownHostException.getMessage());
- throw unknownHostException;
} catch (ParseException parseException) {
installer.printUsage();
System.exit(STATUS_SHOW_USAGE);
10 years, 7 months
[rhq] modules/core
by lkrejci
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 1dbbf9c6ec033a5a3732bf142b58b65bccf1a052
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Oct 1 18:11:39 2013 +0200
Deprecating unused DATA_PURGE_* system settings.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java b/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
index d19e558..db85e0d 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
@@ -105,13 +105,16 @@ public enum SystemSetting {
DB_SCHEMA_VERSION("DB_SCHEMA_VERSION", PropertySimpleType.STRING, true, true),
- /** How long do we keep data compressed in hourly intervals? This is not configurable through "normal" means but direct DB update. */
+ /** @deprecated since RHQ 4.8.0. This is not used anymore */
+ @Deprecated
DATA_PURGE_1H_PERIOD("CAM_DATA_PURGE_1H", PropertySimpleType.LONG, true, true),
- /** How long do we keep data compressed in 6 hour intervals? This is not configurable through "normal" means but direct DB update. */
+ /** @deprecated since RHQ 4.8.0. This is not used anymore */
+ @Deprecated
DATA_PURGE_6H_PERIOD("CAM_DATA_PURGE_6H", PropertySimpleType.LONG, true, true),
- /** How long do we keep data compressed in 1 day intervals? This is not configurable through "normal" means but direct DB update. */
+ /** @deprecated since RHQ 4.8.0. This is not used anymore */
+ @Deprecated
DATA_PURGE_1D_PERIOD("CAM_DATA_PURGE_1D", PropertySimpleType.LONG, true, true),
/** The length of CoreGUI inactivity (no call to UserSessionManager.refresh()) before a CoreGUI session timeout, Default: 1 hour */
10 years, 7 months
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.bat | 4
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.sh | 43 ++++++++++
2 files changed, 47 insertions(+)
New commits:
commit 6309a893b284b0894de40c57de4e0b5fa554e4b3
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Oct 1 12:04:45 2013 -0400
Since rhq-installer.sh|bat moved to bin/internal we can no longer instruct
users to use it for the --encodepassword option. Add new
bin/rhq-encode-password.sh|bat scripts to fix this, providing a more
obvious script for doing the encoding and protecting bin/internal.
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.bat
new file mode 100644
index 0000000..ccd3841
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.bat
@@ -0,0 +1,4 @@
+@echo off
+set RHQ_SERVER_BIN_DIR_PATH=%~dp0
+%RHQ_SERVER_BIN_DIR_PATH%/internal/rhq-installer --encodepassword
+endlocal
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.sh
new file mode 100644
index 0000000..c4defb7
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-encode-password.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# ----------------------------------------------------------------------
+# Determine what specific platform we are running on.
+# Set some platform-specific variables.
+# ----------------------------------------------------------------------
+
+case "`uname`" in
+ CYGWIN*) _CYGWIN=true
+ ;;
+ Linux*) _LINUX=true
+ ;;
+ Darwin*) _DARWIN=true
+ ;;
+ SunOS*) _SOLARIS=true
+ ;;
+ AIX*) _AIX=true
+ ;;
+esac
+
+# only certain platforms support the -e argument for readlink
+if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
+ _READLINK_ARG="-e"
+fi
+
+# ----------------------------------------------------------------------
+# Determine the RHQ Server installation directory.
+# If RHQ_SERVER_HOME is not defined, we will assume we are running
+# directly from the server installation's bin/internal directory.
+# ----------------------------------------------------------------------
+
+if [ -z "$RHQ_SERVER_HOME" ]; then
+ _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
+ RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/..
+else
+ if [ ! -d "$RHQ_SERVER_HOME" ]; then
+ echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory"
+ echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
+ exit 1
+ fi
+fi
+
+$RHQ_SERVER_HOME/bin/internal/rhq-installer.sh --encodepassword
10 years, 7 months
[rhq] modules/core
by lkrejci
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 3ab3dd077d3750536da6528df506c88c7435b31b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Oct 1 18:04:30 2013 +0200
[BZ 1011971] - Deprecate SystemSetting.SERVER_VERSION
We have equivalent, more detailed, always up-to-date and per-server
information available in SystemManagerRemote.getProductInfo().
SERVER_VERSION would not be updated during server upgrades (this is
old behavior present at least as of RHQ 4.4.0).
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java b/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
index ef9360c..d19e558 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
@@ -95,7 +95,14 @@ public enum SystemSetting {
*/
ALLOW_RESOURCE_GENERIC_PROPERTIES_UPGRADE("RESOURCE_GENERIC_PROPERTIES_UPGRADE", PropertySimpleType.BOOLEAN, true, true),
+ /**
+ * @deprecated This attribute is no longer maintained and might not reflect the true version of the running server.
+ * Use {@code SystemManagerRemote.getProductInfo()} method to get at an equivalent and always up-to-date
+ * information.
+ */
+ @Deprecated
SERVER_VERSION("SERVER_VERSION", PropertySimpleType.STRING, true, true),
+
DB_SCHEMA_VERSION("DB_SCHEMA_VERSION", PropertySimpleType.STRING, true, true),
/** How long do we keep data compressed in hourly intervals? This is not configurable through "normal" means but direct DB update. */
10 years, 7 months
[rhq] modules/common
by John Sanda
modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageProperty.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f6777e901c32704c97b8d55ff5746cdb8984774e
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Oct 1 12:01:59 2013 -0400
fix compiler error
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageProperty.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageProperty.java
index 3b9a5f1..9dca0bc 100644
--- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageProperty.java
+++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageProperty.java
@@ -97,7 +97,7 @@ public enum StorageProperty {
throw new Exception("Properties file not found: [" + storagePropertiesFile.getAbsolutePath() + "]");
}
- PropertiesFileUpdate pfu = new PropertiesFileUpdate(storagePropertiesFile);
+ PropertiesFileUpdate pfu = new PropertiesFileUpdate(storagePropertiesFile.getAbsolutePath());
Properties props = pfu.loadExistingProperties();
final HashMap<String, String> map = new HashMap<String, String>(props.size());
for (Object property : props.keySet()) {
10 years, 7 months
