[rhq] modules/enterprise
by snegrea
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit d1ec06bd05e721e9ae63920edceb3f5eb01cbefc
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jun 21 09:53:02 2013 -0500
Fix a test failure due to attempting to retrieve the simple name of an anonymous class.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
index dc742c6..e4a96d4 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
@@ -96,7 +96,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
GROUP, TEMPLATE
}
- private String universalName;
+ private final String universalName = getClass().getSimpleName();
private Server server;
private Agent agent;
@@ -177,8 +177,6 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
public void execute() throws Exception {
EntityManager em = getEntityManager();
- universalName = getClass().getSimpleName();
-
agent = new Agent(universalName, "localhost", 0, "foo", "bar");
server = new Server();
10 years, 11 months
[rhq] 2 commits - modules/core modules/enterprise
by Simeon Pinder
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 28 +--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 32 +--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 34 +--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 20 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 20 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 20 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 20 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 86 +++++-----
10 files changed, 146 insertions(+), 123 deletions(-)
New commits:
commit 97dbbbfe117313906deead0458eb0b5bb02cdd5e
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Fri Jun 21 10:10:46 2013 -0400
Fix bad LDAP localization indicator.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 74181a5..d8a7302 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -742,8 +742,7 @@ view_admin_systemSettings_AlertPurge_name = Bereinigen der Alarme, die älter si
view_admin_systemSettings_AvailabilityPurge_name = Lösche Verfügbarkeitsdaten, die älter sind als
##view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files must be before being purged from backend storage. This is specified in days.
view_admin_systemSettings_DriftFilePurge_name = Bereinige ungenutzte Drift-Dateine, die älter sind als
-view_admin_systemSettings_LDAPBaseDN_name = view_admin_systemSettings_LDAPBindPW_name = Passwort
-##view_admin_systemSettings_RHQSessionTimeout_desc = If this amount of time passes without any user interaction in the browser, the session is considered as expired and user is aked to log in again. This value is specified in hours.
+#view_admin_systemSettings_LDAPBaseDN_name = Search Base
##view_admin_systemSettings_RHQSessionTimeout_name = GUI Session Timeout
view_admin_systemSettings_TraitPurge_name = Bereinigen der Trait-Daten, die älter sind als
view_admin_systemSettings_dumpToLogFailed = Schreiben der Systeminformation in die Server-Log-Datei ist fehlgeschlagen
commit 44af5cbef03e84bd15102629a506ac59fe611553
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Thu Jun 20 18:53:50 2013 -0400
[BZ 964290] disable query page control by default.
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 2de66d9..1c2f5b9 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
@@ -78,6 +78,8 @@ public enum SystemSetting {
LDAP_FILTER("CAM_LDAP_FILTER", PropertySimpleType.STRING, false, false),
LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER", PropertySimpleType.STRING, false, false),
LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER", PropertySimpleType.STRING, false, false),
+ LDAP_GROUP_PAGING(
+ "CAM_LDAP_GROUP_PAGING", PropertySimpleType.BOOLEAN, false, true),
LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE", PropertySimpleType.LONG, false, true),
LDAP_BASE_DN("CAM_LDAP_BASE_DN", PropertySimpleType.STRING, false, false),
LDAP_BIND_DN("CAM_LDAP_BIND_DN", PropertySimpleType.STRING, false, false),
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 a7638a2..3effd48 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
@@ -497,6 +497,13 @@ public class SystemSettingsView extends EnhancedVLayout implements PropertyValue
pd.setDefaultValue("objectclass=groupOfNames");
break;
+ case LDAP_GROUP_PAGING:
+ pd.setDescription(MSG.view_admin_systemSettings_LDAPGroupUsePaging_desc());
+ pd.setDisplayName(MSG.view_admin_systemSettings_LDAPGroupUsePaging_name());
+ pd.setPropertyGroupDefinition(ldapGroup);
+ pd.setDefaultValue("false");
+ break;
+
case LDAP_GROUP_QUERY_PAGE_SIZE:
pd.setDescription(MSG.view_admin_systemSettings_LDAPGroupPageSize_desc());
pd.setDisplayName(MSG.view_admin_systemSettings_LDAPGroupPageSize_name());
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 fc57509..4c1af1f 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
@@ -21,9 +21,9 @@ chart_hover_start_label = Start
chart_hover_time_format = %I:%M:%S %p
chart_ie_not_supported = Charting is not available for this browser.
chart_no_data_label = No Data
-chart_slider_button_bar_minute = Min
-chart_slider_button_bar_hour = Hour
chart_slider_button_bar_day = Day
+chart_slider_button_bar_hour = Hour
+chart_slider_button_bar_minute = Min
chart_slider_button_bar_month = Month
chart_slider_button_bar_year = Year
chart_time_label = Start
@@ -40,16 +40,6 @@ common_button_ack_all = Acknowledge All
common_button_add = Add
common_button_advanced = Advanced...
common_button_apply = Apply
-common_buttonbar_custom_window_title= Date Range
-common_buttonbar_custom_window_subtitle= Custom
-common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-common_buttonbar_end_date= End Date
-common_buttonbar_end_time= End Time
-common_buttonbar_start_date= End Date
-common_buttonbar_start_time= End Time
-common_buttonbar_custom = Custom...
-common_buttonbar_custom_cancel = Cancel
-common_buttonbar_custom_save = Save
common_button_cancel = Cancel
common_button_close = Close
common_button_compare = Compare
@@ -82,6 +72,16 @@ common_button_set = Set
common_button_showDetails = Show Details...
common_button_unignore = Unignore
common_button_uninventory = Uninventory
+common_buttonbar_custom = Custom...
+common_buttonbar_custom_cancel = Cancel
+common_buttonbar_custom_save = Save
+common_buttonbar_custom_window_subtitle = Custom
+common_buttonbar_custom_window_title = Date Range
+common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+common_buttonbar_end_date = End Date
+common_buttonbar_end_time = End Time
+common_buttonbar_start_date = End Date
+common_buttonbar_start_time = End Time
common_calendar_april_short = apr
common_calendar_august_short = aug
common_calendar_december_short = dec
@@ -802,6 +802,8 @@ view_admin_systemSettings_LDAPGroupMember_desc = LDAP search filter that is used
view_admin_systemSettings_LDAPGroupMember_name = Group Member Filter
view_admin_systemSettings_LDAPGroupPageSize_desc = To support RFC 2696, this LDAP Group Page Size search parameter is used in conjunction with other group search parameters to limit the number of group members returned with each query result. This value should be set as high as possible and to the server side max page size value for best results. Values > (server max page size) will have no effect. Lower this value when LDAP group queries are taking too long to return. Default is 1000 results.
view_admin_systemSettings_LDAPGroupPageSize_name = Group Search Page Size
+view_admin_systemSettings_LDAPGroupUsePaging_desc = Defines whether LDAP Group queries should use Simple Paged Results functionality as defined by RFC 2696. Specifically for LDAP servers that limit query results, the client will continually page through all the results in Group Page Size chunks until done. Defaults to false.
+view_admin_systemSettings_LDAPGroupUsePaging_name = Use Group Query Paging
view_admin_systemSettings_LDAPGroupUsePosixGroup_desc = Defines whether to use PosixGroup symantics for group membership check. With PosixGroups the Group Member Filter is usually set to 'memberUid' and the Group Filter to 'objectclass=posixGroup'.
view_admin_systemSettings_LDAPGroupUsePosixGroup_name = Is PosixGroup
view_admin_systemSettings_LDAPLoginProperty_desc = The LDAP property that contains the user name. Defaults to "cn". If multiple matches are found, the first entry found is used.
@@ -1762,8 +1764,8 @@ view_login_welcomeMsg = Welcome to {0}! <br/><br/> Enter/update the following fi
view_measureRange_last = Time Range - Previous
view_measureRange_simple = Simple...
view_measureRange_start = Time Range - Start
-view_measureTable_chartMetricValues = Chart Selected Metrics
view_measureTable_addToDashboard = Add To Dashboard
+view_measureTable_chartMetricValues = Chart Selected Metrics
view_measureTable_getLive = Get Live Value
view_measureTable_getLive_failure = Cannot get live values for those metrics. Make sure the agent is running and the managed resource is up.
view_measureTable_live_title = Live Data
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index a60b75e..d76dcf7 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -41,19 +41,19 @@
##chart_title_peak_label = Max
##chart_hover_availability_label = Availability
##chart_hover_availability_type_warn = MIXED
+##chart_hover_bar_label = Duration
chart_hover_date_format = %d.%m.%y
+##chart_hover_end_label = End
+##chart_hover_period_label = Period
+##chart_hover_start_label = Start
chart_hover_time_format = %H:%M:%S
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
-##chart_slider_button_bar_minute = Min
-##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_day = Day
+##chart_slider_button_bar_hour = Hour
+##chart_slider_button_bar_minute = Min
##chart_slider_button_bar_month = Month
##chart_slider_button_bar_year = Year
-##chart_hover_start_label = Start
-##chart_hover_end_label = End
-##chart_hover_period_label = Period
-##chart_hover_bar_label = Duration
common_alert_high = Vysoká
common_alert_low = Nízká
common_alert_medium = Střední
@@ -63,16 +63,6 @@ common_button_ack_all = Potvrdit všechny
common_button_add = Přidat
common_button_advanced = Rozšířené...
common_button_apply = Použít
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-common_buttonbar_datetime_format=dd.MM.yy hh:mm
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= End Date
-##common_buttonbar_start_time= End Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = Storno
common_button_close = Zavřít
common_button_compare = Porovnat
@@ -105,6 +95,16 @@ common_button_set = Nastavit
common_button_showDetails = Zobrazi detaily...
##common_button_unignore = Unignore
common_button_uninventory = Odstranit z inventáře
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+common_buttonbar_datetime_format = dd.MM.yy hh:mm
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = End Date
+##common_buttonbar_start_time = End Time
common_calendar_april_short = dub
common_calendar_august_short = srp
common_calendar_december_short = pro
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 78b4898..74181a5 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -24,6 +24,11 @@ chart_hover_start_label = Start
chart_hover_time_format = %H:%M:%S
chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt
chart_no_data_label = Keine Daten vorhanden
+chart_slider_button_bar_day = Tag
+chart_slider_button_bar_hour = Stunde
+chart_slider_button_bar_minute = Minute
+chart_slider_button_bar_month = Monat
+chart_slider_button_bar_year = Jahr
chart_time_label = Start
chart_title_avg_label = \u2300
chart_title_min_label = Min
@@ -38,16 +43,6 @@ common_button_ack_all = Alle bestätigen
common_button_add = Hinzufügen
common_button_advanced = Erweitert...
common_button_apply = Anwenden
-common_buttonbar_custom_window_title=Zeitbereich
-common_buttonbar_datetime_format=dd.MM.yy hh:mm
-common_buttonbar_end_date=Enddatum
-common_buttonbar_end_time=Endzeitpunkt
-common_buttonbar_start_date=Startdatum
-common_buttonbar_start_time=Startzeitpunkt
-common_buttonbar_custom_cancel=Abbrechen
-common_buttonbar_custom_save=Speichern
-common_buttonbar_custom_window_subtitle= Spezifisch
-common_buttonbar_custom = Spezifisch...
common_button_cancel = Abbrechen
common_button_close = Schließen
common_button_compare = Vergleichen
@@ -80,6 +75,16 @@ common_button_set = Setzen
common_button_showDetails = Details anzeigen...
common_button_unignore = Ignorieren aufheben
common_button_uninventory = Aus dem Inventar löschen
+common_buttonbar_custom = Spezifisch...
+common_buttonbar_custom_cancel = Abbrechen
+common_buttonbar_custom_save = Speichern
+common_buttonbar_custom_window_subtitle = Spezifisch
+common_buttonbar_custom_window_title = Zeitbereich
+common_buttonbar_datetime_format = dd.MM.yy hh:mm
+common_buttonbar_end_date = Enddatum
+common_buttonbar_end_time = Endzeitpunkt
+common_buttonbar_start_date = Startdatum
+common_buttonbar_start_time = Startzeitpunkt
common_calendar_april_short = Apr
common_calendar_august_short = Aug
common_calendar_december_short = Dez
@@ -737,8 +742,7 @@ view_admin_systemSettings_AlertPurge_name = Bereinigen der Alarme, die älter si
view_admin_systemSettings_AvailabilityPurge_name = Lösche Verfügbarkeitsdaten, die älter sind als
##view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files must be before being purged from backend storage. This is specified in days.
view_admin_systemSettings_DriftFilePurge_name = Bereinige ungenutzte Drift-Dateine, die älter sind als
-view_admin_systemSettings_LDAPBaseDN_name = \
-view_admin_systemSettings_LDAPBindPW_name = Passwort
+view_admin_systemSettings_LDAPBaseDN_name = view_admin_systemSettings_LDAPBindPW_name = Passwort
##view_admin_systemSettings_RHQSessionTimeout_desc = If this amount of time passes without any user interaction in the browser, the session is considered as expired and user is aked to log in again. This value is specified in hours.
##view_admin_systemSettings_RHQSessionTimeout_name = GUI Session Timeout
view_admin_systemSettings_TraitPurge_name = Bereinigen der Trait-Daten, die älter sind als
@@ -2061,8 +2065,3 @@ widget_typeCache_loadFail = Konnte die Metadaten für den Ressourcen-Typ nicht l
widget_typeTree_badTemplateType = Ungültige URL. Unbekannter Vorlagen-Typ [{0}]
widget_typeTree_badTypeId = Ungültige URL. Unbekannte Ressource-Typ-ID [{0}]
widget_typeTree_loadFail = Konnte die Ressource-Typen nicht laden
-chart_slider_button_bar_year=Jahr
-chart_slider_button_bar_month=Monat
-chart_slider_button_bar_day=Tag
-chart_slider_button_bar_hour=Stunde
-chart_slider_button_bar_minute=Minute
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 8eeb7c7..3c634a3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -43,16 +43,6 @@ common_button_ack_all = すべてを確認
common_button_add = 追加
common_button_advanced = 高度な設定...
common_button_apply = 適用
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= End Date
-##common_buttonbar_start_time= End Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = キャンセル
common_button_close = 閉じる
common_button_compare = 比較
@@ -85,6 +75,16 @@ common_button_set = 設定
common_button_showDetails = 詳細表示...
##common_button_unignore = Unignore
common_button_uninventory = アンインベントリ
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = End Date
+##common_buttonbar_start_time = End Time
common_calendar_april_short = 4月
common_calendar_august_short = 8月
common_calendar_december_short = 12月
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index dac6fe7..4b36bf6 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -41,16 +41,6 @@ common_button_ack_all = 전체 확인
common_button_add = 추가
common_button_advanced = 고급 설정...
common_button_apply = 적용
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= End Date
-##common_buttonbar_start_time= End Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = 취소
common_button_close = 닫기
common_button_compare = 비교
@@ -82,6 +72,16 @@ common_button_set = 설정
common_button_showDetails = 자세히보기...
##common_button_unignore = Unignore
common_button_uninventory = 인벤토리 제거
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = End Date
+##common_buttonbar_start_time = End Time
common_calendar_april_short = 4월
common_calendar_august_short = 8월
common_calendar_december_short = 12월
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 829f1aa..9a04124 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -40,16 +40,6 @@ common_button_ack_all = Confirmar Todos
common_button_add = Adicionar
common_button_advanced = Avan\u00E7ado...
common_button_apply = Aplicar
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= End Date
-##common_buttonbar_start_time= End Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = Cancelar
common_button_close = Fechar
common_button_compare = Comparar
@@ -82,6 +72,16 @@ common_button_set = Definir
common_button_showDetails = Mostrar Detalhes...
##common_button_unignore = Unignore
common_button_uninventory = Remover do Invent\u00E1rio
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = End Date
+##common_buttonbar_start_time = End Time
common_calendar_april_short = abr
common_calendar_august_short = ago
common_calendar_december_short = dez
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index a39505e..ad20a0b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -40,16 +40,6 @@ common_button_ack_all = \u786e\u8ba4\u6240\u6709
common_button_add = \u6dfb\u52a0
common_button_advanced = \u9ad8\u7ea7...
common_button_apply = \u63a5\u53d7
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= End Date
-##common_buttonbar_start_time= End Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = \u53d6\u6d88
common_button_close = \u5173\u95ed
common_button_compare = \u5bf9\u6bd4
@@ -82,6 +72,16 @@ common_button_set = Set
common_button_showDetails = \u67e5\u770b\u8be6\u60c5...
##common_button_unignore = Unignore
common_button_uninventory = Uninventory
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = End Date
+##common_buttonbar_start_time = End Time
common_calendar_april_short = \u56db\u6708
common_calendar_august_short = \u516b\u6708
common_calendar_december_short = \u5341\u4e8c\u6708
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
index 276a9f5..532a944 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
@@ -409,29 +409,39 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
String[] attributes = { "cn", "description" };
searchControls.setReturningAttributes(attributes);
+ //detect whether to use Query Page Control
+ String groupUseQueryPaging = systemConfig.getProperty(SystemSetting.LDAP_GROUP_PAGING.getInternalName(),
+ "false");
+ if (groupUseQueryPaging == null) {
+ groupUseQueryPaging = Boolean.toString(false);//default to false
+ }
+ boolean useQueryPaging = Boolean.valueOf(groupUseQueryPaging);
+
//BZ:964250: add rfc 2696
//default to 1000 results. System setting page size from UI should be non-negative integer > 0.
//additionally as system settings are modifiable via CLI which may not have param checking enabled do some
//more checking.
int defaultPageSize = 1000;
- Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord()));
- String groupPageSize = options.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), ""
- + defaultPageSize);
- if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) {
- int passedInPageSize = -1;
- try {
- passedInPageSize = Integer.valueOf(groupPageSize.trim());
- if (passedInPageSize > 0) {
- defaultPageSize = passedInPageSize;
+ // only if they're enabled in the UI.
+ if (useQueryPaging) {
+ Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord()));
+ String groupPageSize = options.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), ""
+ + defaultPageSize);
+ if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) {
+ int passedInPageSize = -1;
+ try {
+ passedInPageSize = Integer.valueOf(groupPageSize.trim());
+ if (passedInPageSize > 0) {
+ defaultPageSize = passedInPageSize;
+ }
+ } catch (NumberFormatException nfe) {
+ //log issue and do nothing. Go with the default.
+ log.debug("LDAP Group Page Size passed '" + groupPageSize
+ + "' in is invalid. Defaulting to 1000." + nfe.getMessage());
}
- } catch (NumberFormatException nfe) {
- //log issue and do nothing. Go with the default.
- log.debug("LDAP Group Page Size passed '" + groupPageSize + "' in is invalid. Defaulting to 1000."
- + nfe.getMessage());
}
+ ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, Control.CRITICAL) });
}
- ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, Control.CRITICAL) });
-
// Loop through each configured base DN. It may be useful
// in the future to allow for a filter to be configured for
// each BaseDN, but for now the filter will apply to all.
@@ -440,27 +450,12 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
for (int x = 0; x < baseDNs.length; x++) {
executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x);
- //handle paged results if they're being used here
- byte[] cookie = null;
- Control[] controls = ctx.getResponseControls();
- if (controls != null) {
- for (Control control : controls) {
- if (control instanceof PagedResultsResponseControl) {
- PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control;
- cookie = pagedResult.getCookie();
- }
- }
- }
- //continually parsing pages of results until we're done.
- while (cookie != null) {
- //ensure the next requests contains the session/cookie details
- ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie,
- Control.CRITICAL) });
- executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x);
- //empty out cookie
- cookie = null;
- //test for further iterations
- controls = ctx.getResponseControls();
+ // continually parsing pages of results until we're done.
+ // only if they're enabled in the UI.
+ if (useQueryPaging) {
+ //handle paged results if they're being used here
+ byte[] cookie = null;
+ Control[] controls = ctx.getResponseControls();
if (controls != null) {
for (Control control : controls) {
if (control instanceof PagedResultsResponseControl) {
@@ -469,6 +464,25 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
}
}
}
+ //continually parsing pages of results until we're done.
+ while (cookie != null) {
+ //ensure the next requests contains the session/cookie details
+ ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie,
+ Control.CRITICAL) });
+ executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x);
+ //empty out cookie
+ cookie = null;
+ //test for further iterations
+ controls = ctx.getResponseControls();
+ if (controls != null) {
+ for (Control control : controls) {
+ if (control instanceof PagedResultsResponseControl) {
+ PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control;
+ cookie = pagedResult.getCookie();
+ }
+ }
+ }
+ }
}
}
} catch (NamingException e) {
10 years, 11 months
[rhq] etc/scripts
by Jiri Kremser
etc/scripts/rhqctl-completion.sh | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
New commits:
commit e008c08c4855bc8975d2ab4649ffe22d3c708e06
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Jun 21 00:12:03 2013 +0200
Updating the rhqct bash completion script.
diff --git a/etc/scripts/rhqctl-completion.sh b/etc/scripts/rhqctl-completion.sh
index 8ec34f4..ee0d0cc 100755
--- a/etc/scripts/rhqctl-completion.sh
+++ b/etc/scripts/rhqctl-completion.sh
@@ -4,7 +4,7 @@
# to auto load this script move this script to /etc/bash_completion.d/
_rhqctl() {
- local cur prev opts agentServerStorage storageInstallSubopts agentInstallSubopts serverInstallSubopts first
+ local opts agentServerStorage storageInstallSubopts agentInstallSubopts serverInstallSubopts upgradeSubopts dataMingratorSubopts
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -12,12 +12,15 @@ _rhqctl() {
opts="console install start status stop upgrade"
agentServerStorage="--agent --server --storage"
serverStorage="--server --storage"
+ dataMigratorSubopts="none estimate print-command do-it"
# the spaces in the beginning and in the end are important here
- storageInstallSubopts=" --storage-config --storage-dir "
- agentInstallSubopts=" --agent-config --agent-dir --agent-preference "
+ storageInstallSubopts=" --storage-config --storage-data-root-dir "
+ agentInstallSubopts=" --agent-auto-start --agent-config --agent-preference "
serverInstallSubopts=" --server-config "
- upgradeSubopts=" --from-agent-dir --from-server-dir --agent-no-start "
+ upgradeSubopts=" --from-agent-dir --from-server-dir --agent-auto-start --run-data-migrator --storage-config --storage-data-root-dir --use-remote-storage-node "
+ booleanSubopts=" --agent-auto-start --use-remote-storage-node "
+ trueFalse="true false"
if [[ "${COMP_LINE}" =~ ^\.?rhqctl[[:space:]]*$ ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
@@ -34,8 +37,15 @@ _rhqctl() {
return 0
elif [[ "x${first}" == "xupgrade" ]] ; then
if [[ "${upgradeSubopts}" == *" ${prev} "* ]] ; then
+ if [[ "x${prev}" == "x--run-data-migrator" ]] ; then
+ COMPREPLY=( $(compgen -W "${dataMigratorSubopts}" -- ${cur}) )
+ return 0
+ else
+ checkForBooleanSubopt ${prev}
+ [[ "x$boolean" == "x1" ]] && return 0
completePath ${cur}
return 0
+ fi
fi
COMPREPLY=( $(compgen -W "${upgradeSubopts}" -- ${cur}) )
return 0
@@ -55,6 +65,8 @@ _rhqctl() {
return 0
elif [[ "x${second}" == "x--agent" ]] ; then
if [[ "${agentInstallSubopts}" == *" ${prev} "* ]] ; then
+ checkForBooleanSubopt ${prev}
+ [[ "x$boolean" == "x1" ]] && return 0
completePath ${cur}
return 0
fi
@@ -78,8 +90,6 @@ _rhqctl() {
}
function completePath(){
- [ $# -gt 1 ] && return 1
- cur=$1
if [[ "${cur}x" == *"/x" ]] ; then
toComplete="${cur}"
else
@@ -88,4 +98,13 @@ function completePath(){
COMPREPLY=( $(compgen -W "$( ls -1 ${toComplete} 2> /dev/null )" ) )
}
+function checkForBooleanSubopt(){
+ if [[ "${booleanSubopts}" == *" ${prev} "* ]] ; then
+ COMPREPLY=( $(compgen -W "${trueFalse}" -- ${cur} ) )
+ boolean="1"
+ else
+ boolean="0"
+ fi
+}
+
complete -F _rhqctl rhqctl
10 years, 11 months
[rhq] modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c607e0ec6830314701d34c7eb00a8583fc00988a
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Jun 20 12:13:40 2013 -0700
Use the minified versions of javascript libraries for d3 and nvd3.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 72184b1..51bec0a 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -57,8 +57,8 @@
-->
<script src="/coregui/js/jquery-1.7.2.min.js"/>
<script src="/coregui/js/jquery.sparkline-2.1.min.js"/>
- <script src="/coregui/js/d3.v3.js"/>
- <script src="/coregui/js/nv.d3.js"/>
+ <script src="/coregui/js/d3.v3.min.js"/>
+ <script src="/coregui/js/nv.d3.min.js"/>
<script src="/coregui/js/jquery.tipsy.js"/>
10 years, 11 months
[rhq] modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e29a0aef354feeacfe26d926c2237a76367e57c
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Jun 20 10:31:52 2013 -0700
Add some space to Button toolbar for new Date/Time Range editor (per UXD request).
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
index 2cda97b..d416222 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
@@ -85,7 +85,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
ToolStrip toolStrip = new ToolStrip();
toolStrip.setWidth100();
- toolStrip.setHeight(24);
+ toolStrip.setHeight(34);
toolStrip.addSpacer(10);
10 years, 11 months
[rhq] modules/common
by John Sanda
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java | 3 +++
modules/common/cassandra-schema/src/main/resources/schema/create/0001.xml | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 4561df405ea8708554e8482f4dd53bc93d7adb72
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Jun 20 12:08:47 2013 -0400
do not drop cassandra user. instead take away super user status and assign a random password.
Dropping the cassandra user was causing some problems when deploying a second
node. The cassandra user would get created by the second note, but then I was
not able to connect to either node as the cassandra or as the rhqadmin user.
diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
index 5ad78d5..e2daa2f 100644
--- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
+++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
@@ -27,6 +27,7 @@ package org.rhq.cassandra.schema;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
import com.datastax.driver.core.BoundStatement;
import com.datastax.driver.core.PreparedStatement;
@@ -84,6 +85,8 @@ public class VersionManager extends AbstractManager {
try {
initCluster();
if (!schemaExists()) {
+ session.execute("ALTER USER cassandra NOSUPERUSER");
+ session.execute("ALTER USER cassandra WITH PASSWORD '" + UUID.randomUUID() + "'");
this.executeTask(Task.Create);
} else {
log.info("RHQ schema already exists.");
diff --git a/modules/common/cassandra-schema/src/main/resources/schema/create/0001.xml b/modules/common/cassandra-schema/src/main/resources/schema/create/0001.xml
index ebd8cbf..7a8d901 100644
--- a/modules/common/cassandra-schema/src/main/resources/schema/create/0001.xml
+++ b/modules/common/cassandra-schema/src/main/resources/schema/create/0001.xml
@@ -1,9 +1,5 @@
<updatePlan>
<step>
- DROP USER cassandra;
- </step>
-
- <step>
CREATE KEYSPACE rhq WITH
replication = {'class': 'SimpleStrategy', 'replication_factor': 1};
</step>
10 years, 11 months
[rhq] modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 9ee41b96d410425a085534fc40737783479fc3c3
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Jun 20 08:59:56 2013 -0700
Keep Portal graphs from showing d3 brushes.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
index 3922d44..08bb69d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
@@ -654,7 +654,9 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
createHeader(chartContext.chartTitle);
createYAxisGridLines();
- createBrush();
+ if(!chartContext.isPortalGraph){
+ createBrush();
+ }
createStackedBars();
createXandYAxes();
createAvgLines();
10 years, 11 months
[rhq] modules/enterprise
by Jiri Kremser
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java | 12 +++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit b45eb6516643622a97360700ecd52a899f90c8be
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Jun 20 15:28:27 2013 +0200
[BZ 974436] - Edit alert condition -> metric value is not converted to target units - Converting correctly the value based on it's measurement units family.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java
index 05f4622..870140d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java
@@ -56,6 +56,7 @@ import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.NumericType;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.resource.ResourceCategory;
@@ -65,6 +66,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem;
import org.rhq.enterprise.gui.coregui.client.components.form.NumberWithUnitsValidator;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
import org.rhq.enterprise.gui.coregui.client.util.measurement.MeasurementParser;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
@@ -599,7 +601,15 @@ public class ConditionEditor extends EnhancedVLayout {
absoluteValue.setValidators(new NumberWithUnitsValidator(this.resourceType.getMetricDefinitions(),
metricDropDownMenu));
if (editMode) {
- absoluteValue.setDefaultValue(String.valueOf(existingCondition.getThreshold()));
+ MeasurementUnits units = existingCondition.getMeasurementDefinition().getUnits();
+ double doubleValue = existingCondition.getThreshold();
+ MeasurementNumericValueAndUnits valueWithUnits = null;
+ if (units.getFamily() == MeasurementUnits.Family.RELATIVE) {
+ valueWithUnits = new MeasurementNumericValueAndUnits(doubleValue * 100, MeasurementUnits.PERCENTAGE);
+ } else {
+ valueWithUnits = MeasurementConverterClient.fit(doubleValue, units);
+ }
+ absoluteValue.setDefaultValue(valueWithUnits.toString());
}
absoluteValue.setShowIfCondition(ifFunc);
formItems.add(absoluteValue);
10 years, 11 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f3a8d94df2c339119f892a25f570e745b627544f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jun 20 15:39:48 2013 +0200
Name the new graphs subtab "Graphs"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 22fc1fe..052a775 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -196,7 +196,7 @@ public class ResourceDetailView extends
monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
- monitorNewGraphs = new SubTab(monitoringTab, new ViewName("NewGraphs", MSG.view_tabs_common_graphs()), null);
+ monitorNewGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null);
monitorTables = new SubTab(monitoringTab, new ViewName("Tables", "Tables"), null);
monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null);
10 years, 11 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 8 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 29 +++++-----
2 files changed, 21 insertions(+), 16 deletions(-)
New commits:
commit 0ffd362436ba40d21b3a6aad2c1880cb5c3a2b7c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jun 20 14:31:56 2013 +0200
Some translations for the new chart time selectors.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index b9fbbdd..a60b75e 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -41,8 +41,8 @@
##chart_title_peak_label = Max
##chart_hover_availability_label = Availability
##chart_hover_availability_type_warn = MIXED
-##chart_hover_date_format = %m/%d/%y
-##chart_hover_time_format = %I:%M:%S %p
+chart_hover_date_format = %d.%m.%y
+chart_hover_time_format = %H:%M:%S
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
##chart_slider_button_bar_minute = Min
@@ -65,7 +65,7 @@ common_button_advanced = Rozšířené...
common_button_apply = Použít
##common_buttonbar_custom_window_title= Date Range
##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
+common_buttonbar_datetime_format=dd.MM.yy hh:mm
##common_buttonbar_end_date= End Date
##common_buttonbar_end_time= End Time
##common_buttonbar_start_date= End Date
@@ -414,7 +414,7 @@ dataSource_scheduledOperations_field_operation = Operace
dataSource_scheduledOperations_field_resource = Zdroj
dataSource_schedules_disableFailure_group = Nepodařilo se zakázat sběr [{0}] měření pro skupinu zdrojů s ID [{1}]. Metriky: [{2}]
dataSource_schedules_disableFailure_resource = Nepodařilo se zakázat sběr [{0}] měření pro zdroj s ID [{1}]. Metriky: [{2}]
-dataSource_schedules_disableSuccessful_concise = Byl zakázán sběr [{0}] měření.
+dataSource_schedules_disableSuccessful_concise = Byl zakázán sběr [{0}] měření.
dataSource_schedules_disableSuccessful_full_group = Byl zakázán sběr [{0}] měření pro skupinu zdrojů s ID [{1}]. Měření: [{2}]
dataSource_schedules_disableSuccessful_full_resource = Byl zakázán sběr [{0}] měření pro zdroj s ID [{1}]. Měření: [{2}]
dataSource_schedules_enableFailure_group = Nepodařilo se povolit sběr [{0}] měření pro skupinu zdrojů s ID [{1}]. Měření: [{2}]
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index a3e22e7..78b4898 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -21,10 +21,10 @@ chart_hover_date_format = %d.%m.%y
chart_hover_end_label = Ende
chart_hover_period_label = Zeitraum
chart_hover_start_label = Start
-##chart_hover_time_format = %I:%M:%S %p
+chart_hover_time_format = %H:%M:%S
chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt
chart_no_data_label = Keine Daten vorhanden
-##chart_time_label = Start
+chart_time_label = Start
chart_title_avg_label = \u2300
chart_title_min_label = Min
chart_title_peak_label = Max
@@ -38,16 +38,16 @@ common_button_ack_all = Alle bestätigen
common_button_add = Hinzufügen
common_button_advanced = Erweitert...
common_button_apply = Anwenden
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= End Date
-##common_buttonbar_start_time= End Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
+common_buttonbar_custom_window_title=Zeitbereich
+common_buttonbar_datetime_format=dd.MM.yy hh:mm
+common_buttonbar_end_date=Enddatum
+common_buttonbar_end_time=Endzeitpunkt
+common_buttonbar_start_date=Startdatum
+common_buttonbar_start_time=Startzeitpunkt
+common_buttonbar_custom_cancel=Abbrechen
+common_buttonbar_custom_save=Speichern
+common_buttonbar_custom_window_subtitle= Spezifisch
+common_buttonbar_custom = Spezifisch...
common_button_cancel = Abbrechen
common_button_close = Schließen
common_button_compare = Vergleichen
@@ -2061,3 +2061,8 @@ widget_typeCache_loadFail = Konnte die Metadaten für den Ressourcen-Typ nicht l
widget_typeTree_badTemplateType = Ungültige URL. Unbekannter Vorlagen-Typ [{0}]
widget_typeTree_badTypeId = Ungültige URL. Unbekannte Ressource-Typ-ID [{0}]
widget_typeTree_loadFail = Konnte die Ressource-Typen nicht laden
+chart_slider_button_bar_year=Jahr
+chart_slider_button_bar_month=Monat
+chart_slider_button_bar_day=Tag
+chart_slider_button_bar_hour=Stunde
+chart_slider_button_bar_minute=Minute
10 years, 11 months