modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 2 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 4 ++-- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 4 ---- modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-)
New commits: commit a8622b6e11a76be7558ef8561f475e827ff2a80c Author: Heiko W. Rupp hwr@redhat.com Date: Mon Jan 30 13:57:15 2012 +0100
BZ 758655 - remove no longer needed attributes, as they were removed in AS7
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java index 1a44230..4a7c4cc 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java @@ -55,7 +55,6 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet op = new Operation("add",theAddress); addRequiredToOp(op,parameters,"driver-name"); addRequiredToOp(op,parameters,"jndi-name"); - addRequiredToOp(op, parameters, "pool-name"); addRequiredToOp(op, parameters, "connection-url"); addOptionalToOp(op, parameters, "user-name"); addOptionalToOp(op,parameters,"password"); @@ -68,14 +67,11 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet op = new Operation("add",theAddress); addRequiredToOp(op,parameters,"driver-name"); addRequiredToOp(op,parameters,"jndi-name"); - addRequiredToOp(op,parameters,"pool-name"); - addRequiredToOp(op,parameters,"connection-url"); addOptionalToOp(op,parameters,"user-name"); addOptionalToOp(op,parameters,"password"); addRequiredToOp(op,parameters,"xa-data-source-class");
Map<String,Object> props = new HashMap<String, Object>(); // TODO - props.put("_foo","_bar"); // TODO AS7-1209 op.addAdditionalProperty("xa-data-source-properties",props);
} diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 2e6aba3..3f29cce 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -1021,7 +1021,6 @@ </c:simple-property> <c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/> <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/> - <c:simple-property name="pool-name" description="Name of the pool" required="true"/> <c:simple-property name="user-name" description="User name for DB-connections" required="false" /> <c:simple-property name="password" description="Password" type="password" required="false"/> </parameters> @@ -1038,8 +1037,7 @@ </c:simple-property> <c:simple-property name="xa-data-source-class" required="true" description="xa-data-source-class"/> <c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/> - <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/> - <c:simple-property name="pool-name" description="Name of the pool" required="true"/> + <!--<c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>--> <c:simple-property name="user-name" description="User name for DB-connections" required="false" /> <c:simple-property name="password" description="Password" type="password" required="false"/> <c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties" required="false">
commit 04f7e30401feb9cc210e075779792db1c08e02b6 Author: Heiko W. Rupp hwr@redhat.com Date: Mon Jan 30 12:05:16 2012 +0100
Small comment fix.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java index b5cf9e8..1badea3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java @@ -438,7 +438,7 @@ public class SystemSettingsView extends LocatableVLayout implements PropertyValu pd.setDescription(MSG.view_admin_systemSettings_BaselineDataSet_desc()); pd.setDisplayName(MSG.view_admin_systemSettings_BaselineDataSet_name()); pd.setPropertyGroupDefinition(baselineGroup); - pd.addConstraints(new IntegerRangeConstraint(Long.valueOf(1), Long.valueOf(14))); // can't do more than 14 days since our raw tables don't hold more + pd.addConstraints(new IntegerRangeConstraint(Long.valueOf(1), Long.valueOf(14))); // can't do more than 14 days since our 1h table doesn't hold more pd.setDefaultValue("7"); break;
commit 1bdc6262cd500351b67d5685562f3e54ab03e2ff Author: Heiko W. Rupp hwr@redhat.com Date: Mon Jan 30 11:35:36 2012 +0100
Add a note about the max. allowed value.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index e96c012..8de2555 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -507,7 +507,7 @@ view_admin_downloads_bundle_link_label = Link view_admin_downloads_bundle_link_value = Download Bundle Deployer {0} view_admin_downloads_bundle_loadError = Cannot get bundle deployer info view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download -view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition. +view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition. view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download view_admin_downloads_cliDownload = Command Line Client Download @@ -587,7 +587,7 @@ view_admin_systemSettings_BaseURL_desc = A URL to the server GUI, used mainly wi view_admin_systemSettings_BaseURL_name = GUI Console URL view_admin_systemSettings_BaselineDataSet_desc = The amount of past measurement data that is used to determine a baseline. This is specified in days. view_admin_systemSettings_BaselineDataSet_name = Baseline Dataset -view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days. +view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days. Maximum value is 'Baseline Dataset'. view_admin_systemSettings_BaselineFrequency_name = Baseline Calculation Frequency view_admin_systemSettings_DataMaintenance_desc = How often database maintenance is performed (for example, vacuuming if using Postgres). This is specified in hours. view_admin_systemSettings_DataMaintenance_name = Database Maintenance Period
rhq-commits@lists.fedorahosted.org