[rhq] Branch 'release/jon3.2.x' - 2 commits - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java | 135 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java | 5
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties | 4
11 files changed, 84 insertions(+), 91 deletions(-)
New commits:
commit 13869f25a6a25f581d41e00ba4d4b8ede438bc3f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Oct 18 08:53:44 2013 -0400
BZ 1013597 - I have no idea why it did this, but eclipse message bundle editor deleted tons of lines in here that I never touched. this reverts the file back to the original but changes the two lines I want changed (values for view_aboutBox_version and view_aboutBox_buildNumber)
(cherry picked from commit d563712cdff9399e4ce386bbdd6021bc86ba7d44)
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
index ce9b5a1..2e2763d 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
@@ -59,10 +59,12 @@ common_button_create_child = åãäœæ
common_button_delete = åé€
common_button_delete_all = ãã¹ãŠãåé€
common_button_disable = ç¡å¹
+common_button_dump_sysInfo_to_log = ãã³ãã·ã¹ãã æ
å ±
common_button_edit = ç·šé
common_button_enable = æå¹
common_button_execute = å®è¡
common_button_finish = å®äº
+common_button_fixedWidth = åºå®å¹
common_button_ignore = ç¡èŠ
common_button_import = ã€ã³ããŒã
common_button_new = æ°èŠ
@@ -111,6 +113,8 @@ common_label_day = æ¥
common_label_error = ãšã©ãŒ
common_label_filters = ãã£ã«ã¿ãŒ
common_label_hour = æé
+common_label_item = é
ç®
+common_label_items = é
ç®
common_label_link = ãªã³ã¯
common_label_month = æ
common_label_none = ãªã
@@ -131,12 +135,15 @@ common_msg_deleteConfirm = éžæããã {0} ãåé€ããŠãããããã§
common_msg_deleted = {0} {1} ãåé€ãããŸããã
common_msg_emphasizedNotePrefix = 泚æ:
common_msg_loading = ããŒãäž...
+common_msg_noItemsToShow = 衚瀺ããé
ç®ã¯ãããŸãã
+common_msg_notYetImplemented = å®è£
ãããŠããŸãã
common_msg_see_more = 詳现...
common_msg_step_x_of_y = ã¹ããã {1} äž {0} çªã
##common_msg_typeToFilterResults = å®è£
ãããŠããŸãã
common_severity_debug = ãããã°
common_severity_error = ãšã©ãŒ
common_severity_fatal = èŽåœç
+common_severity_info = æ
å ±
common_severity_warn = èŠå
##common_status_attention = æå
##common_status_avail_disabled = DISABLED
@@ -164,6 +171,7 @@ common_title_add_portlet = ããŒãã¬ããè¿œå
common_title_address = ã¢ãã¬ã¹
common_title_alerts = ã¢ã©ãŒã
common_title_alerts_range = ã¢ã©ãŒãã®ç¯å²
+common_title_ancestry = å
ç¥
common_title_availability = ã¢ãã€ã©ããªãã£
common_title_available_resources = å©çšå¯èœãªãœãŒã¹
common_title_average_metrics = æ¯åã®å¹³åã¡ããªãã¯ã¹
@@ -178,6 +186,7 @@ common_title_compare_metrics = ã¡ããªãã¯ã¹ã®æ¯èŒ
common_title_compatibleGroups = äºæã°ã«ãŒã
common_title_compatibleGroups_total = äºæã°ã«ãŒãã®åèš
common_title_component_errors = ã³ã³ããŒãã³ããšã©ãŒ
+common_title_config_update_status = æŽæ°ç¶æ
common_title_configuration = æ§æ
common_title_count = æ°
common_title_createTime = äœææå»
@@ -200,6 +209,7 @@ common_title_end = çµäº
common_title_generalProp = äžè¬ããããã£
common_title_group = ã°ã«ãŒã
common_title_group_def_total = ã°ã«ãŒãå®çŸ©ã®åèš
+common_title_group_member_health = ã°ã«ãŒãã¡ã³ããŒã®ç¶æ
common_title_groups = ã°ã«ãŒã
##common_title_groupsFound = ã°ã«ãŒã
common_title_help = ãã«ã
@@ -228,6 +238,7 @@ common_title_new_dashboard = æ°èŠããã·ã¥ããŒã
common_title_numeric_metrics = æ°å€ã¡ããªãã¯ã¹
common_title_numeric_type = æ°å€å
common_title_operation = ãªãã¬ãŒã·ã§ã³
+common_title_operation_status = ãªãã¬ãŒã·ã§ã³ã®ç¶æ
common_title_operations = ãªãã¬ãŒã·ã§ã³
common_title_operations_range = ãªãã¬ãŒã·ã§ã³ã®ç¯å²
##common_title_over = Over
@@ -353,6 +364,7 @@ dataSource_configurationHistory_updateType = æŽæ°ã¿ã€ã
dataSource_configurationHistory_updateType_group = ã°ã«ãŒã
dataSource_configurationHistory_updateType_individual = å人
dataSource_definitions_loadFailed = ã¡ããªãã¯å®çŸ©ã®ããŒãã«å€±æããŸãã
+dataSource_measurementOob_error_fetchFailure = ç¯å²å€æ
å ±ã®æž¬å®ã®ããŒãã«å€±æããŸãã
dataSource_measurementOob_field_factor = ç¯å²å€ä¿æ° (%)
dataSource_measurementOob_field_formattedBaseband = ãã³ã
dataSource_measurementOob_field_formattedOutlier = ã¢ãŠãã©ã€ããŒ
@@ -363,6 +375,7 @@ dataSource_operationHistory_error_fetchFailure = ãªãã¬ãŒã·ã§ã³å±¥æŽã®
dataSource_operationHistory_field_createdTime = äœææå»
dataSource_operationHistory_field_operationName = ãªãã¬ãŒã·ã§ã³å
dataSource_operationHistory_field_startedTime = éå§æå»
+dataSource_operationHistory_field_subject = èŠæ±è
dataSource_operationSchedule_field_description = ããŒã
dataSource_operationSchedule_field_id = ã¹ã±ãžã¥ãŒã«ID
dataSource_operationSchedule_field_nextFireTime = 次åã®å®è¡
@@ -392,8 +405,10 @@ dataSource_resources_field_discoveryTime = çºèŠæå»
dataSource_resources_field_importTime = ã€ã³ããŒãæå»
dataSource_resources_field_key = ããŒ
dataSource_resources_field_lastModifiedTime = æçµæŽæ°æå»
+dataSource_resources_field_lastModifier = æçµæŽæ°è
dataSource_resources_field_location = å Žæ
dataSource_rpc_error_transformRequestFailure = {0} ãªã¯ãšã¹ãã®åŠçäžã«ããŒã¿ãœãŒã¹ã§å€±æããŸãã
+dataSource_rpc_error_unsupportedArrayFilterType = ã¿ã€ã {0} ã®é
åãã£ã«ã¿ã®åŒãæž¡ãã¯ãµããŒãããŠããŸãã
dataSource_rpc_error_unsupportedEnumType = RPCDataSource.getEnumArray(Class)ãž enum {0} ã®ããã®é©åãªã³ãŒããããã¯ãè¿œå ããŠãã ãã
dataSource_rpc_no = ããã
dataSource_rpc_yes = ã¯ã
@@ -451,13 +466,18 @@ datasource_templateSchedules_enabled_failed = ID [{2}] ãæã€ãªãœãŒã¹ã¿
datasource_templateSchedules_updated = éžæãããã¡ããªã㯠[{0}] ã®åéééãæŽæ°ããŸãã
datasource_templateSchedules_updated_detail = ID [{2}] ãæã€ãªãœãŒã¹ã¿ã€ãã®ããã«ããã©ã«ãã§ã¡ããªã㯠[{0}] [{1}] ã®åéééã [{3}] ç§ã«èšå®ãããŸãã
datasource_templateSchedules_updated_failed = ID [{2}] ãæã€ãªãœãŒã¹ã¿ã€ãã®ããã«ããã©ã«ãã§ã¡ããªã㯠[{0}] [{1}] ã®åéééã [{3}] ç§ã«èšå®ããã®ã«å€±æããŸãã
+favorites = ãæ°ã«å
¥ã
+favorites_groups = ãæ°ã«å
¥ãã°ã«ãŒã
favorites_recentlyViewed = æè¿é²èŠ§ãã
+favorites_resources = ãæ°ã«å
¥ããªãœãŒã¹
filter_from_date = éå§
filter_to_date = çµäº
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {1} ã®äžã® {0} ã°ã«ãŒãã¡ã³ããŒã ''{2}'' ãªãœãŒã¹ãæã£ãŠããŸã
+util_ancestry_parentAncestry = 芪ã®å
ç¥ :
util_disambiguationReportDecorator_pluginSuffix = ({0} ãã©ã°ã€ã³)
util_errorHandler_nullException = äŸå€ã¯ null ã§ãã
+util_monitoringRequestCallback_error_checkServerStatusFailure = ãã°ã€ã³ã®ç¶æ
ã決å®ã§ããŸãã - ãµãŒããŒã®ç¶æ
ã調ã¹ãŠãã ãã
util_rpcManager_activeRequests = {0} ã¢ã¯ãã£ããªã¯ãšã¹ã
##util_userPerm_loadFailBundle = Failed to load your permissions for Bundle with id [{0}] - none granted.
util_userPerm_loadFailGlobal = ã°ããŒãã«ãªæš©éãããŒãããã®ã«å€±æããŸãã - äœãèš±å¯ãããŸãã
@@ -468,6 +488,7 @@ util_userSession_logoutFail = ãã°ã¢ãŠãã«å€±æããŸãã
util_widgetsField_unlimited = ç¡å¶é
view_aboutBox_allRightsReserved = All Rights Reserved.
view_aboutBox_buildNumber = ãã«ãçªå·
+view_aboutBox_failedToLoad = ãããã¯ãæ
å ±ã®ããŒãã«å€±æããŸãã
view_aboutBox_homepage = ããŒã ããŒãž
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = {0}ã«ã€ããŠ
@@ -720,19 +741,27 @@ view_admin_downloads_agentDownload = ãšãŒãžã§ã³ãã®ããŠã³ããŒã
view_admin_downloads_agent_buildNumber = ãšãŒãžã§ã³ããã«ã
view_admin_downloads_agent_help = <p> ãã㯠{0} Agentã®æŽæ°ãã€ããªJARãã¡ã€ã«ã§ãããã®JARãã¡ã€ã«ã®ç®çã¯ãŠãŒã¶ãŒããšãŒãžã§ã³ãããŸã ååšããªããã·ã³äžã«æ°ãããšãŒãžã§ã³ããã€ã³ã¹ããŒã«ã§ããããã«ããããšãšããã§ã«ã€ã³ã¹ããŒã«æžã¿ã®ãšãŒãžã§ã³ããæŽæ°ã§ããããã«ããããã§ãã詳现ã¯ããã®ãšãŒãžã§ã³ãããŠã³ããŒãJARã§æ¬¡ã®ããã«--helpã³ãã³ãã©ã€ã³ãªãã·ã§ã³ãã€ããŠå®è¡ããŠãã ããã<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«</h3> <p> <b>java -jar <agent-download.jar> --install[=<æ°ãããšãŒãžã§ã³ããã£ã¬ã¯ããª>]</b><br/> ãã®ã³ãã³ãã¯æ°ãããšãŒãžã§ã³ããã€ã³ã¹ããŒã«ããŸããããæ°ãããã£ã¬ã¯ããªãæå®ããªããã°ãããã©ã«ãã¯"."ãšãªããŸãã</p> <h3>ãšãŒãžã§ã³ãã®
æŽæ°</h3> <p> <b>java -jar <agent-download.jar> --update[=<å€ããšãŒãžã§ã³ããã£ã¬ã¯ããª>]</b><br/> ããã¯ãã§ã«ã€ã³ã¹ããŒã«ãããæ¢åã®ãšãŒãžã§ã³ããæŽæ°ããŸããããå€ããæ¢åã®ãšãŒãžã§ã³ããã€ã³ã¹ããŒã«ããããã£ã¬ã¯ããªãæå®ããªãã£ããªãã"rhq-agent"ãä»®å®ãããŸãã</p>
view_admin_downloads_agent_link_value = ãšãŒãžã§ã³ã {0} ({1}) ã®ããŠã³ããŒã
+view_admin_downloads_agent_loadError = ãšãŒãžã§ã³ãããŒãžã§ã³æ
å ±ãååŸã§ããŸãã
view_admin_downloads_agent_md5 = ãšãŒãžã§ã³ã MD5
view_admin_downloads_agent_version = ãšãŒãžã§ã³ãããŒãžã§ã³
view_admin_downloads_bundleDownload = ãã³ãã«ãããã€ã€ã®ããŠã³ããŒã
+view_admin_downloads_bundle_help = <p> ããã¯ãã³ãã«ãããã€ã€ããŒã«ã§ã{0}ãã³ãã«ã®éçºè
ãšããã±ãŒãžéçºè
ã«ãã£ãŠäœ¿ãããŸãããã®ã¹ã¿ã³ãã¢ãã³ããŒã«ã䜿ããšãã³ãã«ãã³ã³ãœãŒã«ããã®ã¬ã·ãããã¹ãã§ããããã«ããŸãã</p>
view_admin_downloads_bundle_link_value = ãã³ãã«ãããã€ã€ãŒ {0} ãããŠã³ããŒã
+view_admin_downloads_bundle_loadError = ãã³ãã«ãããã€ã€ãŒæ
å ±ãååŸã§ããŸãã
view_admin_downloads_cliAlertScriptsDownload = CLIã¢ã©ãŒãã¹ã¯ãªããã®ããŠã³ããŒã
+view_admin_downloads_cliAlertScripts_help = CLIã¢ã©ãŒãã¹ã¯ãªããã¯ã¹ã¯ãªããåãããã¢ã©ãŒãéç¥ãäœæããããã«äœ¿ãããšãã§ããäœææžã¿ã®ã¹ã¯ãªããã§ããéåžžããã®ã¹ã¯ãªããã¯ç¹å®ã®ã¢ã©ãŒãå®çŸ©ã«ã€ããŠã®éç¥ãšããŠäœ¿ãããã«ã¯åãã£ãŠåŸ®èª¿æŽãããå¿
èŠããããŸãã
view_admin_downloads_cliAlertScripts_loadError = ããŠã³ããŒãããããã«å©çšå¯èœãªCLIã¢ã©ãŒãã¹ã¯ãªããã«ã¢ã¯ã»ã¹ããããšãã§ããŸãã
view_admin_downloads_cliAlertScripts_none = ããŠã³ããŒãããããã«å©çšå¯èœãªCLIã¹ã¯ãªãããäžã€ãååšããŸãã
view_admin_downloads_cliDownload = ã³ãã³ãã©ã€ã³ã¯ã©ã€ã¢ã³ãã®ããŠã³ããŒã
view_admin_downloads_cli_buildNumber = CLIãã«ã
+view_admin_downloads_cli_help = <p> ããã¯ã³ãã³ãã©ã€ã³ããŒã«ã§ãCLIãšããŠç¥ãããŠãããã®ã§ããã³ã³ãœãŒã«ããå®è¡ããã¹ã¿ã³ãã¢ãã³ããŒã«ã§ã{0}ãµãŒããŒã«å¯ŸããŠã³ãã³ãã©ã€ã³ã€ã³ã¿ãã§ãŒã¹ãæäŸããŸããèªååãããã¿ã¹ã¯ãå®è¡ããããã«CLIãrunã¹ã¯ãªãããä»ããŠã³ãã³ããåŒã³åºãããšãå¯èœã§ããCLIã®ã€ã³ã¹ããŒã«æ¹æ³ãšäœ¿ãæ¹ã«ã€ããŠã®è©³çŽ°æ
å ±ã¯ããã¥ã¡ã³ããã芧ãã ããã</p>
view_admin_downloads_cli_link_value = CLI {0} ({1}) ãããŠã³ããŒã
+view_admin_downloads_cli_loadError = CLIããŒãžã§ã³æ
å ±ãååŸã§ããŸãã
view_admin_downloads_cli_md5 = CLI MD5
view_admin_downloads_cli_version = CLIããŒãžã§ã³
view_admin_downloads_connectorsDownload = ã³ãã¯ã¿ã®ããŠã³ããŒã
+view_admin_downloads_connectors_help = ã³ãã¯ã¿ãŒã¯è£œåã{0}ã«ãã£ãŠç®¡çå¯èœã§ããããã«å¿
èŠãšãªããœãããŠã§ã¢ã§ããRHQãšãŒãžã§ã³ããéä¿¡ã§ããããã«ã管ç補åã«ã³ãã¯ã¿ãŒãã€ã³ã¹ããŒã«ããŸãã詳现ã¯ããã¥ã¡ã³ããã芧ãã ããã
+view_admin_downloads_connectors_loadError = ã³ãã¯ã¿ãŒæ
å ±ãååŸã§ããŸãã
view_admin_downloads_connectors_none = ããŠã³ããŒãã®ããã®ã³ãã¯ã¿ãŒãèŠã€ãããŸãã
##view_admin_downloads_scriptModulesDownload = Script Modules Download
##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
@@ -758,6 +787,7 @@ view_admin_plugins_enabledServerPluginsFailure = ãµãŒããŒãã©ã°ã€ã³ã®
view_admin_plugins_hideDeleted = åé€æžã¿ãé ã
view_admin_plugins_hideUndeployed = ã¢ã³ãããã€ãé ã
view_admin_plugins_loadFailure = ãã©ã°ã€ã³ããŒã¿ãããŒãããã®ã«å€±æããŸãã
+view_admin_plugins_purgedAgentPlugins = ãšãŒãžã§ã³ããã©ã°ã€ã³ {0} ãããŒãžããããã®æºåãããŠããŸããããã¯æ°åããããããããŸããããªããªãããã®ãã©ã°ã€ã³ããã®ãã¹ãŠã®ã¿ã€ãå®çŸ©ã¯æåã«ã·ã¹ãã ããããŒãžãããªããã°ãªããªãããã§ãããããã®ãã©ã°ã€ã³ã¯ããŒãžããããŸã§ã®éãã®ããŒãžã§èŠãç¶ããŸããããŒãžãå®è¡äžã¯ãã®ãã©ã°ã€ã³ãåã€ã³ã¹ããŒã«ããŠã¯ãããªãããšã«çæããŠãã ããããããªããã°ã倱æããããšã§ãããããããã£ãŠããã®ããŒãžãå®äºãããŸã§ã·ã¹ãã ãžãã©ã°ã€ã³ã®åã€ã³ã¹ããŒã«ããåŸ
ã¡ãã ããã
view_admin_plugins_purgedAgentPluginsFailure = ãšãŒãžã§ã³ããã©ã°ã€ã³ã®ããŒãžã«å€±æããŸãã
view_admin_plugins_purgedServerPlugins = ããŒãžããããµãŒããŒãã©ã°ã€ã³: {0}.
view_admin_plugins_purgedServerPluginsFailure = ãµãŒããŒãã©ã°ã€ã³ã®ããŒãžã«å€±æããŸãã
@@ -770,9 +800,11 @@ view_admin_plugins_scanComplete = æŽæ°ããããã©ã°ã€ã³ã®ããã®ã¹
view_admin_plugins_scanFailure = æŽæ°ããããã©ã°ã€ã³ã®ããã®ã¹ãã£ã³ã倱æããŸãã
view_admin_plugins_server = ãµãŒããŒ
view_admin_plugins_serverConfig = ãã©ã°ã€ã³æ§æ
+view_admin_plugins_serverConfig_badSettings = æ£ããèšå®ãå
¥åããŠãã ãã
view_admin_plugins_serverConfig_saveFailed = èšå®ã®ä¿åã«å€±æããŸãã
view_admin_plugins_serverConfig_settingsSaved = èšå®ãä¿åãããŸãã
view_admin_plugins_serverControls = ã³ã³ãããŒã«
+view_admin_plugins_serverControls_badParams = æ£ãããã©ã¡ãŒã¿ãŒãå
¥åããŠãã ãã
view_admin_plugins_serverControls_clickForError = ãšã©ãŒã¡ãã»ãŒãžãã¯ãªãã¯ããŠãã ãã
view_admin_plugins_serverControls_invokeFailure = ã³ã³ãããŒã«ã®åŒã³åºãã«å€±æããŸãã
view_admin_plugins_serverControls_name = ã³ã³ãããŒã«
@@ -810,6 +842,7 @@ view_admin_systemSettings_DriftFilePurge_desc = ããã¯ãšã³ãããããŒ
view_admin_systemSettings_DriftFilePurge_name = æªäœ¿çšããªãããã¡ã€ã«ã®åé€
view_admin_systemSettings_EnableAgentAutoUpdate_desc = ãµãŒããŒããšãŒãžã§ã³ããèªåæŽæ°ããããšãèš±ããã©ããã決å®ããŸãããããããç¡å¹ã«ãããŠããã®ã§ããã°ããµãŒããŒãããšãŒãžã§ã³ãã®ãã£ã¹ããªãã¥ãŒã·ã§ã³ãããŠã³ããŒãããããšã¯ã§ããŸããã
view_admin_systemSettings_EnableAgentAutoUpdate_name = ãšãŒãžã§ã³ãã®èªåæŽæ°ãæå¹ã«ãã
+view_admin_systemSettings_EnableDebugMode_desc = æå¹ã§ããã°ããµãŒããŒã¯ãããã°ã¢ãŒãã«å
¥ããŸã
view_admin_systemSettings_EnableDebugMode_name = ãããã°ã¢ãŒããæå¹ã«ãã
view_admin_systemSettings_EnableExperimentalFeatures_desc = æå¹ã§ããã°ãçŸåšã®è£œåã«å«ãŸããä»»æã®å®éšçæ©èœãå©çšå¯èœã«ãªããŸã
view_admin_systemSettings_EnableExperimentalFeatures_name = å®éšçæ©èœãæå¹ã«ãã
@@ -819,6 +852,7 @@ view_admin_systemSettings_JAASProvider_desc = ãŠãŒã¶ãŒIDã決å®ããã®
view_admin_systemSettings_JAASProvider_name = LDAPã®æå¹å
view_admin_systemSettings_LDAPBaseDN_desc = ãŠãŒã¶èªèšŒã®éã«ãŠãŒã¶ãŒåãšãã¹ã¯ãŒããæ€çŽ¢ãããã£ã¬ã¯ããªããªãŒã®ããŒã¹ãäŸ: ou=People,dc=redhat,dc=com
view_admin_systemSettings_LDAPBaseDN_name = ãµãŒãããŒã¹
+view_admin_systemSettings_LDAPBindDN_desc = LDAPãŠãŒã¶ãŒããŒã¿ããŒã¹ã®åãåããæã«LDAPãµãŒããŒã«æ¥ç¶ããããã®ãŠãŒã¶ãŒåãããã¯æ®éã¯ãããŒãžã£ãŒãŠãŒã¶ãŒã®å®å
šãªLDAPèå¥å (DN) ã«ãªããäŸ: cn=Manager,dc=redhat,dc=com
view_admin_systemSettings_LDAPBindDN_name = ãŠãŒã¶ãŒå
view_admin_systemSettings_LDAPBindPW_desc = LDAPãŠãŒã¶ãŒããŒã¿ããŒã¹ã®åãåããæã«LDAPãµãŒããŒã«æ¥ç¶ããããã®ãŠãŒã¶ãŒã®ã¯ã¬ãã³ã·ã£ã«
view_admin_systemSettings_LDAPBindPW_name = ãã¹ã¯ãŒã
@@ -848,6 +882,7 @@ view_admin_systemSettings_fixBeforeSaving = ä¿ååã«ç¡å¹ãªå€ãä¿®æ£ã
view_admin_systemSettings_group_baseline = èªåããŒã¹ã©ã€ã³æ§æããããã£
view_admin_systemSettings_group_dataMgr = ããŒã¿ãããŒãžã£ãŒæ§æããããã£
view_admin_systemSettings_group_drift = ããªãããµãŒããŒæ§æèšå®
+view_admin_systemSettings_group_general = å
šäœæ§æããããã£
view_admin_systemSettings_group_ldap = LDAPæ§æããããã£
view_admin_systemSettings_saveFailure = ã·ã¹ãã èšå®ã®ä¿åã«å€±æããŸãã
view_admin_systemSettings_savedSettings = ã·ã¹ãã ããããã£ã®ä¿åã«æåããŸãã
@@ -866,6 +901,7 @@ view_admin_systemSettings_serverDetails_tz = ãµãŒããŒã¿ã€ã ãŸãŒã³
view_admin_topology = ããããžãŒ
view_alert_common_tab_conditions = æ¡ä»¶
view_alert_common_tab_conditions_expression = ã¢ã©ãŒãçºç«
+view_alert_common_tab_conditions_expression_tooltip = å
šäœã®æ¡ä»¶ãtrueã§ãããšèªããããããã«ãæ¡ä»¶ã®äžéšãŸãã¯ãã¹ãŠãtrueãšè©äŸ¡ãããªããã°ãªããªããã©ãã決å®ããŸã
##view_alert_common_tab_conditions_modalEdit_title = Edit Condition
view_alert_common_tab_conditions_modal_title = æ¡ä»¶è¿œå
view_alert_common_tab_conditions_recovery_disabled = ãã®ã¢ã©ãŒãã¯ãã®ã¢ã©ãŒãå®çŸ©ãç¡å¹åãããåå ãšãªããŸãã
@@ -887,6 +923,7 @@ view_alert_common_tab_conditions_type_metric_calltime_change_verb = å°ãªããš
view_alert_common_tab_conditions_type_metric_calltime_delta_grows = äžæ
view_alert_common_tab_conditions_type_metric_calltime_delta_other = å€å
view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = çž®å°
+view_alert_common_tab_conditions_type_metric_calltime_destination = åŒã³åºãã®å®å
ãäžèŽ
view_alert_common_tab_conditions_type_metric_calltime_threshold = åŒã³åºãæéã®éŸå€
view_alert_common_tab_conditions_type_metric_change = ã¡ããªãã¯å€ã®å€æ
view_alert_common_tab_conditions_type_metric_range_inside_exclusive = ã¡ããªãã¯å€ã®ç¯å² [{0}] : [{1}] ãš [{2}] ã®é (å¢çå€ãå«ãŸãªã)
@@ -903,6 +940,7 @@ view_alert_common_tab_dampening = æžè¡°
view_alert_common_tab_dampening_category_consecutive_count = é£ç¶
view_alert_common_tab_dampening_category_consecutive_count_tooltip = æ¡ä»¶èšå®ãXåé£ç¶ããŠtrueã§ããã°ã¢ã©ãŒããåŒãèµ·ããããŸãã
view_alert_common_tab_dampening_category_duration_count = æééé
+view_alert_common_tab_dampening_category_duration_count_tooltip = ã¢ã©ãŒãã¯äžããããæéå
ã§æ¡ä»¶èšå®ãtrueã§ããããšãXåçºçãããã³ã«åŒãèµ·ããããŸã
view_alert_common_tab_dampening_category_none = ãªã
view_alert_common_tab_dampening_category_none_tooltip = æžè¡°ã¯ç¡å¹åãããŠããŸãããã®æ¡ä»¶ãtrueã«ãªããã³ã«ãã¢ã©ãŒããåŒãèµ·ããããŸãã
view_alert_common_tab_dampening_category_partial_count = çŽè¿ã®Nåã®è©äŸ¡
@@ -910,6 +948,7 @@ view_alert_common_tab_dampening_category_partial_count_tooltip = ã¢ã©ãŒãã¯
view_alert_common_tab_dampening_consecutive_occurrences_label = çºç
view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip = ã¢ã©ãŒããåŒãèµ·ããããåã«æ¡ä»¶èšå®ãé£ç¶ããŠtrueã§ãªãããã°ãªããªãåæ°
view_alert_common_tab_dampening_duration_occurrences_label = çºç
+view_alert_common_tab_dampening_duration_occurrences_label_tooltip = ã¢ã©ãŒããåŒãèµ·ããããåã«äžããããæéå
ã§æ¡ä»¶èšå®ãé£ç¶ããŠtrueã§ãªãããã°ãªããªãåæ°
view_alert_common_tab_dampening_duration_period_label = æééé
view_alert_common_tab_dampening_duration_period_label_tooltip = äžããããçºçåæ°ãtrueã§ãããã©ããã調ã¹ãããã«æ¡ä»¶èšå®ããã¹ããããã¿ã€ã ã¹ãã³
view_alert_common_tab_dampening_partial_evalatuions_label = è©äŸ¡
@@ -927,6 +966,9 @@ view_alert_common_tab_notifications_status = ã¹ããŒã¿ã¹
view_alert_common_tab_recovery = ãªã«ããª
view_alert_definition_condition_editor_availabilityDuration = ã¢ãã€ã©ããªãã£éé
##view_alert_definition_condition_editor_availabilityDuration_state = Availability State
+view_alert_definition_condition_editor_availabilityDuration_tooltip = ã¢ãã€ã©ããªãã£ã®æ¡ä»¶ãããªã¬ãŒããããã«ä¿åãããŠããªããã°ãªããªãã¢ãã€ã©ããªãã£ç¶æ
ã®å€åãšééãæå®ããŸãããã®ééã¯ååäœã§æå®ãããŸãããšãŒãžã§ã³ããã¢ãã€ã©ããªãã£ç¶æ
ã®å€æŽãæ€åºããŠåé¡ãä¿®æ£ã§ããããã«ããããã«ã¯ããšãŒãžã§ã³ãã«æå®ããæéãšããŠã¯ãæ°åãšããé·ãã§ååã§ãã
+view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = ã¢ãã€ã©ããªãã£ã®æ¡ä»¶ãæºããããã«ãªãœãŒã¹ãæå®ãããã¢ãã€ã©ããªãã£ã«ãªãå¿
èŠãããæéã®é·ãïŒå)ã§ãã
+view_alert_definition_condition_editor_availability_tooltip = æ¡ä»¶ã®ããªã¬ãŒãšãªãã¢ãã€ã©ããªãã£ç¶æ
ã®å€åãæå®ããŸã
view_alert_definition_condition_editor_common_avg = å¹³å
##view_alert_definition_condition_editor_common_baseUnits = Base Units
##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units:
@@ -942,11 +984,14 @@ view_alert_definition_condition_editor_drift_pathname_regex_tooltip = ããæ
view_alert_definition_condition_editor_drift_tooltip = ãã®æ¡ä»¶ã¯ããªãããæ€åºããããšããããªã¬ãŒã«ãªããŸãã
view_alert_definition_condition_editor_event_regexTooltip = ããæå®ããããªããããã¯æ£èŠè¡šçŸã§ããããã®æ¡ä»¶ãåŒãèµ·ããããã«åéãããã€ãã³ãã¡ãã»ãŒãžã«äžèŽããªããã°ãªããŸããã
view_alert_definition_condition_editor_event_severity = ã€ãã³ãé倧床
+view_alert_definition_condition_editor_event_tooltip = ãã®æ¡ä»¶ãåŒãèµ·ããããã«ã€ãã³ãã¡ãã»ãŒãžãå ±åãããå¿
èŠãããã€ãã³ãé倧床ãæå®ããŸãããããªãã·ã§ã³ãšãªãæ£èŠè¡šçŸãæå®ãããªããã€ãã³ãã¡ãã»ãŒãžã¯ãã®æ¡ä»¶ãåŒãèµ·ããããããã«ã€ãã³ãã¡ãã»ãŒãžãæ£èŠè¡šçŸã«äžèŽããªããã°ãªããŸããã
view_alert_definition_condition_editor_metric_baseline_percentage = ããŒã¹ã©ã€ã³ããŒã»ã³ããŒãž
view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = éžæãããæ¯èŒæŒç®åã䜿çšããŠéžæãããããŒã¹ã©ã€ã³å€ã®ããŒã»ã³ããŒãžãæ¯èŒãããšãã«åéãããã¡ããªãã¯å€ã¯ãã®æ¡ä»¶ãåŒãèµ·ãããŸãã
+view_alert_definition_condition_editor_metric_baseline_tooltip = æ¡ä»¶ãåŒãèµ·ããããã«éåãããããšãå¿
èŠãšãªãããŒã¹ã©ã€ã³å€ãæå®ããŸããæå®ããå€ã¯ãäžããããããŒã¹ã©ã€ã³å€ã®ããŒã»ã³ããŒãžã«ãªããŸãã
view_alert_definition_condition_editor_metric_baseline_value = ããŒã¹ã©ã€ã³
view_alert_definition_condition_editor_metric_calltime_change_percentage = ããŒã»ã³ããŒãžã®å€å
view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip = å°ãªããšãéžæãããåŒã³åºãæéãªãããå€ã®ããŒã»ã³ããŒãžãšç°ãªããšããåéãããåŒã³åºãæéã¯ãã®æ¡ä»¶ãåŒãèµ·ãããŸã
+view_alert_definition_condition_editor_metric_calltime_change_tooltip = æ¡ä»¶ãåŒãèµ·ãããå°ãªããšãæå®ãããéã®å€åãèµ·ãã£ããšãã®ãåŒã³åºãå€ãæå®ããŸãã(æå°ãæ倧ãå¹³åã®åŒã³åºãæéã®å€)ããã§ãã¯ããããã®åŒã³åºãæéã®ãªãããã®çš®å¥ãšçºçã«å¿
èŠãªå€åã®ããŒã»ã³ããŒãžãæå®ããªããã°ãªããŸããã
view_alert_definition_condition_editor_metric_calltime_common_comparator = ã³ã³ãã¬ãŒã¿
view_alert_definition_condition_editor_metric_calltime_common_comparator_changes = å€å
view_alert_definition_condition_editor_metric_calltime_common_comparator_grows = å¢å€§
@@ -955,14 +1000,19 @@ view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip
view_alert_definition_condition_editor_metric_calltime_common_limit = åŒã³åºãæéå¶é
view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip = äžããããå€ãšæ¯èŒãããã¹ãåŒã³åºãæéãªãããã®å€
view_alert_definition_condition_editor_metric_calltime_common_name = åŒã³åºãæéã¡ããªãã¯
+view_alert_definition_condition_editor_metric_calltime_regexTooltip = ããæå®ããããªããããã¯æ£èŠè¡šçŸã§ãããæ¡ä»¶ãåŒãèµ·ããããã«åŒã³åºãã®å®å
ãšäžèŽããå¿
èŠããããŸã
view_alert_definition_condition_editor_metric_calltime_threshold_tooltip = éåãããšãã«æ¡ä»¶ãåŒãèµ·ããåŒã³åºãæéã®éŸå€ãæå®ããŸããæå®ããå€ã¯ãªãã·ã§ã³ã®åäœã䌎ã絶察å€ã«ãªããŸãã(æå°ãæ倧ãå¹³åã®åŒã³åºãæéã®å€)ãšå€ãæ¯èŒããããåŒã³åºãæéã®ãªãããã®çš®å¥ãæå®ããªããã°ãªããŸããã
view_alert_definition_condition_editor_metric_calltime_threshold_value = åŒã³åºãæéã®å€
view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = éžæãããæ¯èŒå(comparator)ã䜿ã£ãŠæ¯èŒãããšãæ¡ä»¶ãåŒãèµ·ããããã¡ããªãã¯ã®éŸå€
view_alert_definition_condition_editor_metric_change_tooltip = æ¡ä»¶ãåŒãèµ·ããããã«å€æŽããªããã°ãªããªãå€ãæã€ã¡ããªãã¯ãæå®ããŸã
view_alert_definition_condition_editor_metric_common_definition_not_found = ã¡ããªãã¯å®çŸ©ãèŠã€ããã¹ãã§ã - äœããããããã§ã
+view_alert_definition_condition_editor_metric_nometrics = ãã¹ãŠãé£çµããŠäœ¿ããšããè€æ°æ¡ä»¶å
ã«åãã¡ããªãã¯ã䜿ãããšã¯ã§ããŸããããã®èŠåã¯çŸåšã®æ¡ä»¶å
ã§ã®ãã¹ãŠã®å©çšå¯èœãªã¡ããªãã¯ã¹ã䜿ããŸãã
view_alert_definition_condition_editor_metric_range_comparator = æ¯èŒæŒç®å
+view_alert_definition_condition_editor_metric_range_comparator_inside_exclusive = å
éšã§ãå¢çå€ãå«ãŸãªã
+view_alert_definition_condition_editor_metric_range_comparator_inside_inclusive = å
éšã§ãå¢çå€ãå«ã
view_alert_definition_condition_editor_metric_range_comparator_outside_exclusive = å€éšã§ã å¢çå€ãå«ãŸãªã
view_alert_definition_condition_editor_metric_range_comparator_outside_inclusive = å€éšã§ã å¢çå€ãå«ã
+view_alert_definition_condition_editor_metric_range_comparator_tooltip = ã¡ããªãã¯å€ããç¯å²å
ãç¯å²å€ã®ãšãããã®æ¡ä»¶ã®ããªã¬ãŒã«ãªããã©ããã決å®ããŸãã
view_alert_definition_condition_editor_metric_range_hivalue = é«å€
view_alert_definition_condition_editor_metric_range_hivalue_tooltip = ç¯å²ã§ã®é«å€ã®éŸå€
view_alert_definition_condition_editor_metric_range_lovalue = äœå€
@@ -983,9 +1033,12 @@ view_alert_definition_condition_editor_metric_trait_change_value = ãã¬ã€ã
view_alert_definition_condition_editor_metricswarning = ãã¹ãŠã®é£çµã䜿ããšãã¯åãã¡ããªãã¯ã䜿ãè€æ°ã®æ¡ä»¶ãæå®ããããšã¯ã§ããŸããããã®èŠåå®çŸ©ã¯ãã®ã¡ããªã㯠[{0}] ã䜿ãè€æ°ã®æ¡ä»¶ãæã¡ãŸãã
view_alert_definition_condition_editor_operation_status = ãªãã¬ãŒã·ã§ã³ã¹ããŒã¿ã¹
view_alert_definition_condition_editor_operation_tooltip = æ¡ä»¶ãåŒãèµ·ããããã«éžæããããå®è¡ããããšãçºçããªããã°ãªããªãçµæãæå®ããŸã
+view_alert_definition_condition_editor_operator_availability_durationDown = åæ¢äžã®ç¶æ
+view_alert_definition_condition_editor_operator_availability_durationNotUp = èµ·åããªãç¶æ
view_alert_definition_condition_editor_operator_availability_goesDisabled = ç¡å¹åã«ãªã
view_alert_definition_condition_editor_operator_availability_goesDown = åæ¢ãã
view_alert_definition_condition_editor_operator_availability_goesNotUp = èµ·åããªã
+view_alert_definition_condition_editor_operator_availability_goesUnknown = äžæãªç¶æ
ã«ãªã
view_alert_definition_condition_editor_operator_availability_goesUp = èµ·åãã
view_alert_definition_condition_editor_option_availability = ã¢ãã€ã©ããªãã£ã®å€å
view_alert_definition_condition_editor_option_drift = ããªããã®æ€åº
@@ -1020,7 +1073,12 @@ view_alert_definition_notification_editor_delete_confirm = éžæãããã¢ã©
view_alert_definition_notification_editor_field_configuration = æ§æ
view_alert_definition_notification_editor_field_configuration_loadFailed = éç¥æ§æãã¬ãã¥ãŒã®ååŸã«å€±æããŸãã
view_alert_definition_notification_editor_field_configuration_not_loaded = æªç¥
+view_alert_definition_notification_editor_field_sender = éä¿¡è
+view_alert_definition_notification_editor_loadFailed = ã¢ã©ãŒãéä¿¡è
ãååŸã§ããŸãã
+view_alert_definition_notification_editor_loadFailed_single = ã¢ã©ãŒãéä¿¡è
æ§æå®çŸ©ãååŸã§ããŸãã
+view_alert_definition_notification_editor_none_available = ã¢ã©ãŒãéä¿¡è
ãå©çšã§ããŸãã
view_alert_definition_notification_editor_saveFailed = éç¥ã®æ§æãä¿åã§ããŸãã
+view_alert_definition_notification_editor_sender = éç¥éä¿¡è
view_alert_definition_notification_editor_title_add = éç¥ã®è¿œå
view_alert_definition_notification_editor_title_edit = éç¥ã®ç·šé
view_alert_definition_notification_operation_editor_common_operation = ãªãã¬ãŒã·ã§ã³
@@ -1032,7 +1090,11 @@ view_alert_definition_notification_operation_editor_mode_unknown = æªç¥ã®ãª
view_alert_definition_notification_operation_editor_operations_loadFailed = å©çšå¯èœãªãªãã¬ãŒã·ã§ã³ã®ãªã¹ããããŒãããã®ã«å€±æããŸãã
view_alert_definition_notification_operation_editor_operations_no_parameters = ãã®æäœã¯äžã€ããã©ã¡ãŒã¿ãŒãåããŸãã
view_alert_definition_notification_operation_editor_relative_ancestor = æ€çŽ¢ãéå§
+view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = ã¿ã€ãã®ç¥å
ãååŸã§ããŸãã
+view_alert_definition_notification_operation_editor_relative_ancestor_root = ã«ãŒãã®ç¥å
ã¿ã€ã
+view_alert_definition_notification_operation_editor_relative_ancestor_tooltip = ã¿ã€ãéå±€ã®ããããéžæããŸããããã¯ã¿ã€ãã«ãããã£ã«ã¿ãŒã®ããã«åå«ã®ããªãŒãæ€çŽ¢ããå
ãšãªããŸã
view_alert_definition_notification_operation_editor_relative_descendant = 次ã«ãããã£ã«ã¿ãŒ
+view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip = éžæããã¿ã€ãã«å¯Ÿå¿ããè€æ°ã®ãªãœãŒã¹ãååšãããšããªãœãŒã¹ããŠããŒã¯ã«èå¥ããå
·äœçãªååãããã¯éžæããã¿ã€ãéå±€ã«ãããŠãã®ãªãœãŒã¹ã¿ã€ãã®å¯äžã®ãªãœãŒã¹ããååšããªãå Žåã¯ãªãã·ã§ã³ã§ãã
view_alert_definition_notification_operation_editor_relative_descendant_loadFailed = ã¿ã€ãã®åå«ãååŸã§ããŸãã
view_alert_definition_notification_operation_editor_relative_descendant_tooltip = æ€çŽ¢ã®éå§ã»ã¯ã·ã§ã³ã§å®çŸ©ãããã«ãŒãã¿ã€ãã®äžã§æ€çŽ¢ãããªãœãŒã¹ã¿ã€ã
view_alert_definition_notification_operation_editor_specific_pick_button = éžæ
@@ -1073,6 +1135,7 @@ view_alert_definitions_update_success = ã¢ã©ãŒãå®çŸ©ã®æŽæ°ã«æåã
view_alert_details_field_ack_at = 次ã®å Žæã§ç¢ºèªæžã¿ã§ã
view_alert_details_field_ack_by = 次ã®äººã«ãã£ãŠç¢ºèªæžã¿ã§ã
##view_alert_details_field_parent_definition = Parent definition
+view_alert_details_field_recovery_info = ãªã«ããªæ
å ±
##view_alert_details_field_resource_ancestry = Resource Ancestry
##view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = ã¢ã©ãŒãã®è©³çŽ°ãåãåºãã®ã«å€±æããŸãã
@@ -1102,9 +1165,11 @@ view_alerts_field_enabled = æå¹
view_alerts_field_modified_time = ä¿®æ£æå»
view_alerts_field_name = åå
view_alerts_field_parent = 芪
+view_alerts_field_priority = åªå
床
view_alerts_field_protected = ä¿è·ãããŠãã
view_alerts_field_protected_tooltip = ããtrueãªãããã®å®çŸ©ã¯èŠªå®çŸ©ã«ããå€æŽããä¿è·ãããŠããŸããä»ã®èšèã§èšãã°ããã®èŠªå®çŸ©èšå®ã¯ãã®å®çŸ©ãäžæžãããŸããã
view_alerts_loadFailed = ã¢ã©ãŒãããŒã¿ãåãåºãã®ã«ããŸãã
+view_alerts_table_filter_priority = åªå
床ãã£ã«ã¿ãŒ
view_alerts_table_title_group = ã°ã«ãŒãã¢ã©ãŒãå±¥æŽ
view_alerts_table_title_resource = ãªãœãŒã¹ã¢ã©ãŒãå±¥æŽ
view_autoDiscoveryQ_committed = ã³ãããæžã¿
@@ -1141,16 +1206,21 @@ view_autoDiscoveryQ_uninventoried = ã€ã³ãã³ããªç»é²ãããªã
view_bundleVersion_loadFailure = ãã³ãã«ããŒãžã§ã³ããŒã¿ãããŒãããã®ã«å€±æããŸãã
view_bundle_bundleDeployment = ãã³ãã«ãããã€ã¡ã³ã
view_bundle_bundleDeployments = ãã³ãã«ãããã€ã¡ã³ã
+view_bundle_bundleDestinations = ãã³ãã«å®å
view_bundle_bundleFiles = ãã³ãã«ãã¡ã€ã«
view_bundle_bundleType = ãã³ãã«ã¿ã€ã
view_bundle_bundleVersion = ãã³ãã«ããŒãžã§ã³
view_bundle_bundleVersions = ãã³ãã«ããŒãžã§ã³
+view_bundle_createWizard_bundleDistro = ãã³ãã«é
åž
+view_bundle_createWizard_cancelFailure = ãã³ãã« [{0}], ããŒãžã§ã³ = [{1}] ã®äœæã®å®å
šãªãã£ã³ã»ã«ã«å€±æããŸãã - ãã³ãã«ã¯ããŒã¿ããŒã¹ã«ãŸã æ®ã£ãŠãããããããŸãã
##view_bundle_createWizard_cancelFailurePerm = Failed to fully cancel the creation of bundle [{0}], version = [{1}] because the user has create but not delete permissions. The bundle will likley need to be removed by an administrator.
view_bundle_createWizard_cancelSuccessful = ãã³ãã« [{0}], ããŒãžã§ã³ = [{1}] ã®äœæããã£ã³ã»ã«ããŸãã
view_bundle_createWizard_clickToUploadRecipe = ã¬ã·ããã¡ã€ã«ã®ããŒãããããã«ã¯ãªãã¯ããŠãã ãã
view_bundle_createWizard_createFailure = ãã³ãã«ãäœæããã®ã«å€±æããŸãã
view_bundle_createWizard_createSuccessful = ããŒãžã§ã³ [{1}] ã® [{0}] ãšããååã®ãã³ãã«ã®äœæã«æåããŸãã
view_bundle_createWizard_enterRecipe = æ£ããã¬ã·ããæäŸããŠãã ãã
+view_bundle_createWizard_enterUrl = ãã³ãã«é
åžãã¡ã€ã«ãããŠã³ããŒãã§ããæ£ããURLãå
¥åããŠãã ãã
+view_bundle_createWizard_failedToUploadDistroFile = ãã³ãã«é
åžãã¡ã€ã«ã®ã¢ããããŒãã«å€±æããŸãã
view_bundle_createWizard_failedToUploadFile = ãã³ãã«ãã¡ã€ã«ã®ã¢ããããŒãã«å€±æããŸãã
##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups:
##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments:
@@ -1163,8 +1233,11 @@ view_bundle_createWizard_failedToUploadFile = ãã³ãã«ãã¡ã€ã«ã®ã¢ã
##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle
##view_bundle_createWizard_groupsStep_successAssign = You have successfully assigned initial bundle groups to a bundle named [{0}] with a version of [{1}]
##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle is not currently assigned to any bundle groups.
+view_bundle_createWizard_loadBundleFileFailure = ãµãŒããŒãããã³ãã«ãã¡ã€ã«æ
å ±ã®ååŸãã§ããŸãã
+view_bundle_createWizard_noAdditionalFilesNeeded = ãã®ãã³ãã«ã®ããã«ã¢ããããŒããããå¿
èŠãããè¿œå ãã¡ã€ã«ã¯ãããŸãã
view_bundle_createWizard_noBundleTypesAvail = ãã³ãã«ã¿ã€ããå©çšã§ããŸãã
view_bundle_createWizard_noBundleTypesSupported = ãã³ãã«ã¿ã€ãã¯äžã€ããµããŒããããŠããŸãã - ãã³ãã«ãããã€ã¡ã³ãããµããŒãããæ£ãããã©ã°ã€ã³ããããã€ããªããã°ãªããŸãã
+view_bundle_createWizard_provideBundleDistro = ãã³ãã«é
åžã®æäŸ
view_bundle_createWizard_recipeOption = ã¬ã·ã
view_bundle_createWizard_title = ãã³ãã«äœæ
##view_bundle_createWizard_unassigned = unassigned
@@ -1177,28 +1250,47 @@ view_bundle_createWizard_urlOption = URL
##view_bundle_createWizard_urlUserName = User name
view_bundle_createWizard_windowTitle = ãã³ãã«äœæãŠã£ã¶ãŒã
view_bundle_createWizard_youMustChooseOne = ãã³ãã«ãäœæããããã®ãªãã·ã§ã³ãéžæããªããã°ãªããŸãã
+view_bundle_deleteConfirm = ãã®ãã³ãã«ãåé€ããŠãããããã§ãã? ãã®ãã³ãã«ã®ãã¹ãŠã®ããŒãžã§ã³ãå®å
ããããã€ãåé€ãããŸãã
view_bundle_deploy = ãããã€
view_bundle_deployDir = ãããã€ãã£ã¬ã¯ããª
##view_bundle_deployWizard_createGroup_error_1 = The group was not created. Group for deployment cannot be empty.
##view_bundle_deployWizard_createGroup_error_2 = The group was not created. Resulting group must be compatible (members of the same type).
##view_bundle_deployWizard_createGroup_error_3 = The group was not created. The resource type of the resulting group does not support deployments.
+view_bundle_deployWizard_deployStep = å®å
ãã©ãããã©ãŒã ãžã®ãã³ãã«ã®ãããã€
view_bundle_deployWizard_deploying = ãããã€äž...
view_bundle_deployWizard_deploymentCreated = äœæããããããã€ã¡ã³ã...
view_bundle_deployWizard_deploymentCreatedDetail = ãã£ã¹ã¯ãªãã·ã§ã³ [{1}] ã®ä»ãããããã€ã¡ã³ã [{0}] ãäœæããŸãã
view_bundle_deployWizard_deploymentCreatedDetail_concise = ãããã€ã¡ã³ã [{0}] ãäœæããŸãã
view_bundle_deployWizard_deploymentScheduled = ãã³ãã«ãããã€ãã¹ã±ãžã¥ãŒã«ãããŸãã!
+view_bundle_deployWizard_deploymentScheduledDetail = ãã³ãã«ãããã€ã¡ã³ã [{0}] ãå®å
ã°ã«ãŒã [{1}] ã«ã¹ã±ãžã¥ãŒã«ããŸãã
view_bundle_deployWizard_deploymentScheduledDetail_concise = ãã³ãã«ãããã€ã¡ã³ããã¹ã±ãžã¥ãŒã«ãããŸãã
view_bundle_deployWizard_destinationCreatedDetail = ãã£ã¹ã¯ãªãã·ã§ã³ [{1}] ã®ä»ãããããã€ã¡ã³ã [{0}] ãäœæããŸãã
+view_bundle_deployWizard_destinationCreatedDetail_concise = å®å
[{0}] ãäœæããŸãã
view_bundle_deployWizard_error_1 = ãã£ã³ã»ã«ã«ã€ããŠã®æ°ãããããã€ã¡ã³ãã®åé€ã«å€±æããŸãã
+view_bundle_deployWizard_error_10 = å®å
ã®äœæã«å€±æããŸãããããã¯ãã§ã«ååšãããããããŸããã (泚æïŒå®å
ãã¥ãŒããæ¢åã®å®å
ãããã€ã®ãã)
view_bundle_deployWizard_error_11 = å®çŸ©æžã¿ãããã€ã¡ã³ãã®æ€çŽ¢ã«å€±æããŸãã
view_bundle_deployWizard_error_12 = å®çŸ©æžã¿ãã³ãã«ã®æ€çŽ¢ã«å€±æããŸãã
+view_bundle_deployWizard_error_2 = ãã£ã³ã»ã«ã«ã€ããŠã®æ°ããå®å
ã®åé€ã«å€±æããŸãã
view_bundle_deployWizard_error_3 = ãããã€ã¡ã³ãã®ã¹ã±ãžã¥ãŒã«ã«å€±æããŸãã!
view_bundle_deployWizard_error_4 = ãããã€ã¡ã³ãã®ã¹ã±ãžã¥ãŒã«ã«å€±æããŸãã: {0}
view_bundle_deployWizard_error_5 = ãããã€ã¡ã³ãã®äœæã«å€±æããŸãã!
view_bundle_deployWizard_error_6 = ãããã€ã¡ã³ãã®äœæã«å€±æããŸãã: {0}
view_bundle_deployWizard_error_7 = ãããã€ã¡ã³ãåã®ååŸã«å€±æããŸãã
view_bundle_deployWizard_error_8 = ããããããŠã³ããæ£ãããªãœãŒã¹ã°ã«ãŒããéžæããªããã°ãªããŸãã
+view_bundle_deployWizard_error_9 = 次ããŒãžã§ã®æ°ããå®å
ã®åé€ã«å€±æããŸãã
+view_bundle_deployWizard_error_noBundleConfig = ãã³ãã«ã¿ãŒã²ããæ
å ±ã®ååŸã«å€±æããŸãããéžæããã°ã«ãŒãã¯ãã³ãã«ãããã€ã¡ã³ãã®ã¿ãŒã²ããã«æãåŸãæ£åœãªäºæã°ã«ãŒãã§ãã?
+view_bundle_deployWizard_getConfigSkip = ãã®ãã³ãã«ããŒãžã§ã³ã«ã¯æ§æã¯å¿
èŠãããŸãã
view_bundle_deployWizard_getConfigStep = ãããã€ã¡ã³ãæ§æã®èšå®
+view_bundle_deployWizard_getDestStep = æ°ããå®å
+view_bundle_deployWizard_getDest_deployDir = ã«ãŒããããã€ãã£ã¬ã¯ã㪠(å®å
ãã©ãããã©ãŒã äžã§ã®)
+view_bundle_deployWizard_getDest_deployDir_help = ãã®ãã³ãã«ããããã€ããããã£ã¬ã¯ããªããã®ãã£ã¬ã¯ããªã¯ãã¹ãŠã®ãªãœãŒã¹ã«é¢ãããã¹ãŠã®ãããã€çšãšããŠåããã®ã䜿ãããŸãããå®å
ã®åºæ¬ãã£ã¬ã¯ããªã®å Žæã«å¯Ÿããçžå¯Ÿãã£ã¬ã¯ããªã«ãªããŸãããã®ããšã¯ãç°ãªãã¿ãŒã²ãããªãœãŒã¹ã«ã€ããŠåºæ¬ãã£ã¬ã¯ããªã®é
眮ãã©ãã«ããããšããããšã«äŸåããŠããã®çµ¶å¯Ÿãã£ã¬ã¯ããªã¯ç°ãªãã¿ãŒã²ãããªãœãŒã¹ã«ãã£ãŠç°ãªããã¹ã«ãªãå¯èœæ§ãããããšãæå³ããŠããŸãã
+view_bundle_deployWizard_getDest_desc = å®å
ã®èª¬æ
+view_bundle_deployWizard_getDest_destBaseDirName = åºæ¬ã®é
眮
+view_bundle_deployWizard_getDest_group_help = ã¡ã³ããŒããã¹ãŠã®ãã³ãã«ãããã€ã®ããã®å®å
ã¿ãŒã²ãããšãªããããªã°ã«ãŒãããã³ãã«ãããã€ããµããŒããããªãœãŒã¹ãå«ãäºæã°ã«ãŒãã®ã¿ãéžæå¯èœã§ãã
+view_bundle_deployWizard_getDest_name = å®å
å
+view_bundle_deployWizard_getDest_name_help = å®å
åãããã¯ãªãœãŒã¹ã®ç¹å®ã®ã°ã«ãŒããšç¹å®ã®ãã³ãã«ã®ãªãœãŒã¹ã«é¢ããå®å
ãã£ã¬ã¯ããªãèå¥ããŸãã
+view_bundle_deployWizard_getInfoStep = ãããã€æ
å ±ã®æäŸ
+view_bundle_deployWizard_getInfo_clean = ã¯ãªãŒã³ãããã€ã§ãã? (å®å
ãã©ãããã©ãŒã äžã§ã®ãããã€ãã£ã¬ã¯ããªãæé€ãã)
view_bundle_deployWizard_getInfo_deploymentDesc = ãããã€ã®èª¬æ
view_bundle_deployWizard_getInfo_deploymentName = ãããã€å
view_bundle_deployWizard_getOptionsStep = ãããã€ãªãã·ã§ã³
@@ -1213,6 +1305,7 @@ view_bundle_deployWizard_selectVersion_live = åäœããŒãžã§ã³ [{0}]
view_bundle_deployWizard_selectVersion_select = ãªã¹ãããããŒãžã§ã³ãéžæããŠãã ãã:
view_bundle_deployWizard_title = ãã³ãã«ãããã€ã®ãŠã£ã¶ãŒã
view_bundle_deploy_action = ã¢ã¯ã·ã§ã³
+view_bundle_deploy_backButton = å®å
ã«æ»ã
view_bundle_deploy_clickForError = ãšã©ãŒã¡ãã»ãŒãžã®ã¢ã€ã³ã³ãã¯ãªãã¯ããŠãã ãã
view_bundle_deploy_deleteConfirm = ãã®ãã³ãã«ãããã€ãåé€ããŠãããããã§ãã?
view_bundle_deploy_deleteFailure = ãã³ãã«ããã〠[{0}] ã®åé€ã«å€±æããŸãã
@@ -1232,14 +1325,25 @@ view_bundle_deploy_time = ãããã€å
view_bundle_deployed = ãããã€
view_bundle_deployments = ãããã€
view_bundle_dest_backToBundle = ãã³ãã«ãžæ»ã
+view_bundle_dest_baseDirName = åºæ¬ã®é
眮
view_bundle_dest_created = äœæããã
+view_bundle_dest_deleteConfirm = ãã®ãã³ãã«å®å
ãåé€ããŠãããããã§ãã? ããã¯ããŒã¿ããŒã¹ããåé€ããã ãã§ããã€ãŸãããªã¢ãŒããã·ã³ã®ãã®å®å
ã«ãããã€ããããã¹ãŠã®ãã³ãã«ã®å
容ã¯æ®ãç¶ããŸã
+view_bundle_dest_deleteFailure = ãã³ãã«å®å
[{0}] ã®åé€ã«å€±æããŸãã
+view_bundle_dest_deleteSuccessful = ãã³ãã«å®å
[{0}] ã®åé€ã«æåããŸãã
view_bundle_dest_deployDir = ãããã€ãã£ã¬ã¯ããª
view_bundle_dest_group = ã°ã«ãŒã
view_bundle_dest_lastDeployedVersion = æåŸã«ãããã€ãããããŒãžã§ã³
view_bundle_dest_lastDeploymentDate = æåŸã®ãããã€ããããæ¥ä»
view_bundle_dest_lastDeploymentStatus = æåŸã«ãããã€ãããã¹ããŒã¿ã¹
+view_bundle_dest_loadFailure = ãã³ãã«ã®å®å
ãããŒãããã®ã«å€±æããŸãã
+view_bundle_dest_loadFailureVersionInfo = ãããã€ãããããŒãžã§ã³æ
å ±ã®ããŒãã«å€±æããŸãã
view_bundle_dest_purgeConfirm = ãã®æäœã¯ãã¹ãŠã®ãªã¢ãŒããã·ã³ãããã³ãã«ã³ã³ãã³ããé€å»ããŸããããããã§ãã?
+view_bundle_dest_purgeFailure = ãªã¢ãŒããã·ã³ã®äžéšãããã¯ãã¹ãŠããã®ãã³ãã«å®å
[{0}] ã®é€å»ã«å€±æããŸãã
+view_bundle_dest_purgeSuccessful = ãªã¢ãŒããã·ã³ã®äžéšãããã¯ãã¹ãŠããã®ãã³ãã«å®å
[{0}] ã®é€å»ã«æåããŸãã
view_bundle_dest_revertConfirm = ããã¯ãã¹ãŠã®ãªã¢ãŒããã·ã³ã以åã®ãã³ãã«ãããã€ã¡ã³ããžæ»ããŸãããããããŠãããããã§ãã?
+view_bundle_dest_tagUpdateFailure = ãã³ãã«å®å
ã¿ã°ã®æŽæ°ã«å€±æããŸãã
+view_bundle_dest_tagUpdateSuccessful = ãã³ãã«å®å
ã¿ã°ã®æŽæ°ã«æåããŸãã
+view_bundle_destinations = å®å
##view_bundle_fail_existingName = Failed to create [{0}]. The name is already being used. Please try another name.
view_bundle_fileListView_fileSize = ãã¡ã€ã«ãµã€ãº
view_bundle_fileListView_loadFailure = ãã³ãã«ãã¡ã€ã«ããŒã¿ãããŒãããã®ã«å€±æããŸãã
@@ -1253,6 +1357,7 @@ view_bundle_list_deleteFailure = ãã³ãã« [{0}] ã®åé€ã«å€±æããŸã
view_bundle_list_deleteSuccessful = ãã³ãã« [{0}] ã®åé€ã«æåããŸãã
view_bundle_list_deletesFailure = ãã³ãã«ã®åé€ã«å€±æããŸãã
view_bundle_list_deletesSuccessful = ãã³ãã«ã®åé€ã«æåããŸãã
+view_bundle_list_destinationsCount = å®å
æ°
view_bundle_list_error1 = [{0}] ããããã€ããããã®ãã³ãã«ã®ããŒãã«å€±æããŸãã
view_bundle_list_error2 = [{0}] ããããã€ããããã®åäžãã³ãã«ã®ååŸã«å€±æããŸãã
view_bundle_list_error3 = ãã³ãã«ã®ããŒãã«å€±æããŸãã
@@ -1271,14 +1376,18 @@ view_bundle_revertWizard_confirmStep_confirmation = åäœäžã®ãããã€ã
view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = åäœäžã®ãããã€ãèŠã€ãããŸãããåãæ¶ããã§ããŸããã
view_bundle_revertWizard_confirmStep_liveDeployment = åäœäžã®ãããã€
view_bundle_revertWizard_confirmStep_name = åãæ¶ããããã€ç¢ºèª
+view_bundle_revertWizard_confirmStep_noLiveDeployment = ãã®å®å
[{0}] çšã®åäœäžã®ãããã€ã¯èŠã€ãããŸããã§ãã
+view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = ãã®å®å
çšã®åäœäžã®ãããã€ã¯èŠã€ãããŸããã§ãã
view_bundle_revertWizard_confirmStep_noPriorDeployment = 以åã®ããã〠[{1}] ãååšããªãã®ã§åäœäžã®ããã〠[{0}] ã¯åãæ¶ãããšãã§ããŸããã§ãã
view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = 以åã®ãããã€ãååšããªãã®ã§åäœäžã®ãããã€ã¯åãæ¶ãããšãã§ããŸããã§ãã
view_bundle_revertWizard_confirmStep_prevDeployment = 以åã®ãããã€
view_bundle_revertWizard_getInfoStep_cleanDeploy = ãããã€ãåé€ããŸãã? (ããã¯å€ããæ¢åã®ãããã€ãã£ã¬ã¯ããªãåãæ¶ããããã€ãéå§ããåã«åé€ããŸã)
view_bundle_revertWizard_getInfoStep_getNameFailure = åãæ¶ããããã€åã®ååŸã«å€±æããŸãã
+view_bundle_revertWizard_getInfoStep_name = åãæ¶ãæ
å ±ã®æäŸ
view_bundle_revertWizard_getInfoStep_revertDeployDesc = ãããã€èšè¿°ã®åãæ¶ã
view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [åãæ¶ã å] {0} [åãæ¶ã åŸ] {1}
view_bundle_revertWizard_getInfoStep_revertDeployName = ãããã€åã®åãæ¶ã
+view_bundle_revertWizard_revertStep_name = å®å
ãã©ãããã©ãŒã ãžãã³ãã«ããããã€
view_bundle_revertWizard_revertStep_reverting = åãæ¶ãäž...
view_bundle_revertWizard_revertStep_scheduled = ãããã€ã®åãæ¶ãã®ã¹ã±ãžã¥ãŒã«ã«æåããŸããã
view_bundle_revertWizard_revertStep_scheduledDetails = ãªãœãŒã¹ã°ã«ãŒã [{1}] ãããã³ãã«ããã〠[{0}] ã®åãæ¶ãã®ã¹ã±ãžã¥ãŒã«ã«æåããŸãã
@@ -1299,10 +1408,12 @@ view_bundle_versions = ããŒãžã§ã³
##view_charts_time_axis_label = Time
view_configCompare_comparingConfigs = æ§æã®æ¯èŒ
view_configCompare_configCompare = æ§æã®æ¯èŒ
+view_configEdit_addItem = ãªã¹ãã«é
ç®ãè¿œå
view_configEdit_confirm_1 = ãã®éãŸãããéžæãããããããã£ãåé€ããŠãããããã§ãã?
view_configEdit_confirm_2 = ãã®è¡ãåé€ããŠãããããã§ãã?
view_configEdit_confirm_3 = [{1}] ãéžæããã [{0}] ãåé€ããŠãããããã§ãã?
view_configEdit_editRow = è¡ã®ç·šé
+view_configEdit_enterPropName = è¿œå ããããããã£ã®ååãå
¥åããŠãã ãã
view_configEdit_error_1 = æ§æã¯ãã®ãªãœãŒã¹ã§ãµããŒããããŠããŸãã
view_configEdit_error_2 = æ¥ç¶èšå®ã¯ãã®ãªãœãŒã¹ã§ãµããŒããããŠããŸãã
view_configEdit_error_3 = [{0}] ãšããååã®ããããã£ãè¿œå ã§ããŸãããããããã£åã¯ãã®éãŸãã§ãã§ã«äœ¿ãããŠããŸãã
@@ -1427,6 +1538,7 @@ view_drift_wizard_addDef_templatePrompt = ããªããå®çŸ©ãã³ãã¬ãŒã
view_drift_wizard_addDef_title = ã¿ã€ãã®ãªãœãŒã¹ [{0}] ã®ããã®ããªããæ€åºå®çŸ©ãè¿œå ããŠãã ãã
view_drift_wizard_addDef_windowTitle = ããªããæ€åºå®çŸ©ãŠã£ã¶ãŒãã®è¿œå
view_drift_wizard_addTemplate_failure = æ°èŠããªããæ€åºãã³ãã¬ãŒã [{0}] ã®è¿œå ã«å€±æããŸãã
+view_drift_wizard_addTemplate_infoStepHelp = åããªãããã³ãã¬ãŒãã¯æ¢åã®ãã³ãã¬ãŒããã掟çããŠäœæã§ããŸããããã¯æ¢åãã³ãã¬ãŒãã«é¡äŒŒãããã®ãããã©ã°ã€ã³ãå®çŸ©ãããã³ãã¬ãŒãããæ°èŠãã³ãã¬ãŒããæ§ç¯ããçŽ æ©ãæ¹æ³ãæäŸããŸããããªããå®çŸ©ã®ããã«ããã®ãã³ãã¬ãŒãã¯ããªãããç£èŠãå®è¡ããäžåŒã®ãã¡ã€ã«ãèšè¿°ããŸããç¶æ³ã«ãã£ãŠã¯ããã®ãã³ãã¬ãŒãããå°åºãããå®çŸ©ã¯ãã®ãã¡ã€ã«ã»ããã®å€æŽããä»ã®èšå®ã®å€æŽãèš±ããããèš±ããªãã£ããããŸãããã³ãã¬ãŒãåã¯äžã€ã®ãªãœãŒã¹ã¿ã€ãå
ã§ãŠããŒã¯ã§ãªããã°ãªããŸããã
view_drift_wizard_addTemplate_infoStepName = éå§ãã³ãã¬ãŒãã®éžæ
view_drift_wizard_addTemplate_success = æ°èŠããªãããã³ãã¬ãŒã [{0}] ã®è¿œå ã«æåããŸãã
view_drift_wizard_addTemplate_title = ã¿ã€ã [{0}] ã®ããªããå®çŸ©ãã³ãã¬ãŒããè¿œå ããŠãã ãã
@@ -1435,6 +1547,7 @@ view_drift_wizard_pinTemplate_confirmNotPinned = ãã®ãã³ãã¬ãŒãã®ã
view_drift_wizard_pinTemplate_confirmPinned = èŠå! ãã®ãã³ãã¬ãŒãã¯ãã§ã«ãã³çããããŠããŸãããã®ãã³ãã¬ãŒãã¯ãã®æ°èŠã¹ãããã·ã§ããã«å床ãã³çãããããšãå¯èœã§ãããã®ãã³ãã¬ãŒãã®ããã®çŸåšãšå°æ¥ã®åããªããå®çŸ©ããã£ãããã³çãããããšããã®ãã³ãã¬ãŒãã¯åæã¹ãããã·ã§ããããã®ãã³ãã¬ãŒããæã€ãã³çããããã¹ãããã·ã§ãããšããŠèšå®ãããããã«ããŸãããã®ãã³ãã¬ãŒãã®æ¢åå®çŸ©ã¯æ°èŠåæã¹ãããã·ã§ãããžãªã»ããããããã¹ãŠã®æ¢åã¹ãããã·ã§ããã¯åé€ãããŸãããã®æ°èŠã¹ãããã·ã§ãããæã€ãã³ãã¬ãŒãã®ãã³çããç¶ããŸãã?
view_drift_wizard_pinTemplate_failure = ããªãããã³ãã¬ãŒã [{0}] ãžã®ã¹ãããã·ã§ããããã³çãããã®ã«å€±æããŸãã
view_drift_wizard_pinTemplate_infoStepExistingTemplate = çŸåšã®ãã³ãã¬ãŒããžã®ãã³çã
+view_drift_wizard_pinTemplate_infoStepHelp = ãã³çãããããã³ãã¬ãŒããéžæããŠãã ããããã®ãã³ãã¬ãŒãã®ããã®çŸåšãšå°æ¥ã®åããªããå®çŸ©ããã£ãããã³çãããããšããã®ãã³ãã¬ãŒãã¯åæã¹ãããã·ã§ããããã®ãã³ãã¬ãŒããæã€ãã³çããããã¹ãããã·ã§ãããšããŠèšå®ãããæã€ããã«ãªããŸããããã«ããŸãããããŠãã®å®çŸ©èªèº«ã¯ãã³çãããããã®ãšããŠããŒã¯ãããŸããããã¯æåŸ
ããããã¡ã€ã«ã»ããããããªãããæ€åºããã®ã«äœ¿ãããŸãããã®ãã³ãã¬ãŒãã®ããã®æ¢åå®çŸ©ã¯æ°èŠã®åæã¹ãããã·ã§ããã«ãªã»ããããããã¹ãŠã®æ¢åã¹ãããã·ã§ããã¯åé€ãããããšã«æ³šæããŠãã ããã
view_drift_wizard_pinTemplate_infoStepName = ãã³çãããããã³ãã¬ãŒãã®éžæ
view_drift_wizard_pinTemplate_infoStepNewTemplate = æ°èŠãã³ãã¬ãŒããžã®ãã³çã (ã¹ãããã·ã§ããã®ããªããå®çŸ©ããå°åºããããã®)
view_drift_wizard_pinTemplate_infoStepRadioHelp = ãã®ã¹ãããã·ã§ããã¯æ°èŠãŸãã¯æ¢åã®ããªãããã³ãã¬ãŒãã«ãã³çãããããšãå¯èœã§ãããã®''æ°èŠãã³ãã¬ãŒã''ãªãã·ã§ã³ã¯ããŠãŒã¶ãŒã®æã«ãã£ãŠä¿¡é Œããå®çŸ©ãã¹ãããã·ã§ãããããªãœãŒã¹ã¬ãã«ãã¿ã€ãã¬ãã«ã§ããã³ãã¬ãŒãåã§ããããã«ããŸãããã®æ°èŠãã³ãã¬ãŒãã¯ã次ã«ããã®ã¿ã€ãã®ã¡ã³ããŒã«å¯ŸããŠé©çšã§ããŸãããã®æ°èŠãã³ãã¬ãŒãã¯åææã¯ã¹ãããã·ã§ããã®ããªããå®çŸ©ã®ã³ããŒã§ããã次ã®ã¹ãããã§ç·šéããããšãã§ããŸãããã®ååã¯å€æŽãã¹ãã§ããã®ã¿ã€ãã®ãŠããŒã¯ãªããªãããã³ãã¬ãŒãåã§ãªããã°ãªããŸããã''æ¢åãã³ãã¬ãŒã''ãªãã·ã§ã³ã¯ããŠãŒã¶ãŒãéžæããã¹ãããã·ã§ãããæã€æ¢åãã³ãã¬ãŒãã«å¯ŸããŠããã³çã
ãŸãã¯å床ãã³çããã§ããããã«ããŸããæ£ããèšå®ããã«ã¯ããã®æ¢åãã³ãã¬ãŒãã¯åããã£ã¬ã¯ããªããã®ã¹ãããã·ã§ããå®çŸ©ãšããŠç£èŠã§ããªããã°ãªããŸãããã»ã¬ã¯ã·ã§ã³ããã¯ã¹ã¯æ£åœãªæ¢åã®ãã³ãã¬ãŒãã ãã衚瀺ããŸããããæ£åœã§ãªãæ¢åãã³ãã¬ãŒããååšãããšããŠããã®ãªãã·ã§ã³ã§ã¯éžæãããŸããã
@@ -1471,7 +1584,9 @@ view_dynagroup_exprBuilder_expressionType_resourceConfig = ãªãœãŒã¹æ§æ
view_dynagroup_exprBuilder_expressionType_resourceType = ãªãœãŒã¹ã¿ã€ã
view_dynagroup_exprBuilder_expressionType_tooltip = ãã®åŒã®ããããã£ã¯ä»¥äžã®ãã®ã«åãæ¿ãããŸãã<br/> <b>ãªãœãŒã¹</b>: ååãããŒãžã§ã³ãšãã£ããªãœãŒã¹ããããã£<br/> <b>ãªãœãŒã¹ã¿ã€ã</b>: ç¹å®ã¿ã€ãã®ãªãœãŒã¹ã®æ€çŽ¢<br/> <b>ãªãœãŒã¹ã«ããŽãª</b>: ãã©ãããã©ãŒã ããµãŒããŒããµãŒãã¹ãšãã£ãã«ããŽãªã«ãããªãœãŒã¹æ€çŽ¢<br/> <b>ãã¬ã€ã</b>: ã¢ãã¿ããããã¬ã€ãã®ããã«éžæãããå€ãæã€ãªãœãŒã¹<br/> <b>ãã©ã°ã€ã³æ§æ</b>: ã³ã³ããŒãã³ãã®ãã©ã°ã€ã³ã³ã³ããŒãã³ãæ§æèšå®ã«ããæ€çŽ¢<br/> <b>ãªãœãŒã¹æ§æ</b>: 管çãªãœãŒã¹ã®æ§æèšå®ã«ããæ€çŽ¢
view_dynagroup_exprBuilder_expressionType_trait = ãã¬ã€ã
+view_dynagroup_exprBuilder_expression_tooltip = ããã¯ä»¥äžã®ãã©ãŒã å
ã®éžæã«ãã£ãŠè¡šçŸãããå®å
šãªåŒã§ãããã®ããã¹ãã¯ã"åŒã®è¿œå "ãã¿ã³ãã¯ãªãã¯ãããšãã°ã«ãŒãå®çŸ©åŒã®ããã¹ãã«è¿œå ãããŸãã
##view_dynagroup_exprBuilder_groupBy = Group by
+view_dynagroup_exprBuilder_groupBy_tooltip = GroupByã¯ã·ã¹ãã ãå
¥ååŒããã®å€ã«ã€ããŠãããã解æãã§ããããã«ããŸããäŸãã°ãã¯ã©ã¹ã¿ãŒåã«ããGroupByã«ãã£ãŠããã¹ãŠã®ã¯ã©ã¹ã¿ãŒã¡ã³ããŒããã®äžã«å«ããããªã¯ã©ã¹ã¿ã®ã°ã«ãŒããäœæããŸãã
##view_dynagroup_exprBuilder_memberOf = Member of
##view_dynagroup_exprBuilder_memberOf_tooltip = memberof will restrict the dynagroup members to be a subset of the specified resource group. Specifying multiple memberof conditions will restrict the dynagroup members to be a subset of the union of members of the specified groups.
view_dynagroup_exprBuilder_noPlugins = --ãã©ã°ã€ã³ãªã--
@@ -1495,6 +1610,7 @@ view_dynagroup_exprBuilder_resource_tooltip = ãªãœãŒã¹ã®ã¬ãã«ãæã¿
view_dynagroup_exprBuilder_savedExpression = ä¿åãããåŒ
view_dynagroup_exprBuilder_title = åŒãã«ããŒ
view_dynagroup_exprBuilder_unset = èšå®è§£é€
+view_dynagroup_exprBuilder_unset_tooltip = èšå®è§£é€ã¯ããŒã¿ããŒã¹å
ã®nullå€ãæã€å€ãã®ãã¹ãŠãçºèŠããŸããããã¯ããŒã¿ããŒã¹ã¹ãã¢ãšåãåããããŒã¿ã®çç±ã«ãã"="ãªãã¬ãŒã¿ã䜿ãããšã¯å¯èœã§ã¯ãããŸããã
view_dynagroup_exprBuilder_value_tooltip = åãåããåŒã®ããã®æååå€
view_dynagroup_expression = åŒ
view_dynagroup_expressionBuilderIconTooltip = åŒãã«ããŒ...
@@ -1525,6 +1641,8 @@ view_dynagroup_template_jbossas4_hostingApp = JBossAS 4 - ãã¹ãã£ã³ã°ã
view_dynagroup_template_jbossas4_nonsecured = JBossAS 4 - ã»ãã¥ã¢ã§ãªããã¹ãŠ
view_dynagroup_template_jbossas4_uniqueVersions = JBossAS 4 - ãŠããŒã¯ããŒãžã§ã³
view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - ã¯ã©ã¹ã¿
+view_dynagroup_template_platforms = ã€ã³ãã³ããªå
ã®ãã©ãããã©ãŒã ãªãœãŒã¹
+view_dynagroup_template_uniqueResourceTypes = ã€ã³ãã³ããªå
ã®ãŠããŒã¯ãªãœãŒã¹ã¿ã€ã
view_groupConfigEdit_member = ã¡ã³ããŒ
view_groupConfigEdit_noListProps = ã°ã«ãŒãæ§æã«çŸåšãµããŒããããŠããªãããããã£ã®ãªã¹ã
view_groupConfigEdit_saveReminder = èšå®ãå€æŽãããŠããŸã - ãããã®å€æŽãä¿åããã®ãå¿ããªãã§ãã ããããããªããšå€±ãããŸãã
@@ -1562,6 +1680,7 @@ view_group_operationScheduleDetails_memberResource = ã¡ã³ããŒãªãœãŒã¹
view_group_operationScheduleDetails_value_parallel = 䞊è¡å®è¡
view_group_operationScheduleDetails_value_sequential = 以äžã«ç€ºããé 㧠(ã¡ã³ããŒãªãœãŒã¹ããã©ãã°&ããããããŠé çªãå€æŽ)
view_group_pluginConfig_edit_currentGroupProperties = çŸåšã®ã°ã«ãŒãããããã£
+view_group_pluginConfig_edit_invalid = 次ã®ã³ãã¯ã·ã§ã³èšå®ããããã£ã«ã¯äžæ£ãªå€ãèšå®ãããŠããŸãã®ã§ãã³ãã¯ã·ã§ã³èšå®ãä¿åããããŸãã«ä¿®æ£ãããå¿
èŠããããŸã: [{0}]
view_group_pluginConfig_edit_noperm = ãã®ã°ã«ãŒãã³ãã¯ã·ã§ã³èšå®ãç·šéããæš©éããããŸãã
view_group_pluginConfig_edit_saveFailure = ã°ã«ãŒãå [{1}] ãšäºææ§ã®ãã [{0}] ã®ããã®ã°ã«ãŒãèšå®æŽæ°ã®éå§ã«å€±æããŸãã
view_group_pluginConfig_edit_saveInitiated_concise = ã°ã«ãŒãã³ãã¯ã·ã§ã³èšå®ã®æŽæ°ãéå§ãããŸãã
@@ -1570,6 +1689,7 @@ view_group_pluginConfig_edit_saveTooltip = ãã¹ãŠã®ã°ã«ãŒãã¡ã³ããŒ
view_group_pluginConfig_edit_valid = ãã¹ãŠã®ã³ãã¯ã·ã§ã³èšå®ããããã£ã«ã¯æ£ããå€ãèšå®ãããŠããŸãã®ã§ãã³ãã¯ã·ã§ã³èšå®ã¯ä¿åã§ããŸã
view_group_pluginConfig_members_fetchFailure = ã°ã«ãŒã [{0}] ã®ã¡ã³ããŒã®ããã®ãã©ã°ã€ã³æ§ææŽæ°å±¥æŽã®ååŸã«å€±æããŸãã
view_group_pluginConfig_members_fetchFailureConn = [{0}] ã®ããã®ã¡ã³ããŒã³ãã¯ã·ã§ã³èšå®ã®åãåºãã«å€±æããŸãã
+view_group_pluginConfig_members_fetchFailureConnInProgress = ã°ã«ãŒããã©ã°ã€ã³æ§æã®æŽæ°ã¯çŸåšé²è¡äžã§ããã°ã«ãŒãèšå®ãé²èŠ§ããåã«æŽæ°ãå®äºãããŸã§åŸ
ã£ãŠãã ããã
view_group_pluginConfig_members_statusDetails = ã¹ããŒã¿ã¹ã®è©³çŽ°
view_group_pluginConfig_members_statusFailure = ãã®æ§æã®æŽæ°ã¯æªç¥ã®çç±ã«ãã倱æããŸãã
view_group_pluginConfig_members_statusInprogress = ãã®æ§æã®æŽæ°ã¯ãŸã é²è¡äžã§ã
@@ -1580,6 +1700,7 @@ view_group_pluginConfig_table_clickStatusIcon = 詳现ã¯ã¹ããŒã¿ã¹ã¢ã€
view_group_pluginConfig_table_deleteFailure = ã°ã«ãŒããã©ã°ã€ã³æ§æå±¥æŽã®åé€ã«å€±æããŸãã
view_group_pluginConfig_table_deleteSuccessful = [{0}] ã®å±¥æŽãåé€ããŸãã
view_group_pluginConfig_table_failFetch = ã°ã«ãŒããã©ã°ã€ã³å±¥æŽã®ååŸã«å€±æããŸãã
+view_group_pluginConfig_table_msg1 = åã
ã®ãªãœãŒã¹ã®ã¹ããŒã¿ã¹ã®ããã®ã¡ã³ããŒå±¥æŽãèŠãŠãã ãã
view_group_pluginConfig_table_statusDetails = ã¹ããŒã¿ã¹ã®è©³çŽ°
view_group_pluginConfig_table_statusFailure = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã¯å€±æããŸãã
view_group_pluginConfig_table_statusInprogress = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã¯é²è¡äžã§ã
@@ -1600,6 +1721,7 @@ view_group_resConfig_edit_saveTooltip = ãã¹ãŠã®ã°ã«ãŒãã¡ã³ããŒã®
view_group_resConfig_edit_valid = ãã¹ãŠã®æ§æããããã£ã¯æ£ããå€ã§ãã®ã§ããã®æ§æã¯ä¿åå¯èœã§ã
view_group_resConfig_members_fetchFailure = ã°ã«ãŒã [{0}] ã®ã¡ã³ããŒã®ããã®ãªãœãŒã¹æ§ææŽæ°å±¥æŽã®ååŸã«å€±æããŸãã
view_group_resConfig_members_fetchFailureConfig = [{0}] ã®ããã®ã¡ã³ããŒãªãœãŒã¹æ§æèšå®ã®åãåºãã«å€±æããŸãã
+view_group_resConfig_members_fetchFailureConfigInProgress = ã°ã«ãŒããªãœãŒã¹æ§æã®æŽæ°ãçŸåšé²è¡äžã§ããã°ã«ãŒãèšå®ãé²èŠ§ããåã«æŽæ°ãçµäºããã®ããåŸ
ã¡ãã ãã
view_group_resConfig_members_statusDetails = ã¹ããŒã¿ã¹ã®è©³çŽ°
view_group_resConfig_members_statusFailure = ãã®æ§æã®æŽæ°ã¯æªç¥ã®çç±ã§å€±æããŸããã
view_group_resConfig_members_statusInprogress = ãã®æ§æã®æŽæ°ã¯ãŸã é²è¡äžã§ã
@@ -1610,6 +1732,7 @@ view_group_resConfig_table_clickStatusIcon = 詳现ã¯ã¹ããŒã¿ã¹ã¢ã€ã³
view_group_resConfig_table_deleteFailure = ã°ã«ãŒããªãœãŒã¹æ§æå±¥æŽã®åé€ã«å€±æããŸãã
view_group_resConfig_table_deleteSuccessful = [{0}] ã®å±¥æŽã®åé€ãããŸãã
view_group_resConfig_table_failFetch = ã°ã«ãŒãæ§æå±¥æŽã®ååŸã«å€±æããŸãã
+view_group_resConfig_table_msg1 = åã
ã®ãªãœãŒã¹ã®ã¹ããŒã¿ã¹ã¯ã¡ã³ããŒå±¥æŽãé²èŠ§ããŠãã ãã
view_group_resConfig_table_statusDetails = ã¹ã¿ãŒã¿ã¹ã®è©³çŽ°
view_group_resConfig_table_statusFailure = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã倱æããŸãã
view_group_resConfig_table_statusInprogress = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã¯ãŸã é²è¡äžã§ã
@@ -1632,6 +1755,7 @@ view_group_summary_mixed = æ··åš
view_group_summary_nameUpdateFailure = ID [{0}] ãæã€ãªãœãŒã¹ã°ã«ãŒãåã®å€æŽã«å€±æããŸãã - [{1}] ãã [{2}] ãžã®å€æŽãã§ããŸããã§ãã
view_group_summary_nameUpdateSuccessful = ID [{0}] ãæã€ãªãœãŒã¹ã°ã«ãŒãã [{1}] ãã [{2}] ãžã®å€æŽããŸãã
view_group_summary_recursive = ååž°
+view_helpTop_description = ãã®ã»ã¯ã·ã§ã³ã¯ããã¥ã¡ã³ããŒã·ã§ã³ããã¥ãŒããªã¢ã«ãããŒãžã§ã³ããã®ä»ã®ãã«ãæ
å ±ãæäŸããŸãã
view_help_section_product = ãããã¯ã
view_help_section_product_about = RHQã«ã€ããŠ
view_inventory_adq = ãã£ã¹ã«ããªãã¥ãŒ
@@ -1667,6 +1791,7 @@ view_inventory_resource_loadFailed = ID [{0}] ãæã€ãªãœãŒã¹ã¯ååšã
view_inventory_resources_deleteConfirm = éžæããããªãœãŒã¹ãåé€ãããã§ãã?
view_inventory_resources_deleteFailed = éžæããããªãœãŒã¹ã®åé€ã«å€±æããŸãã
view_inventory_resources_deleteSuccessful = ãã®ãªãœãŒã¹ãåé€ãããªã¯ãšã¹ãã¯(è€æ°ã®)ãšãŒãžã§ã³ãã«æ£ããéä¿¡ãããŸããã
+view_inventory_resources_disableConfirm = æ¬åœã«éžæãããªãœãŒã¹ãç¡å¹ã«ãããã§ãã? ç¡å¹ãªéã«ãšãŒãžã§ã³ãããå ±åãããã¢ãã€ã©ããªãã£ã¯ç¡èŠãããŸããç¡å¹åã¯éåžžæäœãä¿å®ã®äžéšãšããŠåæ¢ããããšãæåŸ
ãããŠãããªãœãŒã¹ã«å¯ŸããŠåœ¹ã«ç«ã¡ãŸãã
view_inventory_resources_disableFailed = éžæããããªãœãŒã¹ãç¡å¹åããã®ã«å€±æããŸããã
view_inventory_resources_disableSuccessful = éžæããããªãœãŒã¹ãšãã®åãšãªã [{0}] ãªãœãŒã¹ãç¡å¹åããã®ã«æåããŸããã
view_inventory_resources_enableConfirm = æ¬åœã«éžæããããªãœãŒã¹ãæå¹ãããã§ãã? æå¹ã®éã¯ãšãŒãžã§ã³ãããªãœãŒã¹ã®ã¢ãã€ã©ããªãã£ãå ±åãããŸã§ã¢ãã€ã©ããªãã£ã¯UNKNOWNã«èšå®ãããŸãããšãŒãžã§ã³ãã¯çŽè¿ã®éœåã®è¯ããšãã«çŸåšã®ã¢ãã€ã©ããªãã£ãå ±åããããã«èŠæ±ãããŸãã
@@ -1705,10 +1830,13 @@ view_login_invalidEmail = äžæ£ãªE-ã¡ãŒã«ã¢ãã¬ã¹
view_login_login = ãã°ã€ã³
view_login_logout = ãã°ã¢ãŠã
view_login_noBackend = ããã¯ãšã³ãããŒã¿ãœãŒã¹ã¯å©çšã§ããŸãã
+view_login_noLdap = 泚æïŒLDAP詳现ã®ä»»æã®åãåºãã¯æåããŸããã§ãããæåã§ã®å
¥åãèŠæ±ãããŸã
+view_login_noUser = å
¥åããããŠãŒã¶ãŒåãŸãã¯ãã¹ã¯ãŒãã¯èšé²ããããã®ãšäžèŽããŸãã
view_login_prompt = ãã°ã€ã³ããŠãã ãã
view_login_registerLater = (ãã£ã³ã»ã« - ç»é²ãåŸã§å®æãããŠãã ãã)
view_login_registerLdapSuccess = æ°ããLDAPãŠãŒã¶ãŒã®ç»é²ã«æåããŸãã
view_login_registerUser = ãŠãŒã¶ã®ç»é²
+view_login_welcomeMsg = {0}ãžãããã! <br/><br/> ç»é²ãå®æãããããã«æ¬¡ã®ãã£ãŒã«ããå
¥å/æŽæ°ããŠãã ããã<br/> "OK"ãã¯ãªãã¯ãããããã°ã€ã³ããŸãã<br/><br/>
view_measureRange_last = æéã®ç¯å² - çŽå
view_measureRange_simple = ã·ã³ãã«...
view_measureRange_start = æéã®ç¯å² - éå§
@@ -1741,6 +1869,7 @@ view_operationHistoryDetails_error_fetchFailure = ãªãã¬ãŒã·ã§ã³å±¥æŽã®
view_operationHistoryDetails_noResults = ãã®ãªãã¬ãŒã·ã§ã³ã¯å€ãè¿ããŸãã
view_operationHistoryDetails_operation = ãªãã¬ãŒã·ã§ã³
view_operationHistoryDetails_parameters = ãã©ã¡ãŒã¿ãŒ
+view_operationHistoryDetails_requestor = èŠæ±è
view_operationHistoryDetails_results = çµæ
view_operationHistoryDetails_status = ã¹ããŒã¿ã¹
view_operationHistoryList_button_forceDelete = 匷å¶åé€
@@ -1754,6 +1883,7 @@ view_operationHistoryList_button_runOperation = ãªãã¬ãŒã·ã§ã³ã®å®è¡
##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
view_operationHistoryList_notYetStarted = ãŸã éå§ããŠããŸãã
view_operationHistoryList_title = ãªãã¬ãŒã·ã§ã³å±¥æŽ
+view_operationScheduleDetails_enterParametersBelow = 以äžã«ãã©ã¡ãŒã¿ãŒãå
¥åããŠãã ãã...
view_operationScheduleDetails_fieldDefault_description = 説æãèŠããšãããªãã¬ãŒã·ã§ã³ãéžæããŠãã ãã
view_operationScheduleDetails_fieldDefault_parameters = ãã©ã¡ãŒã¿ãŒãèŠãããã«ãªãã¬ãŒã·ã§ã³ãéžæããŠãã ãã
view_operationScheduleDetails_fieldHelp_description = ãã®ã¹ã±ãžã¥ãŒã«ããããªãã¬ãŒã·ã§ã³ã®ããã®ä»»æã®èª¬æ (äŸãå€éä¿å®ã®ããã®ã¢ããªãµãŒããŒåèµ·åïŒ
@@ -1767,7 +1897,9 @@ view_portlet_autodiscovery_setting_platforms = çºèŠããããã©ãããã©
view_portlet_configure_definitionDesc = ããŒãã¬ããã®ããã®æ§æèšå®
view_portlet_configure_definitionTitle = ããŒãã¬ããæ§æ
view_portlet_configure_needed = èšå®ãã¿ã³ãæŒããŠãã®ããŒãã¬ãããæ§æããŠãã ãã
+view_portlet_configure_notNeeded = æ§æã¯ãã®ããŒãã¬ããã«ã¯å¿
èŠãããŸãã
view_portlet_defaultName_autodiscovery = ãã£ã¹ã«ããªãã¥ãŒ
+view_portlet_defaultName_favoriteResources = ãæ°ã«å
¥ããªãœãŒã¹
view_portlet_defaultName_groupMetric = ãªãœãŒã¹ã°ã«ãŒãã¡ããªãã¯ã°ã©ã
view_portlet_defaultName_group_alerts = ã°ã«ãŒã: ã¢ã©ãŒã
view_portlet_defaultName_group_bundles = ã°ã«ãŒã: ãã³ãã«ãããã€
@@ -1801,8 +1933,11 @@ view_portlet_help_autodiscovery = ãã®ããŒãã¬ããã¯æ°èŠã«çºèŠã
view_portlet_help_bundle_deps = ãã®ããŒãã¬ããã¯æ§æããããã£ã¹ãã¬ã€ã¯ã©ã€ããªã¢ãããŒã¹ã«ããé¢é£ãããã³ãã«ãããã€ã衚瀺ããŸã
view_portlet_help_config_updates = ãã®ããŒãã¬ããã¯æ§æèšå®ãšäžèŽããæè¿ã®æ§æå€æŽã衚瀺ããŸã
view_portlet_help_eventcounts = ãã®ããŒãã¬ããã¯æ§æããããã£ã¹ãã¬ã€ã¯ã©ã€ããªã¢ã«äžèŽããã€ãã³ãæ°ã衚瀺ããŸã
+view_portlet_help_favoriteResources = ãã®ããŒãã¬ããã¯çŸåšãŠãŒã¶ãŒã®ãæ°ã«å
¥ããªãœãŒã¹ã衚瀺ããŸã
view_portlet_help_graph = ãã®ããŒãã¬ããã¯ãªãœãŒã¹ã¡ããªãã¯ã°ã©ãã衚瀺ããŸã
view_portlet_help_inventorySummary = ãã®ããŒãã¬ããã¯çŸåšãŠãŒã¶ãŒã®é²èŠ§å¯èœãªã€ã³ãã³ããªãšã¡ããªãã¯åéçã®ã·ã§ãŒããµããªãŒã衚瀺ããŸã
+view_portlet_help_mashup = ãã®ããŒãã¬ããã¯(iframeãä»ããŠ)ãªã¢ãŒãHTTPãªã¯ãšã¹ããè¿ããå
容ã衚瀺ããŸã
+view_portlet_help_message = ãã®ããŒãã¬ããã¯éçãªHTMLã¡ãã»ãŒãžã衚瀺ããŸãã <i>message</i> ããããã£ã®æ§æãå¿
èŠã§ãã
view_portlet_help_metrics = ãã®ããŒãã¬ããã¯æ§æããããã£ã¹ãã¬ã€ã¯ã©ã€ããªã¢ãããŒã¹ã«ããŠé¢é£ããã¡ããªãã¯ããŒã¿ã®ã°ã©ããæããŸã
view_portlet_help_none = ãã®ããŒãã¬ããçšã®ãã«ãã¯å©çšã§ããŸãã
view_portlet_help_oobs = ãã®ããŒãã¬ãã㯠ç¯å²å€ã¡ããªãã¯æ¡ä»¶ã衚瀺ããŸã
@@ -1834,6 +1969,8 @@ view_portlet_problemResources_config_display_range = ããããæ°æéé¡ã£
view_portlet_problemResources_config_display_range2 = {0} ãã {1} ãŸã§
view_portlet_problemResources_maxDisplaySetting = æ倧ãªãœãŒã¹
view_portlet_recentAlerts_config_members = ã¡ã³ããŒã®éžæ
+view_portlet_recentAlerts_config_priority_label = åªå
ã¢ã©ãŒã
+view_portlet_recentAlerts_config_when = 次ã®æé以å
ã§
view_portlet_recentAlerts_fail_msg = ã¢ã©ãŒããã£ã«ã¿ãªã³ã°ã®ããã«å²ãåœãŠããããªãœãŒã¹ãããŒãããã®ã«å€±æããŸãã
view_portlet_recentlyAdded_error1 = æè¿è¿œå ããããªãœãŒã¹ãããŒãããã®ã«å€±æããŸãã
view_portlet_recentlyAdded_setting_addedPlatforms = æè¿è¿œå ããããã©ãããã©ãŒã
@@ -1841,15 +1978,19 @@ view_portlet_results_empty = æå®ãããã¯ã©ã€ããªã¢ã®çµæã¯èŠã€
view_remoteAgentInstall_agentStatus = ãšãŒãžã§ã³ãã®ã¹ããŒã¿ã¹
view_remoteAgentInstall_agentStatusDefault = -ã¹ããŒã¿ã¹ã®æŽæ°ãã¿ã³ãã¯ãªãã¯ããŠãã ãã-
view_remoteAgentInstall_buttonFindAgent = ãšãŒãžã§ã³ãã®çºèŠ
+view_remoteAgentInstall_connInfo = æ¥ç¶æ
å ±
view_remoteAgentInstall_error_1 = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«ãã¹ãæ¢ããŠããéã«ãšã©ãŒãçºçããŸãã
+view_remoteAgentInstall_error_2 = å
±éã®å Žæã§æ¢ããŠãããšãã«ãšãŒãžã§ã³ããèŠã€ããããšãã§ããŸããã§ãã
view_remoteAgentInstall_error_3 = [{0}] 以äžã«ã€ã³ã¹ããŒã«ããããšãŒãžã§ã³ãèŠã€ããããšãã§ããŸããã§ãã
view_remoteAgentInstall_error_4 = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«ã«å€±æããŸãã
view_remoteAgentInstall_error_5 = ãšãŒãžã§ã³ãã®éå§ã«å€±æããŸãã
view_remoteAgentInstall_error_6 = ãšãŒãžã§ã³ãã®åæ¢ã«å€±æããŸãã
view_remoteAgentInstall_installAgent = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«
+view_remoteAgentInstall_installInfo = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«æ
å ±
view_remoteAgentInstall_installPath = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«ãã¹
view_remoteAgentInstall_owner = ãªãŒããŒ
view_remoteAgentInstall_promptHost = ãšãŒãžã§ã³ããã€ã³ã¹ããŒã«ãããŠããããããã¯ããããã€ã³ã¹ããŒã«ããããã¹ã
+view_remoteAgentInstall_promptInstallPath = ãšãŒãžã§ã³ããã€ã³ã¹ããŒã«ãããŠããããããã¯ããããã€ã³ã¹ããŒã«ãããå Žæãã©ãã«ã€ã³ã¹ããŒã«ãããã確信ããªããªãã芪ãã£ã¬ã¯ããªãå
¥åããŠã''ãšãŒãžã§ã³ãã®çºèŠ''ãã¿ã³ãã¯ãªãã¯ããã®ãã£ã¬ã¯ããªä»¥äžãã¹ãã£ã³ããŠãã ããã空ã®ãã¹ãå
¥åãããªãããšãŒãžã§ã³ããã€ã³ã¹ããŒã«ãããã¹ãäžã®å
±éã®å Žæãæ¢çŽ¢ãããŸãã
view_remoteAgentInstall_promptPassword = SSHãä»ããŠãã¹ãäžã®ãŠãŒã¶ãŒãèªèšŒããããã«äœ¿ãããã¯ã¬ãã³ã·ã£ã«
view_remoteAgentInstall_promptPort = SSHãµãŒããŒããªã¹ã³ããããŒããæå®ãããªããã°ãããã©ã«ãã¯22ã§ãã
view_remoteAgentInstall_promptUser = SSHãä»ããŠãã¹ãã«æž¡ãããã¯ã¬ãã³ã·ã£ã«ãä¿æãããŠãŒã¶ãŒã®åå
@@ -1874,10 +2015,12 @@ view_reports_subsystems = ãµãã·ã¹ãã
view_resourceResourceGroupList_error_fetchFailure = ãªãœãŒã¹ã®ã°ã«ãŒãã®åãåºãã«å€±æããŸãã
view_resourceResourceGroupList_error_updateFailure = å²ãåœãŠããããªãœãŒã¹ã°ã«ãŒãã®æŽæ°ã«å€±æããŸãã
view_resourceResourceGroupList_message_updateSuccess = [{0}] ã®ããã«æŽæ°ãããã°ã«ãŒãã¡ã³ããŒã·ãã.
+view_resource_inventory_activity_changed_by = æŽæ°è
view_resource_inventory_activity_criteria_no_recent_events = 衚瀺ã¯ã©ã€ããªã¢ã«åºã¥ãã€ãã³ãã¯ãããŸãã
view_resource_inventory_activity_no_recent_alerts = æè¿ã®ã¢ã©ãŒãã¯ãããŸãã
view_resource_inventory_activity_no_recent_bundle_deploy = æè¿ã®ãã³ãã«ãããã€ã¡ã³ãã¯ãããŸãã
view_resource_inventory_activity_no_recent_config_history = æ§æå€æŽå±¥æŽã¯ãããŸãã
+view_resource_inventory_activity_no_recent_events = çŽè¿24æé以å
ã«ã€ãã³ãã¯ãããŸãã
view_resource_inventory_activity_no_recent_metrics = ãã®ãªãœãŒã¹ã«ã¯æè¿ã®ã¡ããªãã¯ã¯ãããŸãã
view_resource_inventory_activity_no_recent_oob = ç¯å²å€ã®æ¡ä»¶ã¯ã¿ã€ãããŸãã
view_resource_inventory_activity_no_recent_operations = æè¿ã®ãªãã¬ãŒã·ã§ã³å±¥æŽã¯ãããŸãã
@@ -1889,20 +2032,30 @@ view_resource_inventory_childhistory_status_invalidArtifact = äžæ£ãªçæç©
view_resource_inventory_childhistory_status_invalidConfig = äžæ£ãªæ§æ
view_resource_monitor_availability_currentAsOf = ãã®ããŒã¿ã¯ {0} ã®çŸåšã®ãã®ã§ãã
view_resource_monitor_availability_currentStatus = çŸåšã®ã¹ããŒã¿ã¹
+view_resource_monitor_availability_currentStatus_value = ãã®ãªãœãŒã¹ã¯ {1} ãã {0} ã®ç¶æ
ã®ãŸãŸã§ã
view_resource_monitor_availability_disabledTime = ç¡å¹åãããæé
+view_resource_monitor_availability_disabledTime_tooltip = ãªãœãŒã¹ãDISABLEDç¶æ
ã§ãã环ç©æé
view_resource_monitor_availability_downtime = åæ¢æé
+view_resource_monitor_availability_downtime_tooltip = ãªãœãŒã¹ãDOWNç¶æ
ã§ãã环ç©æé
view_resource_monitor_availability_loadFailed = ã¢ãã€ã©ããªãã£å±¥æŽã®ããŒãã«å€±æããŸãã
view_resource_monitor_availability_mtbf = MTBF
+view_resource_monitor_availability_mtbf_tooltip = å¹³åæ
éééïŒMean Time Before Failure) - ã€ãŸããããã¯DOWNããåã«UPç¶æ
ã§è²»ããããå¹³åæéãæå³ããŸã
view_resource_monitor_availability_mttr = MTTR
+view_resource_monitor_availability_mttr_tooltip = å¹³å埩æ§æé (Mean Time To Recovery) - ã€ãŸããããã¯å床UPããåã«DOWNç¶æ
ã§è²»ããããå¹³åæéãæå³ããŸã
view_resource_monitor_availability_numDisabled = ç¡å¹ååæ°
+view_resource_monitor_availability_numDisabled_tooltip = ãªãœãŒã¹ãDISABLEDç¶æ
ã«å
¥ã£ãåæ°ã®åèš
view_resource_monitor_availability_numFailures = é害æ°
+view_resource_monitor_availability_numFailures_tooltip = ãªãœãŒã¹ãDOWNç¶æ
ã«å
¥ã£ãåæ°ã®åèš
view_resource_monitor_availability_summaryError = ãªãœãŒã¹ã¢ãã€ã©ããªãã£ã®ãµããªãããŒãããã®ã«å€±æããŸãã
view_resource_monitor_availability_tooltip_disabled = ãªãœãŒã¹ãDISABLEDã§ããæéãèµ·åãåæ¢ã®æéãšæ¯èŒããããŒã»ã³ããŒãž
view_resource_monitor_availability_tooltip_down = ãªãœãŒã¹ãDOWNããŠããæéãèµ·åãç¡å¹åã®æéãšæ¯èŒããããŒã»ã³ããŒãž
##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled
+view_resource_monitor_availability_unknown = ãã®ãªãœãŒã¹ã¯ {0} ã®éã¯æªç¥ã®ç¶æ
ã§ããã
view_resource_monitor_availability_uptime = èµ·åæé
+view_resource_monitor_availability_uptime_tooltip = ãªãœãŒã¹ãUPç¶æ
ã§ãã环ç©æé
view_resource_monitor_calltime_average = å¹³å
view_resource_monitor_calltime_count = æ°
+view_resource_monitor_calltime_destination = åŒã³åºãã®å®å
##view_resource_monitor_calltime_destinationFilter = Destination Filter
view_resource_monitor_calltime_loadFailed = åŒã³åºãæéããŒã¿ãããŒãã§ããŸãã
view_resource_monitor_calltime_maximum = æ倧
@@ -1920,6 +2073,7 @@ view_resource_monitor_table_avg = å¹³å
##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = æ倧
view_resource_monitor_table_min = æå°
+view_resource_title_component_errors_cleanup = åé¡ã«åãçµãã åŸã¯ã以äžã®ã¡ãã»ãŒãžãåé€ããŠå
šç»é¢ã®'管çã³ã³ããŒãã³ããšã©ãŒ'ãã¯ãªã¢ããå¿
èŠããããŸãã
view_resource_title_component_errors_tooltip = 管çã³ã³ããŒãã³ããšã©ãŒã®è¡šç€ºã詳现ã¯ã¯ãªãã¯ããŠãã ãã
view_resource_title_tagUpdateFailed = ãªãœãŒã¹ã¿ã°ã®æŽæ°ã«å€±æããŸãã
##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
@@ -1935,6 +2089,8 @@ view_searchBar_savedSearch_namePrompt = ãã¿ãŒã³ãååãä»ããŠãã
view_searchBar_savedSearch_rename = ä¿åæžã¿æ€çŽ¢ã®ååã [{0}] ãžå€æŽããã®ã«æåããŸãã
view_searchBar_savedSearch_save = [{0}] ãšããååã®ä¿åæžã¿æ€çŽ¢ãäœæããã®ã«æåããŸãã
view_searchBar_suggest_failSuggest = ãµãžã§ãã·ã§ã³ã®äœæã«å€±æããŸãããå¯èœæ§ã®ãããšã©ãŒããµãŒããŒãã°ãã調ã¹ãŠãã ããã
+view_searchBar_suggest_noSuggest = äžä»¶ãäžèŽããŸããã§ãããç°ãªããã¿ãŒã³ãå
¥åããŠãã ããã
+view_searchGUI_loginStatus = ãã°ã€ã³ã¹ããŒã¿ã¹ã確å®ã§ããŸããããµãŒããŒã®ç¶æ
ã調ã¹ãŠãã ãã
view_selector_assigned = å²ãåœãŠããã {0}
view_selector_available = å©çšå¯èœãª {0}
view_subTab_error_disabled = ç¡å¹ã«ãªã£ããµãã¿ã [{0}] ãéžæã§ããŸãã
@@ -2003,11 +2159,20 @@ view_tags_error_1 = ã¿ã°ãããŒãããã®ã«å€±æããŸãã
view_tags_tags = ã¿ã°
view_tags_tooltip_1 = ã¯ãªãã¯ãããšãã®ã¿ã°ãåé€ããŸã
view_tags_tooltip_2 = ã¯ãªãã¯ãããšã¿ã°ãç·šéããŸã
+view_tags_tooltip_3 = 次ã®ãã©ãŒãããã§ã¿ã°ãå
¥åããŠãã ãã: (namespace:)(semantic=)tagname (äŸ it:env=QA, or owner=John)
view_testTop_description = ãã®ã»ã¯ã·ã§ã³ã¯ããŸããŸãªGUIã³ã³ããŒãã³ãããã¹ãããããã®ããŒãžãå«ãã§ããŸã
view_testTop_title = ãã¹ã
+view_titleBar_common_addedFav = [{0}] ããæ°ã«å
¥ããšããŠè¿œå ããŸãã
+view_titleBar_common_addedFavFailure = [{0}] ããæ°ã«å
¥ããšããŠè¿œå ããã®ã«å€±æããŸãã
+view_titleBar_common_clickToAddFav = ã¯ãªãã¯ãããšããããæ°ã«å
¥ããšããŠè¿œå ããŸã
+view_titleBar_common_clickToRemoveFav = ã¯ãªãã¯ãããšããããæ°ã«å
¥ãããåé€ããŸã
view_titleBar_common_loadTagsFailure = [{0}] ã®ããã®ã¿ã°ãããŒãããã®ã«å€±æããŸãã
+view_titleBar_common_removedFav = ãæ°ã«å
¥ããã [{0}] ãåé€ããŸãã
+view_titleBar_common_removedFavFailure = ãæ°ã«å
¥ããã [{0}] ãåé€ããã®ã«å€±æããŸãã
view_titleBar_common_updateTagsFailure = [{0}] ã®ã¿ã°ã®æŽæ°ã«å€±æããŸãã
view_titleBar_common_updateTagsSuccessful = [{0}] ã®ã¿ã°ãæŽæ°ãããŸãã
+view_titleBar_group_failInfo = ID [{1}] ãæã€ã°ã«ãŒã [{0}] ã«é¢ããäžè¬æ
å ±ãååŸããã®ã«å€±æããŸãã
+view_titleBar_group_summary_collapsedTooltip = ã¯ãªãã¯ãããšãã®ã°ã«ãŒãã®è©³çŽ°æ
å ±ã衚瀺ããŸã
view_titleBar_group_summary_expandedTooltip = ã¯ãªãã¯ãããšãã®ã°ã«ãŒãã®è©³çŽ°ãé ããŸã
view_tree_common_contextMenu_addChartToDashboard = ããã·ã¥ããŒã [{0}] ãžãã£ãŒããè¿œå ããŸã
view_tree_common_contextMenu_editPluginConfiguration = [{0}] ãã©ã°ã€ã³æ§æãç·šéããŸã
@@ -2042,6 +2207,7 @@ view_type_resourceTypes = ãªãœãŒã¹ã¿ã€ã
view_type_typeTreeLoadFailure = ãªãœãŒã¹ã¿ã€ãã®ããªãŒããŒã¿ãããŒãããã®ã«å€±æããŸãã
view_upload_alreadyUploaded = ãã¡ã€ã«ã¯ãã§ã«æŽæ°ãããŠããŸãã
view_upload_bundleDistFile = åæ£ãã¡ã€ã«
+view_upload_error_bundleDistFile = ãã³ãã«é
åžãã¡ã€ã«ã®ã¢ããããŒããšã©ãŒ
view_upload_error_file = ãã¡ã€ã«ã¢ããããŒããšã©ãŒ
view_upload_error_fileName = ãã¡ã€ã«ã¢ããããŒããšã©ãŒ [{0}]
view_upload_error_fileName_2 = [{0}] ã®ã¢ããããŒããšã©ãŒã§ããäžæ£ãªãã¡ã€ã«ãã¹ã調ã¹ãŠãã ããã
@@ -2057,6 +2223,7 @@ view_upload_tooltip_2 = ãã¡ã€ã«ã¢ããããŒãã¯ä»¥å倱æããŠã
view_upload_upload = ã¢ããããŒã
view_upload_uploadFile = ã¢ããããŒããã¡ã€ã«
widget_colorPicker_tooltip = æ°èŠã«ã©ãŒãéžæããããã«ã¯ãªãã¯ããŠãã ãã
+widget_durationItem_inputUnitLessThanTargetUnit = å
¥ååäœã¯ã¿ãŒã²ããåäœãããå°ããã§ã
widget_durationItem_unitTypeNotSupported = åäœã®ã¿ã€ã [{0}] ã¯ãã® DurationItem ã«ãããµããŒããããŸãã
widget_jobTriggerEditor_fieldHelp_repeatDuration = ãã®ãªãã¬ãŒã·ã§ã³ãäœåãå®è¡ãããããŸãã¯æå®ãããæéãçµäºãããŸã§å®è¡ãç¶ããŸã
widget_jobTriggerEditor_fieldHelp_repeatInterval = ãªãã¬ãŒã·ã§ã³ãå®è¡ãããé »åºŠ
@@ -2083,8 +2250,11 @@ widget_jobTriggerEditor_value_nowAndRepeat = çŸåš & ç¹°ãè¿ã
widget_jobTriggerEditor_value_on = on
widget_jobTriggerEditor_value_until = Until
widget_recordEditor_error_invalidViewPath = ç¡å¹ãªãã¥ãŒãã¹: [{0}]
+widget_recordEditor_error_multipleRecords = è€æ°ã¬ã³ãŒããèŠã€ãããŸãã - 1ã€ã ããæåŸ
ãããŠããŸã
+widget_recordEditor_error_noRecords = ã¬ã³ãŒããäžã€ãèŠã€ãããŸããã§ãã - 1ã€ã ããæåŸ
ãããŠããŸã
widget_recordEditor_error_operation = ãªãã¬ãŒã·ã§ã³ã倱æããŸããããšã©ãŒãçºçããŸããã
widget_recordEditor_error_operationInvalidValues = ãªãã¬ãŒã·ã§ã³ã倱æããŸããã - äžã€ä»¥äžã®ãã£ãŒã«ããç¡å¹ãªå€ãæã£ãŠããŸã
+widget_recordEditor_error_permissionCreate = [{0}] ãæ°èŠäœæããããã«å¿
èŠãªæš©éãæã£ãŠããŸãã
widget_recordEditor_error_unsupportedOperationType = ãµããŒãå€ã®ãªãã¬ãŒã·ã§ã³ ã¿ã€ã: [{0}]
widget_recordEditor_info_recordCreatedConcise = {0} ãäœæãããŸããã
widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] ãäœæãããŸããã
@@ -2102,6 +2272,7 @@ widget_resourceFactoryWizard_contentTemplatePrompt = ãããã€æéæ§æã
widget_resourceFactoryWizard_createWizardTitle = ã¿ã€ã [{0}] ã®æ°èŠãªãœãŒã¹ã®äœæ
widget_resourceFactoryWizard_createWizardWindowTitle = ãªãœãŒã¹äœæãŠã£ã¶ãŒã
widget_resourceFactoryWizard_editConfigStepName = ç·šéã®æ§æ
+widget_resourceFactoryWizard_editConfigStep_nothingToDo = ãã®ãªãœãŒã¹ã®ããã«å®çŸ©ãå¿
èŠãªæ§æã¯ååšããŸãã
widget_resourceFactoryWizard_execute1 = æ°èŠãªãœãŒã¹ã®äœæã«å€±æããŸãã - ããã±ãŒãžããŒãžã§ã³ãååšããŸãã
#widget_resourceFactoryWizard_execute2 = Failed to create a new resource. Cannot connect to the agent. This may indicate that the agent is down.
widget_resourceFactoryWizard_failedToDeleteVersion = ãªãœãŒã¹äœæã®ãã£ã³ã»ã«äžã«ããã±ãŒãžããŒãžã§ã³ã®åé€ã«å€±æããŸãã
@@ -2111,6 +2282,7 @@ widget_resourceFactoryWizard_importFailure = æåã§ã®ãªãœãŒã¹ã®ã€ã³
widget_resourceFactoryWizard_importSubmitted = æ°èŠãªãœãŒã¹ã¿ã€ã [{0}] ã®ã€ã³ããŒããªã¯ãšã¹ããéä¿¡ãããŸãã
widget_resourceFactoryWizard_importWizardTitle = ãªãœãŒã¹ã¿ã€ã [{0}] ãã€ã³ããŒã
widget_resourceFactoryWizard_importWizardWindowTitle = ãªãœãŒã¹ã€ã³ããŒããŠã£ã¶ãŒã
+widget_resourceFactoryWizard_infoStepName = ãªãœãŒã¹æ
å ±
widget_resourceFactoryWizard_infoStep_loadFail = ã¢ãŒããã¯ãã£ãŒãå©çšå¯èœã«ããã®ã«å€±æããŸãã
widget_resourceFactoryWizard_namePrompt = æ°èŠãªãœãŒã¹å
#widget_resourceFactoryWizard_nameComment = Not all management plug-ins or their managed resources allow the agent to set the name for a new resource. This value will only be used by agent plug-ins that support the capability. For plug-ins that do not support the capability, the resource may receive a generic or different name when it is discovered.
@@ -2119,6 +2291,7 @@ widget_resourceFactoryWizard_templatePrompt = ã³ãã¯ã·ã§ã³èšå®ãã³ã
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
widget_resourceFactoryWizard_uploadFailure = ãã¡ã€ã«ã¢ããããŒãã®å€±æ
widget_resourceFactoryWizard_uploadFileStepName = ãªãœãŒã¹ã³ã³ãã³ããã¡ã€ã«ã®ã¢ããããŒã
+widget_resourceFactoryWizard_uploadInProgress = ã¢ããããŒãã¯åŠçäžã§ã... 倧ããªãã¡ã€ã«ãé
åžããã«ã¯æ°åãããããšããããŸãã
widget_resourceFactoryWizard_versionPrompt = ããã±ãŒãžããŒãžã§ã³
widget_resourceSelector_groupCategory = ã°ã«ãŒãã«ããŽãª
widget_resourceSelector_pleaseSelectMultipleResource = äžã€ä»¥äžã®ãªãœãŒã¹ãéžæããŠãã ãã
commit 941c86d8d3eb274fd01e852bd3948b2eb74bc0a1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Oct 17 17:29:13 2013 -0400
BZ 1013597 - fix up the help about box
(cherry picked from commit b5aab90cae5a238501935cd0798119c4a180667b)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java
index 014d531..9e37993 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java
@@ -20,20 +20,16 @@ package org.rhq.coregui.client.components;
import com.smartgwt.client.Version;
import com.smartgwt.client.types.Alignment;
-import com.smartgwt.client.types.Overflow;
-import com.smartgwt.client.types.VerticalAlignment;
-import com.smartgwt.client.widgets.HTMLPane;
-import com.smartgwt.client.widgets.Window;
-import com.smartgwt.client.widgets.events.ClickEvent;
-import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.LinkItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.coregui.client.CoreGUI;
+import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.Messages;
-import org.rhq.coregui.client.util.enhanced.EnhancedHLayout;
-import org.rhq.coregui.client.util.enhanced.EnhancedIButton;
-import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
+import org.rhq.coregui.client.PopupWindow;
/**
* The "About RHQ" modal window.
@@ -41,75 +37,70 @@ import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
* @author Ian Springer
* @author Joseph Marques
*/
-public class AboutModalWindow extends Window {
+public class AboutModalWindow extends PopupWindow {
private static final Messages MSG = CoreGUI.getMessages();
- public AboutModalWindow() {
- super();
-
- setWidth(300);
- setHeight(300);
- setOverflow(Overflow.VISIBLE);
- setShowMinimizeButton(false);
- setIsModal(true);
- setShowModalMask(true);
- setCanDragResize(false);
- setCanDragReposition(false);
- setAlign(VerticalAlignment.TOP);
- centerInPage();
+ public AboutModalWindow(ProductInfo productInfo) {
+ super(buildAboutCanvas(productInfo));
+ setTitle(MSG.view_aboutBox_title(productInfo.getFullName()));
+ setHeight(100);
+ setWidth(100);
+ setAutoSize(true);
}
- @Override
- protected void onInit() {
- ProductInfo productInfo = CoreGUI.get().getProductInfo();
+ private static Canvas buildAboutCanvas(ProductInfo productInfo) {
- setTitle(MSG.view_aboutBox_title(productInfo.getFullName()));
+ DynamicForm form = new DynamicForm();
+ form.setPadding(10);
+
+ StaticTextItem logoItem = new StaticTextItem("logo");
+ logoItem.setValue("<img src=\"" + ImageManager.getFullImagePath("header/rhq_logo_28px.png") + "\"/>");
+ logoItem.setHeight(28);
+ logoItem.setShowTitle(false);
+ logoItem.setColSpan(2);
+ logoItem.setWrap(false);
+ logoItem.setWrapTitle(false);
+ logoItem.setAlign(Alignment.CENTER);
+
+ LinkItem productUrl = new LinkItem("url");
+ productUrl.setValue(productInfo.getUrl());
+ productUrl.setLinkTitle(productInfo.getUrl());
+ productUrl.setTitle(productInfo.getFullName());
+ productUrl.setTarget("_blank");
+ productUrl.setWrap(false);
+ productUrl.setWrapTitle(false);
+
+ StaticTextItem version = new StaticTextItem("version", MSG.view_aboutBox_version());
+ version.setValue(productInfo.getVersion());
+ version.setWrap(false);
+ version.setWrapTitle(false);
+
+ StaticTextItem buildNumber = new StaticTextItem("buildnumber", MSG.view_aboutBox_buildNumber());
+ buildNumber.setValue(productInfo.getBuildNumber());
+ buildNumber.setWrap(false);
+ buildNumber.setWrapTitle(false);
+
+ StaticTextItem gwtVersion = new StaticTextItem("gwtversion", "GWT " + MSG.common_title_version());
+ gwtVersion.setValue(MSG.common_buildInfo_gwtVersion());
+ gwtVersion.setWrap(false);
+ gwtVersion.setWrapTitle(false);
+
+ StaticTextItem smartGwtVersion = new StaticTextItem("smartgwtversion", "SmartGWT " + MSG.common_title_version());
+ smartGwtVersion.setValue(Version.getVersion());
+ smartGwtVersion.setWrap(false);
+ smartGwtVersion.setWrapTitle(false);
+
+ StaticTextItem allRightsReserved = new StaticTextItem();
+ allRightsReserved.setValue(MSG.view_aboutBox_allRightsReserved());
+ allRightsReserved.setShowTitle(false);
+ allRightsReserved.setColSpan(2);
+ allRightsReserved.setWrap(false);
+ allRightsReserved.setWrapTitle(false);
+ allRightsReserved.setAlign(Alignment.CENTER);
- EnhancedVLayout contentPane = new EnhancedVLayout();
- contentPane.setPadding(10);
-
- // TODO (ips, 09/06/11): Convert this raw HTML to SmartGWT widgets.
- HTMLPane htmlPane = new HTMLPane();
- String html = "<span class=\"DisplaySubhead\">\n" + " <a href=\"" + productInfo.getUrl() + "\" title=\""
- + productInfo.getFullName() + " " + productInfo.getUrl() + "\" target=\"_blank\">"
- + productInfo.getFullName() + "</a>\n" + "</span><br/>\n" + "<span class=\"DisplayLabel\">"
- + MSG.view_aboutBox_version() + " " + productInfo.getVersion() + "</span><br/>\n"
- + "<span class=\"DisplayLabel\">" + MSG.view_aboutBox_buildNumber() + " " + productInfo.getBuildNumber()
- + "</span><p/>\n" + "<span class=\"DisplayLabel\">GWT " + MSG.common_title_version() + ": "
- + MSG.common_buildInfo_gwtVersion() + "</span><br/>\n" + "<span class=\"DisplayLabel\">SmartGWT "
- + MSG.common_title_version() + ": " + Version.getVersion() + "</span><br/>\n"
- + "<p><a href=\"http://jboss.org/\" title=\"JBoss " + MSG.view_aboutBox_homepage() + "\">\n"
- + " <img height=\"55\" alt=\"" + MSG.view_aboutBox_jbossByRedHat()
- + "\" src=\"/images/jboss_logo.png\">\n" + "</a></p>\n" + "<div style=\"top-margin: 10px\">"
- + MSG.view_aboutBox_allRightsReserved() + "</div>\n";
- htmlPane.setContents(html);
- htmlPane.setHeight(220);
- contentPane.addMember(htmlPane);
-
- EnhancedHLayout buttonBar = new EnhancedHLayout();
- buttonBar.setHeight(30);
- buttonBar.setAlign(Alignment.RIGHT);
-
- EnhancedIButton closeButton = new EnhancedIButton(MSG.common_button_close());
- closeButton.setShowRollOver(true);
- closeButton.setShowDown(true);
- closeButton.setWidth(60);
- closeButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- hide();
- }
- });
- buttonBar.addMember(closeButton);
-
- VLayout bottom = new VLayout();
- bottom.setAlign(VerticalAlignment.BOTTOM);
- bottom.addMember(buttonBar);
- contentPane.addMember(bottom);
-
- // NOTE: Since this is a subclass of Window, we MUST use addItem(), rather than addMember() from the
- // Layout class.
- addItem(contentPane);
+ form.setItems(logoItem, productUrl, version, buildNumber, gwtVersion, smartGwtVersion, allRightsReserved);
+ return form;
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java
index 11b3731..42bc376 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java
@@ -95,8 +95,7 @@ public class HelpView extends AbstractSectionedLeftNavigationView {
NavigationItem aboutItem = new NavigationItem(new ViewName("AboutBox", MSG.view_help_section_product_about()),
"[SKIN]/../actions/help.png", new ViewFactory() {
public Canvas createView() {
- final AboutModalWindow aboutModalWindow = new AboutModalWindow();
- aboutModalWindow.setTitle(MSG.view_aboutBox_title(productInfo.getFullName()));
+ final AboutModalWindow aboutModalWindow = new AboutModalWindow(productInfo);
aboutModalWindow.show();
return aboutModalWindow;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java
index 547eb00..0cc4991 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java
@@ -36,6 +36,8 @@ import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
+import org.rhq.core.domain.common.ProductInfo;
+import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.UserSessionManager;
import org.rhq.coregui.client.admin.AdministrationView;
import org.rhq.coregui.client.bundle.BundleTopView;
@@ -98,7 +100,8 @@ public class MenuBarView extends EnhancedVLayout {
}
private Canvas getLogoSection() {
- final AboutModalWindow aboutModalWindow = new AboutModalWindow();
+ final ProductInfo productInfo = CoreGUI.get().getProductInfo();
+ final AboutModalWindow aboutModalWindow = new AboutModalWindow(productInfo);
HLayout logoSection = new HLayout();
logoSection.setOverflow(Overflow.VISIBLE);
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
index 3470be0..1dd8911 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
@@ -486,12 +486,12 @@ util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subje
util_userSession_logoutFail = Failed to logout.
util_widgetsField_unlimited = Unlimited
view_aboutBox_allRightsReserved = All Rights Reserved.
-view_aboutBox_buildNumber = Build Number:
+view_aboutBox_buildNumber = Build Number
view_aboutBox_failedToLoad = Failed to load product information.
view_aboutBox_homepage = Homepage
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = About {0}
-view_aboutBox_version = Version:
+view_aboutBox_version = Version
view_adminConfig_agentPlugins = Agent Plugins
view_adminConfig_alertDefTemplates = Alert Definition Templates
view_adminConfig_downloads = Downloads
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
index 7d1d9e7..7a305d8 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
@@ -510,12 +510,12 @@ util_userSession_loadFailSubject = UserSessionManager: NepodaÅilo se naÄÃst i
util_userSession_logoutFail = NepodaÅilo se odhlásit.
util_widgetsField_unlimited = NeomezenÄ
view_aboutBox_allRightsReserved = Všechna práva vyhrazena.
-view_aboutBox_buildNumber = ÄÃslo buildu:
+view_aboutBox_buildNumber = ÄÃslo buildu
view_aboutBox_failedToLoad = NepodaÅilo se naÄÃst informace o produktu.
view_aboutBox_homepage = Hlavnà stránka
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = O aplikaci {0}
-view_aboutBox_version = Verze:
+view_aboutBox_version = Verze
view_adminConfig_agentPlugins = Zásuvné moduly agentů
view_adminConfig_alertDefTemplates = Å ablony pro definice vÃœstrah
view_adminConfig_downloads = StaÅŸeno
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
index c456c46..b4c1424 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
@@ -484,12 +484,12 @@ util_userSession_loadFailSubject = UserSessionManager: Konnte das 'Subject' des
util_userSession_logoutFail = Ausloggen fehlgeschlagen
util_widgetsField_unlimited = UnbeschrÀnkt
view_aboutBox_allRightsReserved = Alle Rechte vorbehalten
-view_aboutBox_buildNumber = Build-Nummer:
+view_aboutBox_buildNumber = Build-Nummer
view_aboutBox_failedToLoad = Kann die Produktinformation nicht laden
view_aboutBox_homepage = Homepage
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = Ãber {0}
-view_aboutBox_version = Version:
+view_aboutBox_version = Version
view_adminConfig_agentPlugins = Agent Plugins
view_adminConfig_alertDefTemplates = Vorlagen fÃŒr Alarmdefinitionen
view_adminConfig_downloads = Downloads
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
index f2b4d20..ce9b5a1 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
@@ -59,12 +59,10 @@ common_button_create_child = åãäœæ
common_button_delete = åé€
common_button_delete_all = ãã¹ãŠãåé€
common_button_disable = ç¡å¹
-common_button_dump_sysInfo_to_log = ãã³ãã·ã¹ãã æ
å ±
common_button_edit = ç·šé
common_button_enable = æå¹
common_button_execute = å®è¡
common_button_finish = å®äº
-common_button_fixedWidth = åºå®å¹
common_button_ignore = ç¡èŠ
common_button_import = ã€ã³ããŒã
common_button_new = æ°èŠ
@@ -113,8 +111,6 @@ common_label_day = æ¥
common_label_error = ãšã©ãŒ
common_label_filters = ãã£ã«ã¿ãŒ
common_label_hour = æé
-common_label_item = é
ç®
-common_label_items = é
ç®
common_label_link = ãªã³ã¯
common_label_month = æ
common_label_none = ãªã
@@ -135,15 +131,12 @@ common_msg_deleteConfirm = éžæããã {0} ãåé€ããŠãããããã§
common_msg_deleted = {0} {1} ãåé€ãããŸããã
common_msg_emphasizedNotePrefix = 泚æ:
common_msg_loading = ããŒãäž...
-common_msg_noItemsToShow = 衚瀺ããé
ç®ã¯ãããŸãã
-common_msg_notYetImplemented = å®è£
ãããŠããŸãã
common_msg_see_more = 詳现...
common_msg_step_x_of_y = ã¹ããã {1} äž {0} çªã
##common_msg_typeToFilterResults = å®è£
ãããŠããŸãã
common_severity_debug = ãããã°
common_severity_error = ãšã©ãŒ
common_severity_fatal = èŽåœç
-common_severity_info = æ
å ±
common_severity_warn = èŠå
##common_status_attention = æå
##common_status_avail_disabled = DISABLED
@@ -171,7 +164,6 @@ common_title_add_portlet = ããŒãã¬ããè¿œå
common_title_address = ã¢ãã¬ã¹
common_title_alerts = ã¢ã©ãŒã
common_title_alerts_range = ã¢ã©ãŒãã®ç¯å²
-common_title_ancestry = å
ç¥
common_title_availability = ã¢ãã€ã©ããªãã£
common_title_available_resources = å©çšå¯èœãªãœãŒã¹
common_title_average_metrics = æ¯åã®å¹³åã¡ããªãã¯ã¹
@@ -186,7 +178,6 @@ common_title_compare_metrics = ã¡ããªãã¯ã¹ã®æ¯èŒ
common_title_compatibleGroups = äºæã°ã«ãŒã
common_title_compatibleGroups_total = äºæã°ã«ãŒãã®åèš
common_title_component_errors = ã³ã³ããŒãã³ããšã©ãŒ
-common_title_config_update_status = æŽæ°ç¶æ
common_title_configuration = æ§æ
common_title_count = æ°
common_title_createTime = äœææå»
@@ -209,7 +200,6 @@ common_title_end = çµäº
common_title_generalProp = äžè¬ããããã£
common_title_group = ã°ã«ãŒã
common_title_group_def_total = ã°ã«ãŒãå®çŸ©ã®åèš
-common_title_group_member_health = ã°ã«ãŒãã¡ã³ããŒã®ç¶æ
common_title_groups = ã°ã«ãŒã
##common_title_groupsFound = ã°ã«ãŒã
common_title_help = ãã«ã
@@ -238,7 +228,6 @@ common_title_new_dashboard = æ°èŠããã·ã¥ããŒã
common_title_numeric_metrics = æ°å€ã¡ããªãã¯ã¹
common_title_numeric_type = æ°å€å
common_title_operation = ãªãã¬ãŒã·ã§ã³
-common_title_operation_status = ãªãã¬ãŒã·ã§ã³ã®ç¶æ
common_title_operations = ãªãã¬ãŒã·ã§ã³
common_title_operations_range = ãªãã¬ãŒã·ã§ã³ã®ç¯å²
##common_title_over = Over
@@ -364,7 +353,6 @@ dataSource_configurationHistory_updateType = æŽæ°ã¿ã€ã
dataSource_configurationHistory_updateType_group = ã°ã«ãŒã
dataSource_configurationHistory_updateType_individual = å人
dataSource_definitions_loadFailed = ã¡ããªãã¯å®çŸ©ã®ããŒãã«å€±æããŸãã
-dataSource_measurementOob_error_fetchFailure = ç¯å²å€æ
å ±ã®æž¬å®ã®ããŒãã«å€±æããŸãã
dataSource_measurementOob_field_factor = ç¯å²å€ä¿æ° (%)
dataSource_measurementOob_field_formattedBaseband = ãã³ã
dataSource_measurementOob_field_formattedOutlier = ã¢ãŠãã©ã€ããŒ
@@ -375,7 +363,6 @@ dataSource_operationHistory_error_fetchFailure = ãªãã¬ãŒã·ã§ã³å±¥æŽã®
dataSource_operationHistory_field_createdTime = äœææå»
dataSource_operationHistory_field_operationName = ãªãã¬ãŒã·ã§ã³å
dataSource_operationHistory_field_startedTime = éå§æå»
-dataSource_operationHistory_field_subject = èŠæ±è
dataSource_operationSchedule_field_description = ããŒã
dataSource_operationSchedule_field_id = ã¹ã±ãžã¥ãŒã«ID
dataSource_operationSchedule_field_nextFireTime = 次åã®å®è¡
@@ -405,10 +392,8 @@ dataSource_resources_field_discoveryTime = çºèŠæå»
dataSource_resources_field_importTime = ã€ã³ããŒãæå»
dataSource_resources_field_key = ããŒ
dataSource_resources_field_lastModifiedTime = æçµæŽæ°æå»
-dataSource_resources_field_lastModifier = æçµæŽæ°è
dataSource_resources_field_location = å Žæ
dataSource_rpc_error_transformRequestFailure = {0} ãªã¯ãšã¹ãã®åŠçäžã«ããŒã¿ãœãŒã¹ã§å€±æããŸãã
-dataSource_rpc_error_unsupportedArrayFilterType = ã¿ã€ã {0} ã®é
åãã£ã«ã¿ã®åŒãæž¡ãã¯ãµããŒãããŠããŸãã
dataSource_rpc_error_unsupportedEnumType = RPCDataSource.getEnumArray(Class)ãž enum {0} ã®ããã®é©åãªã³ãŒããããã¯ãè¿œå ããŠãã ãã
dataSource_rpc_no = ããã
dataSource_rpc_yes = ã¯ã
@@ -466,18 +451,13 @@ datasource_templateSchedules_enabled_failed = ID [{2}] ãæã€ãªãœãŒã¹ã¿
datasource_templateSchedules_updated = éžæãããã¡ããªã㯠[{0}] ã®åéééãæŽæ°ããŸãã
datasource_templateSchedules_updated_detail = ID [{2}] ãæã€ãªãœãŒã¹ã¿ã€ãã®ããã«ããã©ã«ãã§ã¡ããªã㯠[{0}] [{1}] ã®åéééã [{3}] ç§ã«èšå®ãããŸãã
datasource_templateSchedules_updated_failed = ID [{2}] ãæã€ãªãœãŒã¹ã¿ã€ãã®ããã«ããã©ã«ãã§ã¡ããªã㯠[{0}] [{1}] ã®åéééã [{3}] ç§ã«èšå®ããã®ã«å€±æããŸãã
-favorites = ãæ°ã«å
¥ã
-favorites_groups = ãæ°ã«å
¥ãã°ã«ãŒã
favorites_recentlyViewed = æè¿é²èŠ§ãã
-favorites_resources = ãæ°ã«å
¥ããªãœãŒã¹
filter_from_date = éå§
filter_to_date = çµäº
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {1} ã®äžã® {0} ã°ã«ãŒãã¡ã³ããŒã ''{2}'' ãªãœãŒã¹ãæã£ãŠããŸã
-util_ancestry_parentAncestry = 芪ã®å
ç¥ :
util_disambiguationReportDecorator_pluginSuffix = ({0} ãã©ã°ã€ã³)
util_errorHandler_nullException = äŸå€ã¯ null ã§ãã
-util_monitoringRequestCallback_error_checkServerStatusFailure = ãã°ã€ã³ã®ç¶æ
ã決å®ã§ããŸãã - ãµãŒããŒã®ç¶æ
ã調ã¹ãŠãã ãã
util_rpcManager_activeRequests = {0} ã¢ã¯ãã£ããªã¯ãšã¹ã
##util_userPerm_loadFailBundle = Failed to load your permissions for Bundle with id [{0}] - none granted.
util_userPerm_loadFailGlobal = ã°ããŒãã«ãªæš©éãããŒãããã®ã«å€±æããŸãã - äœãèš±å¯ãããŸãã
@@ -487,12 +467,11 @@ util_userSession_loadFailSubject = UserSessionManager: ãŠãŒã¶ãŒ Subject ã®
util_userSession_logoutFail = ãã°ã¢ãŠãã«å€±æããŸãã
util_widgetsField_unlimited = ç¡å¶é
view_aboutBox_allRightsReserved = All Rights Reserved.
-view_aboutBox_buildNumber = ãã«ãçªå·:
-view_aboutBox_failedToLoad = ãããã¯ãæ
å ±ã®ããŒãã«å€±æããŸãã
+view_aboutBox_buildNumber = ãã«ãçªå·
view_aboutBox_homepage = ããŒã ããŒãž
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = {0}ã«ã€ããŠ
-view_aboutBox_version = ããŒãžã§ã³:
+view_aboutBox_version = ããŒãžã§ã³
view_adminConfig_agentPlugins = ãšãŒãžã§ã³ããã©ã°ã€ã³
view_adminConfig_alertDefTemplates = ãšãŒãžã§ã³ãå®çŸ©ãã³ãã¬ãŒã
view_adminConfig_downloads = ããŠã³ããŒã
@@ -741,27 +720,19 @@ view_admin_downloads_agentDownload = ãšãŒãžã§ã³ãã®ããŠã³ããŒã
view_admin_downloads_agent_buildNumber = ãšãŒãžã§ã³ããã«ã
view_admin_downloads_agent_help = <p> ãã㯠{0} Agentã®æŽæ°ãã€ããªJARãã¡ã€ã«ã§ãããã®JARãã¡ã€ã«ã®ç®çã¯ãŠãŒã¶ãŒããšãŒãžã§ã³ãããŸã ååšããªããã·ã³äžã«æ°ãããšãŒãžã§ã³ããã€ã³ã¹ããŒã«ã§ããããã«ããããšãšããã§ã«ã€ã³ã¹ããŒã«æžã¿ã®ãšãŒãžã§ã³ããæŽæ°ã§ããããã«ããããã§ãã詳现ã¯ããã®ãšãŒãžã§ã³ãããŠã³ããŒãJARã§æ¬¡ã®ããã«--helpã³ãã³ãã©ã€ã³ãªãã·ã§ã³ãã€ããŠå®è¡ããŠãã ããã<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«</h3> <p> <b>java -jar <agent-download.jar> --install[=<æ°ãããšãŒãžã§ã³ããã£ã¬ã¯ããª>]</b><br/> ãã®ã³ãã³ãã¯æ°ãããšãŒãžã§ã³ããã€ã³ã¹ããŒã«ããŸããããæ°ãããã£ã¬ã¯ããªãæå®ããªããã°ãããã©ã«ãã¯"."ãšãªããŸãã</p> <h3>ãšãŒãžã§ã³ãã®
æŽæ°</h3> <p> <b>java -jar <agent-download.jar> --update[=<å€ããšãŒãžã§ã³ããã£ã¬ã¯ããª>]</b><br/> ããã¯ãã§ã«ã€ã³ã¹ããŒã«ãããæ¢åã®ãšãŒãžã§ã³ããæŽæ°ããŸããããå€ããæ¢åã®ãšãŒãžã§ã³ããã€ã³ã¹ããŒã«ããããã£ã¬ã¯ããªãæå®ããªãã£ããªãã"rhq-agent"ãä»®å®ãããŸãã</p>
view_admin_downloads_agent_link_value = ãšãŒãžã§ã³ã {0} ({1}) ã®ããŠã³ããŒã
-view_admin_downloads_agent_loadError = ãšãŒãžã§ã³ãããŒãžã§ã³æ
å ±ãååŸã§ããŸãã
view_admin_downloads_agent_md5 = ãšãŒãžã§ã³ã MD5
view_admin_downloads_agent_version = ãšãŒãžã§ã³ãããŒãžã§ã³
view_admin_downloads_bundleDownload = ãã³ãã«ãããã€ã€ã®ããŠã³ããŒã
-view_admin_downloads_bundle_help = <p> ããã¯ãã³ãã«ãããã€ã€ããŒã«ã§ã{0}ãã³ãã«ã®éçºè
ãšããã±ãŒãžéçºè
ã«ãã£ãŠäœ¿ãããŸãããã®ã¹ã¿ã³ãã¢ãã³ããŒã«ã䜿ããšãã³ãã«ãã³ã³ãœãŒã«ããã®ã¬ã·ãããã¹ãã§ããããã«ããŸãã</p>
view_admin_downloads_bundle_link_value = ãã³ãã«ãããã€ã€ãŒ {0} ãããŠã³ããŒã
-view_admin_downloads_bundle_loadError = ãã³ãã«ãããã€ã€ãŒæ
å ±ãååŸã§ããŸãã
view_admin_downloads_cliAlertScriptsDownload = CLIã¢ã©ãŒãã¹ã¯ãªããã®ããŠã³ããŒã
-view_admin_downloads_cliAlertScripts_help = CLIã¢ã©ãŒãã¹ã¯ãªããã¯ã¹ã¯ãªããåãããã¢ã©ãŒãéç¥ãäœæããããã«äœ¿ãããšãã§ããäœææžã¿ã®ã¹ã¯ãªããã§ããéåžžããã®ã¹ã¯ãªããã¯ç¹å®ã®ã¢ã©ãŒãå®çŸ©ã«ã€ããŠã®éç¥ãšããŠäœ¿ãããã«ã¯åãã£ãŠåŸ®èª¿æŽãããå¿
èŠããããŸãã
view_admin_downloads_cliAlertScripts_loadError = ããŠã³ããŒãããããã«å©çšå¯èœãªCLIã¢ã©ãŒãã¹ã¯ãªããã«ã¢ã¯ã»ã¹ããããšãã§ããŸãã
view_admin_downloads_cliAlertScripts_none = ããŠã³ããŒãããããã«å©çšå¯èœãªCLIã¹ã¯ãªãããäžã€ãååšããŸãã
view_admin_downloads_cliDownload = ã³ãã³ãã©ã€ã³ã¯ã©ã€ã¢ã³ãã®ããŠã³ããŒã
view_admin_downloads_cli_buildNumber = CLIãã«ã
-view_admin_downloads_cli_help = <p> ããã¯ã³ãã³ãã©ã€ã³ããŒã«ã§ãCLIãšããŠç¥ãããŠãããã®ã§ããã³ã³ãœãŒã«ããå®è¡ããã¹ã¿ã³ãã¢ãã³ããŒã«ã§ã{0}ãµãŒããŒã«å¯ŸããŠã³ãã³ãã©ã€ã³ã€ã³ã¿ãã§ãŒã¹ãæäŸããŸããèªååãããã¿ã¹ã¯ãå®è¡ããããã«CLIãrunã¹ã¯ãªãããä»ããŠã³ãã³ããåŒã³åºãããšãå¯èœã§ããCLIã®ã€ã³ã¹ããŒã«æ¹æ³ãšäœ¿ãæ¹ã«ã€ããŠã®è©³çŽ°æ
å ±ã¯ããã¥ã¡ã³ããã芧ãã ããã</p>
view_admin_downloads_cli_link_value = CLI {0} ({1}) ãããŠã³ããŒã
-view_admin_downloads_cli_loadError = CLIããŒãžã§ã³æ
å ±ãååŸã§ããŸãã
view_admin_downloads_cli_md5 = CLI MD5
view_admin_downloads_cli_version = CLIããŒãžã§ã³
view_admin_downloads_connectorsDownload = ã³ãã¯ã¿ã®ããŠã³ããŒã
-view_admin_downloads_connectors_help = ã³ãã¯ã¿ãŒã¯è£œåã{0}ã«ãã£ãŠç®¡çå¯èœã§ããããã«å¿
èŠãšãªããœãããŠã§ã¢ã§ããRHQãšãŒãžã§ã³ããéä¿¡ã§ããããã«ã管ç補åã«ã³ãã¯ã¿ãŒãã€ã³ã¹ããŒã«ããŸãã詳现ã¯ããã¥ã¡ã³ããã芧ãã ããã
-view_admin_downloads_connectors_loadError = ã³ãã¯ã¿ãŒæ
å ±ãååŸã§ããŸãã
view_admin_downloads_connectors_none = ããŠã³ããŒãã®ããã®ã³ãã¯ã¿ãŒãèŠã€ãããŸãã
##view_admin_downloads_scriptModulesDownload = Script Modules Download
##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
@@ -787,7 +758,6 @@ view_admin_plugins_enabledServerPluginsFailure = ãµãŒããŒãã©ã°ã€ã³ã®
view_admin_plugins_hideDeleted = åé€æžã¿ãé ã
view_admin_plugins_hideUndeployed = ã¢ã³ãããã€ãé ã
view_admin_plugins_loadFailure = ãã©ã°ã€ã³ããŒã¿ãããŒãããã®ã«å€±æããŸãã
-view_admin_plugins_purgedAgentPlugins = ãšãŒãžã§ã³ããã©ã°ã€ã³ {0} ãããŒãžããããã®æºåãããŠããŸããããã¯æ°åããããããããŸããããªããªãããã®ãã©ã°ã€ã³ããã®ãã¹ãŠã®ã¿ã€ãå®çŸ©ã¯æåã«ã·ã¹ãã ããããŒãžãããªããã°ãªããªãããã§ãããããã®ãã©ã°ã€ã³ã¯ããŒãžããããŸã§ã®éãã®ããŒãžã§èŠãç¶ããŸããããŒãžãå®è¡äžã¯ãã®ãã©ã°ã€ã³ãåã€ã³ã¹ããŒã«ããŠã¯ãããªãããšã«çæããŠãã ããããããªããã°ã倱æããããšã§ãããããããã£ãŠããã®ããŒãžãå®äºãããŸã§ã·ã¹ãã ãžãã©ã°ã€ã³ã®åã€ã³ã¹ããŒã«ããåŸ
ã¡ãã ããã
view_admin_plugins_purgedAgentPluginsFailure = ãšãŒãžã§ã³ããã©ã°ã€ã³ã®ããŒãžã«å€±æããŸãã
view_admin_plugins_purgedServerPlugins = ããŒãžããããµãŒããŒãã©ã°ã€ã³: {0}.
view_admin_plugins_purgedServerPluginsFailure = ãµãŒããŒãã©ã°ã€ã³ã®ããŒãžã«å€±æããŸãã
@@ -800,11 +770,9 @@ view_admin_plugins_scanComplete = æŽæ°ããããã©ã°ã€ã³ã®ããã®ã¹
view_admin_plugins_scanFailure = æŽæ°ããããã©ã°ã€ã³ã®ããã®ã¹ãã£ã³ã倱æããŸãã
view_admin_plugins_server = ãµãŒããŒ
view_admin_plugins_serverConfig = ãã©ã°ã€ã³æ§æ
-view_admin_plugins_serverConfig_badSettings = æ£ããèšå®ãå
¥åããŠãã ãã
view_admin_plugins_serverConfig_saveFailed = èšå®ã®ä¿åã«å€±æããŸãã
view_admin_plugins_serverConfig_settingsSaved = èšå®ãä¿åãããŸãã
view_admin_plugins_serverControls = ã³ã³ãããŒã«
-view_admin_plugins_serverControls_badParams = æ£ãããã©ã¡ãŒã¿ãŒãå
¥åããŠãã ãã
view_admin_plugins_serverControls_clickForError = ãšã©ãŒã¡ãã»ãŒãžãã¯ãªãã¯ããŠãã ãã
view_admin_plugins_serverControls_invokeFailure = ã³ã³ãããŒã«ã®åŒã³åºãã«å€±æããŸãã
view_admin_plugins_serverControls_name = ã³ã³ãããŒã«
@@ -842,7 +810,6 @@ view_admin_systemSettings_DriftFilePurge_desc = ããã¯ãšã³ãããããŒ
view_admin_systemSettings_DriftFilePurge_name = æªäœ¿çšããªãããã¡ã€ã«ã®åé€
view_admin_systemSettings_EnableAgentAutoUpdate_desc = ãµãŒããŒããšãŒãžã§ã³ããèªåæŽæ°ããããšãèš±ããã©ããã決å®ããŸãããããããç¡å¹ã«ãããŠããã®ã§ããã°ããµãŒããŒãããšãŒãžã§ã³ãã®ãã£ã¹ããªãã¥ãŒã·ã§ã³ãããŠã³ããŒãããããšã¯ã§ããŸããã
view_admin_systemSettings_EnableAgentAutoUpdate_name = ãšãŒãžã§ã³ãã®èªåæŽæ°ãæå¹ã«ãã
-view_admin_systemSettings_EnableDebugMode_desc = æå¹ã§ããã°ããµãŒããŒã¯ãããã°ã¢ãŒãã«å
¥ããŸã
view_admin_systemSettings_EnableDebugMode_name = ãããã°ã¢ãŒããæå¹ã«ãã
view_admin_systemSettings_EnableExperimentalFeatures_desc = æå¹ã§ããã°ãçŸåšã®è£œåã«å«ãŸããä»»æã®å®éšçæ©èœãå©çšå¯èœã«ãªããŸã
view_admin_systemSettings_EnableExperimentalFeatures_name = å®éšçæ©èœãæå¹ã«ãã
@@ -852,7 +819,6 @@ view_admin_systemSettings_JAASProvider_desc = ãŠãŒã¶ãŒIDã決å®ããã®
view_admin_systemSettings_JAASProvider_name = LDAPã®æå¹å
view_admin_systemSettings_LDAPBaseDN_desc = ãŠãŒã¶èªèšŒã®éã«ãŠãŒã¶ãŒåãšãã¹ã¯ãŒããæ€çŽ¢ãããã£ã¬ã¯ããªããªãŒã®ããŒã¹ãäŸ: ou=People,dc=redhat,dc=com
view_admin_systemSettings_LDAPBaseDN_name = ãµãŒãããŒã¹
-view_admin_systemSettings_LDAPBindDN_desc = LDAPãŠãŒã¶ãŒããŒã¿ããŒã¹ã®åãåããæã«LDAPãµãŒããŒã«æ¥ç¶ããããã®ãŠãŒã¶ãŒåãããã¯æ®éã¯ãããŒãžã£ãŒãŠãŒã¶ãŒã®å®å
šãªLDAPèå¥å (DN) ã«ãªããäŸ: cn=Manager,dc=redhat,dc=com
view_admin_systemSettings_LDAPBindDN_name = ãŠãŒã¶ãŒå
view_admin_systemSettings_LDAPBindPW_desc = LDAPãŠãŒã¶ãŒããŒã¿ããŒã¹ã®åãåããæã«LDAPãµãŒããŒã«æ¥ç¶ããããã®ãŠãŒã¶ãŒã®ã¯ã¬ãã³ã·ã£ã«
view_admin_systemSettings_LDAPBindPW_name = ãã¹ã¯ãŒã
@@ -882,7 +848,6 @@ view_admin_systemSettings_fixBeforeSaving = ä¿ååã«ç¡å¹ãªå€ãä¿®æ£ã
view_admin_systemSettings_group_baseline = èªåããŒã¹ã©ã€ã³æ§æããããã£
view_admin_systemSettings_group_dataMgr = ããŒã¿ãããŒãžã£ãŒæ§æããããã£
view_admin_systemSettings_group_drift = ããªãããµãŒããŒæ§æèšå®
-view_admin_systemSettings_group_general = å
šäœæ§æããããã£
view_admin_systemSettings_group_ldap = LDAPæ§æããããã£
view_admin_systemSettings_saveFailure = ã·ã¹ãã èšå®ã®ä¿åã«å€±æããŸãã
view_admin_systemSettings_savedSettings = ã·ã¹ãã ããããã£ã®ä¿åã«æåããŸãã
@@ -901,7 +866,6 @@ view_admin_systemSettings_serverDetails_tz = ãµãŒããŒã¿ã€ã ãŸãŒã³
view_admin_topology = ããããžãŒ
view_alert_common_tab_conditions = æ¡ä»¶
view_alert_common_tab_conditions_expression = ã¢ã©ãŒãçºç«
-view_alert_common_tab_conditions_expression_tooltip = å
šäœã®æ¡ä»¶ãtrueã§ãããšèªããããããã«ãæ¡ä»¶ã®äžéšãŸãã¯ãã¹ãŠãtrueãšè©äŸ¡ãããªããã°ãªããªããã©ãã決å®ããŸã
##view_alert_common_tab_conditions_modalEdit_title = Edit Condition
view_alert_common_tab_conditions_modal_title = æ¡ä»¶è¿œå
view_alert_common_tab_conditions_recovery_disabled = ãã®ã¢ã©ãŒãã¯ãã®ã¢ã©ãŒãå®çŸ©ãç¡å¹åãããåå ãšãªããŸãã
@@ -923,7 +887,6 @@ view_alert_common_tab_conditions_type_metric_calltime_change_verb = å°ãªããš
view_alert_common_tab_conditions_type_metric_calltime_delta_grows = äžæ
view_alert_common_tab_conditions_type_metric_calltime_delta_other = å€å
view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = çž®å°
-view_alert_common_tab_conditions_type_metric_calltime_destination = åŒã³åºãã®å®å
ãäžèŽ
view_alert_common_tab_conditions_type_metric_calltime_threshold = åŒã³åºãæéã®éŸå€
view_alert_common_tab_conditions_type_metric_change = ã¡ããªãã¯å€ã®å€æ
view_alert_common_tab_conditions_type_metric_range_inside_exclusive = ã¡ããªãã¯å€ã®ç¯å² [{0}] : [{1}] ãš [{2}] ã®é (å¢çå€ãå«ãŸãªã)
@@ -940,7 +903,6 @@ view_alert_common_tab_dampening = æžè¡°
view_alert_common_tab_dampening_category_consecutive_count = é£ç¶
view_alert_common_tab_dampening_category_consecutive_count_tooltip = æ¡ä»¶èšå®ãXåé£ç¶ããŠtrueã§ããã°ã¢ã©ãŒããåŒãèµ·ããããŸãã
view_alert_common_tab_dampening_category_duration_count = æééé
-view_alert_common_tab_dampening_category_duration_count_tooltip = ã¢ã©ãŒãã¯äžããããæéå
ã§æ¡ä»¶èšå®ãtrueã§ããããšãXåçºçãããã³ã«åŒãèµ·ããããŸã
view_alert_common_tab_dampening_category_none = ãªã
view_alert_common_tab_dampening_category_none_tooltip = æžè¡°ã¯ç¡å¹åãããŠããŸãããã®æ¡ä»¶ãtrueã«ãªããã³ã«ãã¢ã©ãŒããåŒãèµ·ããããŸãã
view_alert_common_tab_dampening_category_partial_count = çŽè¿ã®Nåã®è©äŸ¡
@@ -948,7 +910,6 @@ view_alert_common_tab_dampening_category_partial_count_tooltip = ã¢ã©ãŒãã¯
view_alert_common_tab_dampening_consecutive_occurrences_label = çºç
view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip = ã¢ã©ãŒããåŒãèµ·ããããåã«æ¡ä»¶èšå®ãé£ç¶ããŠtrueã§ãªãããã°ãªããªãåæ°
view_alert_common_tab_dampening_duration_occurrences_label = çºç
-view_alert_common_tab_dampening_duration_occurrences_label_tooltip = ã¢ã©ãŒããåŒãèµ·ããããåã«äžããããæéå
ã§æ¡ä»¶èšå®ãé£ç¶ããŠtrueã§ãªãããã°ãªããªãåæ°
view_alert_common_tab_dampening_duration_period_label = æééé
view_alert_common_tab_dampening_duration_period_label_tooltip = äžããããçºçåæ°ãtrueã§ãããã©ããã調ã¹ãããã«æ¡ä»¶èšå®ããã¹ããããã¿ã€ã ã¹ãã³
view_alert_common_tab_dampening_partial_evalatuions_label = è©äŸ¡
@@ -966,9 +927,6 @@ view_alert_common_tab_notifications_status = ã¹ããŒã¿ã¹
view_alert_common_tab_recovery = ãªã«ããª
view_alert_definition_condition_editor_availabilityDuration = ã¢ãã€ã©ããªãã£éé
##view_alert_definition_condition_editor_availabilityDuration_state = Availability State
-view_alert_definition_condition_editor_availabilityDuration_tooltip = ã¢ãã€ã©ããªãã£ã®æ¡ä»¶ãããªã¬ãŒããããã«ä¿åãããŠããªããã°ãªããªãã¢ãã€ã©ããªãã£ç¶æ
ã®å€åãšééãæå®ããŸãããã®ééã¯ååäœã§æå®ãããŸãããšãŒãžã§ã³ããã¢ãã€ã©ããªãã£ç¶æ
ã®å€æŽãæ€åºããŠåé¡ãä¿®æ£ã§ããããã«ããããã«ã¯ããšãŒãžã§ã³ãã«æå®ããæéãšããŠã¯ãæ°åãšããé·ãã§ååã§ãã
-view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = ã¢ãã€ã©ããªãã£ã®æ¡ä»¶ãæºããããã«ãªãœãŒã¹ãæå®ãããã¢ãã€ã©ããªãã£ã«ãªãå¿
èŠãããæéã®é·ãïŒå)ã§ãã
-view_alert_definition_condition_editor_availability_tooltip = æ¡ä»¶ã®ããªã¬ãŒãšãªãã¢ãã€ã©ããªãã£ç¶æ
ã®å€åãæå®ããŸã
view_alert_definition_condition_editor_common_avg = å¹³å
##view_alert_definition_condition_editor_common_baseUnits = Base Units
##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units:
@@ -984,14 +942,11 @@ view_alert_definition_condition_editor_drift_pathname_regex_tooltip = ããæ
view_alert_definition_condition_editor_drift_tooltip = ãã®æ¡ä»¶ã¯ããªãããæ€åºããããšããããªã¬ãŒã«ãªããŸãã
view_alert_definition_condition_editor_event_regexTooltip = ããæå®ããããªããããã¯æ£èŠè¡šçŸã§ããããã®æ¡ä»¶ãåŒãèµ·ããããã«åéãããã€ãã³ãã¡ãã»ãŒãžã«äžèŽããªããã°ãªããŸããã
view_alert_definition_condition_editor_event_severity = ã€ãã³ãé倧床
-view_alert_definition_condition_editor_event_tooltip = ãã®æ¡ä»¶ãåŒãèµ·ããããã«ã€ãã³ãã¡ãã»ãŒãžãå ±åãããå¿
èŠãããã€ãã³ãé倧床ãæå®ããŸãããããªãã·ã§ã³ãšãªãæ£èŠè¡šçŸãæå®ãããªããã€ãã³ãã¡ãã»ãŒãžã¯ãã®æ¡ä»¶ãåŒãèµ·ããããããã«ã€ãã³ãã¡ãã»ãŒãžãæ£èŠè¡šçŸã«äžèŽããªããã°ãªããŸããã
view_alert_definition_condition_editor_metric_baseline_percentage = ããŒã¹ã©ã€ã³ããŒã»ã³ããŒãž
view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = éžæãããæ¯èŒæŒç®åã䜿çšããŠéžæãããããŒã¹ã©ã€ã³å€ã®ããŒã»ã³ããŒãžãæ¯èŒãããšãã«åéãããã¡ããªãã¯å€ã¯ãã®æ¡ä»¶ãåŒãèµ·ãããŸãã
-view_alert_definition_condition_editor_metric_baseline_tooltip = æ¡ä»¶ãåŒãèµ·ããããã«éåãããããšãå¿
èŠãšãªãããŒã¹ã©ã€ã³å€ãæå®ããŸããæå®ããå€ã¯ãäžããããããŒã¹ã©ã€ã³å€ã®ããŒã»ã³ããŒãžã«ãªããŸãã
view_alert_definition_condition_editor_metric_baseline_value = ããŒã¹ã©ã€ã³
view_alert_definition_condition_editor_metric_calltime_change_percentage = ããŒã»ã³ããŒãžã®å€å
view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip = å°ãªããšãéžæãããåŒã³åºãæéãªãããå€ã®ããŒã»ã³ããŒãžãšç°ãªããšããåéãããåŒã³åºãæéã¯ãã®æ¡ä»¶ãåŒãèµ·ãããŸã
-view_alert_definition_condition_editor_metric_calltime_change_tooltip = æ¡ä»¶ãåŒãèµ·ãããå°ãªããšãæå®ãããéã®å€åãèµ·ãã£ããšãã®ãåŒã³åºãå€ãæå®ããŸãã(æå°ãæ倧ãå¹³åã®åŒã³åºãæéã®å€)ããã§ãã¯ããããã®åŒã³åºãæéã®ãªãããã®çš®å¥ãšçºçã«å¿
èŠãªå€åã®ããŒã»ã³ããŒãžãæå®ããªããã°ãªããŸããã
view_alert_definition_condition_editor_metric_calltime_common_comparator = ã³ã³ãã¬ãŒã¿
view_alert_definition_condition_editor_metric_calltime_common_comparator_changes = å€å
view_alert_definition_condition_editor_metric_calltime_common_comparator_grows = å¢å€§
@@ -1000,19 +955,14 @@ view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip
view_alert_definition_condition_editor_metric_calltime_common_limit = åŒã³åºãæéå¶é
view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip = äžããããå€ãšæ¯èŒãããã¹ãåŒã³åºãæéãªãããã®å€
view_alert_definition_condition_editor_metric_calltime_common_name = åŒã³åºãæéã¡ããªãã¯
-view_alert_definition_condition_editor_metric_calltime_regexTooltip = ããæå®ããããªããããã¯æ£èŠè¡šçŸã§ãããæ¡ä»¶ãåŒãèµ·ããããã«åŒã³åºãã®å®å
ãšäžèŽããå¿
èŠããããŸã
view_alert_definition_condition_editor_metric_calltime_threshold_tooltip = éåãããšãã«æ¡ä»¶ãåŒãèµ·ããåŒã³åºãæéã®éŸå€ãæå®ããŸããæå®ããå€ã¯ãªãã·ã§ã³ã®åäœã䌎ã絶察å€ã«ãªããŸãã(æå°ãæ倧ãå¹³åã®åŒã³åºãæéã®å€)ãšå€ãæ¯èŒããããåŒã³åºãæéã®ãªãããã®çš®å¥ãæå®ããªããã°ãªããŸããã
view_alert_definition_condition_editor_metric_calltime_threshold_value = åŒã³åºãæéã®å€
view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = éžæãããæ¯èŒå(comparator)ã䜿ã£ãŠæ¯èŒãããšãæ¡ä»¶ãåŒãèµ·ããããã¡ããªãã¯ã®éŸå€
view_alert_definition_condition_editor_metric_change_tooltip = æ¡ä»¶ãåŒãèµ·ããããã«å€æŽããªããã°ãªããªãå€ãæã€ã¡ããªãã¯ãæå®ããŸã
view_alert_definition_condition_editor_metric_common_definition_not_found = ã¡ããªãã¯å®çŸ©ãèŠã€ããã¹ãã§ã - äœããããããã§ã
-view_alert_definition_condition_editor_metric_nometrics = ãã¹ãŠãé£çµããŠäœ¿ããšããè€æ°æ¡ä»¶å
ã«åãã¡ããªãã¯ã䜿ãããšã¯ã§ããŸããããã®èŠåã¯çŸåšã®æ¡ä»¶å
ã§ã®ãã¹ãŠã®å©çšå¯èœãªã¡ããªãã¯ã¹ã䜿ããŸãã
view_alert_definition_condition_editor_metric_range_comparator = æ¯èŒæŒç®å
-view_alert_definition_condition_editor_metric_range_comparator_inside_exclusive = å
éšã§ãå¢çå€ãå«ãŸãªã
-view_alert_definition_condition_editor_metric_range_comparator_inside_inclusive = å
éšã§ãå¢çå€ãå«ã
view_alert_definition_condition_editor_metric_range_comparator_outside_exclusive = å€éšã§ã å¢çå€ãå«ãŸãªã
view_alert_definition_condition_editor_metric_range_comparator_outside_inclusive = å€éšã§ã å¢çå€ãå«ã
-view_alert_definition_condition_editor_metric_range_comparator_tooltip = ã¡ããªãã¯å€ããç¯å²å
ãç¯å²å€ã®ãšãããã®æ¡ä»¶ã®ããªã¬ãŒã«ãªããã©ããã決å®ããŸãã
view_alert_definition_condition_editor_metric_range_hivalue = é«å€
view_alert_definition_condition_editor_metric_range_hivalue_tooltip = ç¯å²ã§ã®é«å€ã®éŸå€
view_alert_definition_condition_editor_metric_range_lovalue = äœå€
@@ -1033,12 +983,9 @@ view_alert_definition_condition_editor_metric_trait_change_value = ãã¬ã€ã
view_alert_definition_condition_editor_metricswarning = ãã¹ãŠã®é£çµã䜿ããšãã¯åãã¡ããªãã¯ã䜿ãè€æ°ã®æ¡ä»¶ãæå®ããããšã¯ã§ããŸããããã®èŠåå®çŸ©ã¯ãã®ã¡ããªã㯠[{0}] ã䜿ãè€æ°ã®æ¡ä»¶ãæã¡ãŸãã
view_alert_definition_condition_editor_operation_status = ãªãã¬ãŒã·ã§ã³ã¹ããŒã¿ã¹
view_alert_definition_condition_editor_operation_tooltip = æ¡ä»¶ãåŒãèµ·ããããã«éžæããããå®è¡ããããšãçºçããªããã°ãªããªãçµæãæå®ããŸã
-view_alert_definition_condition_editor_operator_availability_durationDown = åæ¢äžã®ç¶æ
-view_alert_definition_condition_editor_operator_availability_durationNotUp = èµ·åããªãç¶æ
view_alert_definition_condition_editor_operator_availability_goesDisabled = ç¡å¹åã«ãªã
view_alert_definition_condition_editor_operator_availability_goesDown = åæ¢ãã
view_alert_definition_condition_editor_operator_availability_goesNotUp = èµ·åããªã
-view_alert_definition_condition_editor_operator_availability_goesUnknown = äžæãªç¶æ
ã«ãªã
view_alert_definition_condition_editor_operator_availability_goesUp = èµ·åãã
view_alert_definition_condition_editor_option_availability = ã¢ãã€ã©ããªãã£ã®å€å
view_alert_definition_condition_editor_option_drift = ããªããã®æ€åº
@@ -1073,12 +1020,7 @@ view_alert_definition_notification_editor_delete_confirm = éžæãããã¢ã©
view_alert_definition_notification_editor_field_configuration = æ§æ
view_alert_definition_notification_editor_field_configuration_loadFailed = éç¥æ§æãã¬ãã¥ãŒã®ååŸã«å€±æããŸãã
view_alert_definition_notification_editor_field_configuration_not_loaded = æªç¥
-view_alert_definition_notification_editor_field_sender = éä¿¡è
-view_alert_definition_notification_editor_loadFailed = ã¢ã©ãŒãéä¿¡è
ãååŸã§ããŸãã
-view_alert_definition_notification_editor_loadFailed_single = ã¢ã©ãŒãéä¿¡è
æ§æå®çŸ©ãååŸã§ããŸãã
-view_alert_definition_notification_editor_none_available = ã¢ã©ãŒãéä¿¡è
ãå©çšã§ããŸãã
view_alert_definition_notification_editor_saveFailed = éç¥ã®æ§æãä¿åã§ããŸãã
-view_alert_definition_notification_editor_sender = éç¥éä¿¡è
view_alert_definition_notification_editor_title_add = éç¥ã®è¿œå
view_alert_definition_notification_editor_title_edit = éç¥ã®ç·šé
view_alert_definition_notification_operation_editor_common_operation = ãªãã¬ãŒã·ã§ã³
@@ -1090,11 +1032,7 @@ view_alert_definition_notification_operation_editor_mode_unknown = æªç¥ã®ãª
view_alert_definition_notification_operation_editor_operations_loadFailed = å©çšå¯èœãªãªãã¬ãŒã·ã§ã³ã®ãªã¹ããããŒãããã®ã«å€±æããŸãã
view_alert_definition_notification_operation_editor_operations_no_parameters = ãã®æäœã¯äžã€ããã©ã¡ãŒã¿ãŒãåããŸãã
view_alert_definition_notification_operation_editor_relative_ancestor = æ€çŽ¢ãéå§
-view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = ã¿ã€ãã®ç¥å
ãååŸã§ããŸãã
-view_alert_definition_notification_operation_editor_relative_ancestor_root = ã«ãŒãã®ç¥å
ã¿ã€ã
-view_alert_definition_notification_operation_editor_relative_ancestor_tooltip = ã¿ã€ãéå±€ã®ããããéžæããŸããããã¯ã¿ã€ãã«ãããã£ã«ã¿ãŒã®ããã«åå«ã®ããªãŒãæ€çŽ¢ããå
ãšãªããŸã
view_alert_definition_notification_operation_editor_relative_descendant = 次ã«ãããã£ã«ã¿ãŒ
-view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip = éžæããã¿ã€ãã«å¯Ÿå¿ããè€æ°ã®ãªãœãŒã¹ãååšãããšããªãœãŒã¹ããŠããŒã¯ã«èå¥ããå
·äœçãªååãããã¯éžæããã¿ã€ãéå±€ã«ãããŠãã®ãªãœãŒã¹ã¿ã€ãã®å¯äžã®ãªãœãŒã¹ããååšããªãå Žåã¯ãªãã·ã§ã³ã§ãã
view_alert_definition_notification_operation_editor_relative_descendant_loadFailed = ã¿ã€ãã®åå«ãååŸã§ããŸãã
view_alert_definition_notification_operation_editor_relative_descendant_tooltip = æ€çŽ¢ã®éå§ã»ã¯ã·ã§ã³ã§å®çŸ©ãããã«ãŒãã¿ã€ãã®äžã§æ€çŽ¢ãããªãœãŒã¹ã¿ã€ã
view_alert_definition_notification_operation_editor_specific_pick_button = éžæ
@@ -1135,7 +1073,6 @@ view_alert_definitions_update_success = ã¢ã©ãŒãå®çŸ©ã®æŽæ°ã«æåã
view_alert_details_field_ack_at = 次ã®å Žæã§ç¢ºèªæžã¿ã§ã
view_alert_details_field_ack_by = 次ã®äººã«ãã£ãŠç¢ºèªæžã¿ã§ã
##view_alert_details_field_parent_definition = Parent definition
-view_alert_details_field_recovery_info = ãªã«ããªæ
å ±
##view_alert_details_field_resource_ancestry = Resource Ancestry
##view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = ã¢ã©ãŒãã®è©³çŽ°ãåãåºãã®ã«å€±æããŸãã
@@ -1165,11 +1102,9 @@ view_alerts_field_enabled = æå¹
view_alerts_field_modified_time = ä¿®æ£æå»
view_alerts_field_name = åå
view_alerts_field_parent = 芪
-view_alerts_field_priority = åªå
床
view_alerts_field_protected = ä¿è·ãããŠãã
view_alerts_field_protected_tooltip = ããtrueãªãããã®å®çŸ©ã¯èŠªå®çŸ©ã«ããå€æŽããä¿è·ãããŠããŸããä»ã®èšèã§èšãã°ããã®èŠªå®çŸ©èšå®ã¯ãã®å®çŸ©ãäžæžãããŸããã
view_alerts_loadFailed = ã¢ã©ãŒãããŒã¿ãåãåºãã®ã«ããŸãã
-view_alerts_table_filter_priority = åªå
床ãã£ã«ã¿ãŒ
view_alerts_table_title_group = ã°ã«ãŒãã¢ã©ãŒãå±¥æŽ
view_alerts_table_title_resource = ãªãœãŒã¹ã¢ã©ãŒãå±¥æŽ
view_autoDiscoveryQ_committed = ã³ãããæžã¿
@@ -1206,21 +1141,16 @@ view_autoDiscoveryQ_uninventoried = ã€ã³ãã³ããªç»é²ãããªã
view_bundleVersion_loadFailure = ãã³ãã«ããŒãžã§ã³ããŒã¿ãããŒãããã®ã«å€±æããŸãã
view_bundle_bundleDeployment = ãã³ãã«ãããã€ã¡ã³ã
view_bundle_bundleDeployments = ãã³ãã«ãããã€ã¡ã³ã
-view_bundle_bundleDestinations = ãã³ãã«å®å
view_bundle_bundleFiles = ãã³ãã«ãã¡ã€ã«
view_bundle_bundleType = ãã³ãã«ã¿ã€ã
view_bundle_bundleVersion = ãã³ãã«ããŒãžã§ã³
view_bundle_bundleVersions = ãã³ãã«ããŒãžã§ã³
-view_bundle_createWizard_bundleDistro = ãã³ãã«é
åž
-view_bundle_createWizard_cancelFailure = ãã³ãã« [{0}], ããŒãžã§ã³ = [{1}] ã®äœæã®å®å
šãªãã£ã³ã»ã«ã«å€±æããŸãã - ãã³ãã«ã¯ããŒã¿ããŒã¹ã«ãŸã æ®ã£ãŠãããããããŸãã
##view_bundle_createWizard_cancelFailurePerm = Failed to fully cancel the creation of bundle [{0}], version = [{1}] because the user has create but not delete permissions. The bundle will likley need to be removed by an administrator.
view_bundle_createWizard_cancelSuccessful = ãã³ãã« [{0}], ããŒãžã§ã³ = [{1}] ã®äœæããã£ã³ã»ã«ããŸãã
view_bundle_createWizard_clickToUploadRecipe = ã¬ã·ããã¡ã€ã«ã®ããŒãããããã«ã¯ãªãã¯ããŠãã ãã
view_bundle_createWizard_createFailure = ãã³ãã«ãäœæããã®ã«å€±æããŸãã
view_bundle_createWizard_createSuccessful = ããŒãžã§ã³ [{1}] ã® [{0}] ãšããååã®ãã³ãã«ã®äœæã«æåããŸãã
view_bundle_createWizard_enterRecipe = æ£ããã¬ã·ããæäŸããŠãã ãã
-view_bundle_createWizard_enterUrl = ãã³ãã«é
åžãã¡ã€ã«ãããŠã³ããŒãã§ããæ£ããURLãå
¥åããŠãã ãã
-view_bundle_createWizard_failedToUploadDistroFile = ãã³ãã«é
åžãã¡ã€ã«ã®ã¢ããããŒãã«å€±æããŸãã
view_bundle_createWizard_failedToUploadFile = ãã³ãã«ãã¡ã€ã«ã®ã¢ããããŒãã«å€±æããŸãã
##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups:
##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments:
@@ -1233,11 +1163,8 @@ view_bundle_createWizard_failedToUploadFile = ãã³ãã«ãã¡ã€ã«ã®ã¢ã
##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle
##view_bundle_createWizard_groupsStep_successAssign = You have successfully assigned initial bundle groups to a bundle named [{0}] with a version of [{1}]
##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle is not currently assigned to any bundle groups.
-view_bundle_createWizard_loadBundleFileFailure = ãµãŒããŒãããã³ãã«ãã¡ã€ã«æ
å ±ã®ååŸãã§ããŸãã
-view_bundle_createWizard_noAdditionalFilesNeeded = ãã®ãã³ãã«ã®ããã«ã¢ããããŒããããå¿
èŠãããè¿œå ãã¡ã€ã«ã¯ãããŸãã
view_bundle_createWizard_noBundleTypesAvail = ãã³ãã«ã¿ã€ããå©çšã§ããŸãã
view_bundle_createWizard_noBundleTypesSupported = ãã³ãã«ã¿ã€ãã¯äžã€ããµããŒããããŠããŸãã - ãã³ãã«ãããã€ã¡ã³ãããµããŒãããæ£ãããã©ã°ã€ã³ããããã€ããªããã°ãªããŸãã
-view_bundle_createWizard_provideBundleDistro = ãã³ãã«é
åžã®æäŸ
view_bundle_createWizard_recipeOption = ã¬ã·ã
view_bundle_createWizard_title = ãã³ãã«äœæ
##view_bundle_createWizard_unassigned = unassigned
@@ -1250,47 +1177,28 @@ view_bundle_createWizard_urlOption = URL
##view_bundle_createWizard_urlUserName = User name
view_bundle_createWizard_windowTitle = ãã³ãã«äœæãŠã£ã¶ãŒã
view_bundle_createWizard_youMustChooseOne = ãã³ãã«ãäœæããããã®ãªãã·ã§ã³ãéžæããªããã°ãªããŸãã
-view_bundle_deleteConfirm = ãã®ãã³ãã«ãåé€ããŠãããããã§ãã? ãã®ãã³ãã«ã®ãã¹ãŠã®ããŒãžã§ã³ãå®å
ããããã€ãåé€ãããŸãã
view_bundle_deploy = ãããã€
view_bundle_deployDir = ãããã€ãã£ã¬ã¯ããª
##view_bundle_deployWizard_createGroup_error_1 = The group was not created. Group for deployment cannot be empty.
##view_bundle_deployWizard_createGroup_error_2 = The group was not created. Resulting group must be compatible (members of the same type).
##view_bundle_deployWizard_createGroup_error_3 = The group was not created. The resource type of the resulting group does not support deployments.
-view_bundle_deployWizard_deployStep = å®å
ãã©ãããã©ãŒã ãžã®ãã³ãã«ã®ãããã€
view_bundle_deployWizard_deploying = ãããã€äž...
view_bundle_deployWizard_deploymentCreated = äœæããããããã€ã¡ã³ã...
view_bundle_deployWizard_deploymentCreatedDetail = ãã£ã¹ã¯ãªãã·ã§ã³ [{1}] ã®ä»ãããããã€ã¡ã³ã [{0}] ãäœæããŸãã
view_bundle_deployWizard_deploymentCreatedDetail_concise = ãããã€ã¡ã³ã [{0}] ãäœæããŸãã
view_bundle_deployWizard_deploymentScheduled = ãã³ãã«ãããã€ãã¹ã±ãžã¥ãŒã«ãããŸãã!
-view_bundle_deployWizard_deploymentScheduledDetail = ãã³ãã«ãããã€ã¡ã³ã [{0}] ãå®å
ã°ã«ãŒã [{1}] ã«ã¹ã±ãžã¥ãŒã«ããŸãã
view_bundle_deployWizard_deploymentScheduledDetail_concise = ãã³ãã«ãããã€ã¡ã³ããã¹ã±ãžã¥ãŒã«ãããŸãã
view_bundle_deployWizard_destinationCreatedDetail = ãã£ã¹ã¯ãªãã·ã§ã³ [{1}] ã®ä»ãããããã€ã¡ã³ã [{0}] ãäœæããŸãã
-view_bundle_deployWizard_destinationCreatedDetail_concise = å®å
[{0}] ãäœæããŸãã
view_bundle_deployWizard_error_1 = ãã£ã³ã»ã«ã«ã€ããŠã®æ°ãããããã€ã¡ã³ãã®åé€ã«å€±æããŸãã
-view_bundle_deployWizard_error_10 = å®å
ã®äœæã«å€±æããŸãããããã¯ãã§ã«ååšãããããããŸããã (泚æïŒå®å
ãã¥ãŒããæ¢åã®å®å
ãããã€ã®ãã)
view_bundle_deployWizard_error_11 = å®çŸ©æžã¿ãããã€ã¡ã³ãã®æ€çŽ¢ã«å€±æããŸãã
view_bundle_deployWizard_error_12 = å®çŸ©æžã¿ãã³ãã«ã®æ€çŽ¢ã«å€±æããŸãã
-view_bundle_deployWizard_error_2 = ãã£ã³ã»ã«ã«ã€ããŠã®æ°ããå®å
ã®åé€ã«å€±æããŸãã
view_bundle_deployWizard_error_3 = ãããã€ã¡ã³ãã®ã¹ã±ãžã¥ãŒã«ã«å€±æããŸãã!
view_bundle_deployWizard_error_4 = ãããã€ã¡ã³ãã®ã¹ã±ãžã¥ãŒã«ã«å€±æããŸãã: {0}
view_bundle_deployWizard_error_5 = ãããã€ã¡ã³ãã®äœæã«å€±æããŸãã!
view_bundle_deployWizard_error_6 = ãããã€ã¡ã³ãã®äœæã«å€±æããŸãã: {0}
view_bundle_deployWizard_error_7 = ãããã€ã¡ã³ãåã®ååŸã«å€±æããŸãã
view_bundle_deployWizard_error_8 = ããããããŠã³ããæ£ãããªãœãŒã¹ã°ã«ãŒããéžæããªããã°ãªããŸãã
-view_bundle_deployWizard_error_9 = 次ããŒãžã§ã®æ°ããå®å
ã®åé€ã«å€±æããŸãã
-view_bundle_deployWizard_error_noBundleConfig = ãã³ãã«ã¿ãŒã²ããæ
å ±ã®ååŸã«å€±æããŸãããéžæããã°ã«ãŒãã¯ãã³ãã«ãããã€ã¡ã³ãã®ã¿ãŒã²ããã«æãåŸãæ£åœãªäºæã°ã«ãŒãã§ãã?
-view_bundle_deployWizard_getConfigSkip = ãã®ãã³ãã«ããŒãžã§ã³ã«ã¯æ§æã¯å¿
èŠãããŸãã
view_bundle_deployWizard_getConfigStep = ãããã€ã¡ã³ãæ§æã®èšå®
-view_bundle_deployWizard_getDestStep = æ°ããå®å
-view_bundle_deployWizard_getDest_deployDir = ã«ãŒããããã€ãã£ã¬ã¯ã㪠(å®å
ãã©ãããã©ãŒã äžã§ã®)
-view_bundle_deployWizard_getDest_deployDir_help = ãã®ãã³ãã«ããããã€ããããã£ã¬ã¯ããªããã®ãã£ã¬ã¯ããªã¯ãã¹ãŠã®ãªãœãŒã¹ã«é¢ãããã¹ãŠã®ãããã€çšãšããŠåããã®ã䜿ãããŸãããå®å
ã®åºæ¬ãã£ã¬ã¯ããªã®å Žæã«å¯Ÿããçžå¯Ÿãã£ã¬ã¯ããªã«ãªããŸãããã®ããšã¯ãç°ãªãã¿ãŒã²ãããªãœãŒã¹ã«ã€ããŠåºæ¬ãã£ã¬ã¯ããªã®é
眮ãã©ãã«ããããšããããšã«äŸåããŠããã®çµ¶å¯Ÿãã£ã¬ã¯ããªã¯ç°ãªãã¿ãŒã²ãããªãœãŒã¹ã«ãã£ãŠç°ãªããã¹ã«ãªãå¯èœæ§ãããããšãæå³ããŠããŸãã
-view_bundle_deployWizard_getDest_desc = å®å
ã®èª¬æ
-view_bundle_deployWizard_getDest_destBaseDirName = åºæ¬ã®é
眮
-view_bundle_deployWizard_getDest_group_help = ã¡ã³ããŒããã¹ãŠã®ãã³ãã«ãããã€ã®ããã®å®å
ã¿ãŒã²ãããšãªããããªã°ã«ãŒãããã³ãã«ãããã€ããµããŒããããªãœãŒã¹ãå«ãäºæã°ã«ãŒãã®ã¿ãéžæå¯èœã§ãã
-view_bundle_deployWizard_getDest_name = å®å
å
-view_bundle_deployWizard_getDest_name_help = å®å
åãããã¯ãªãœãŒã¹ã®ç¹å®ã®ã°ã«ãŒããšç¹å®ã®ãã³ãã«ã®ãªãœãŒã¹ã«é¢ããå®å
ãã£ã¬ã¯ããªãèå¥ããŸãã
-view_bundle_deployWizard_getInfoStep = ãããã€æ
å ±ã®æäŸ
-view_bundle_deployWizard_getInfo_clean = ã¯ãªãŒã³ãããã€ã§ãã? (å®å
ãã©ãããã©ãŒã äžã§ã®ãããã€ãã£ã¬ã¯ããªãæé€ãã)
view_bundle_deployWizard_getInfo_deploymentDesc = ãããã€ã®èª¬æ
view_bundle_deployWizard_getInfo_deploymentName = ãããã€å
view_bundle_deployWizard_getOptionsStep = ãããã€ãªãã·ã§ã³
@@ -1305,7 +1213,6 @@ view_bundle_deployWizard_selectVersion_live = åäœããŒãžã§ã³ [{0}]
view_bundle_deployWizard_selectVersion_select = ãªã¹ãããããŒãžã§ã³ãéžæããŠãã ãã:
view_bundle_deployWizard_title = ãã³ãã«ãããã€ã®ãŠã£ã¶ãŒã
view_bundle_deploy_action = ã¢ã¯ã·ã§ã³
-view_bundle_deploy_backButton = å®å
ã«æ»ã
view_bundle_deploy_clickForError = ãšã©ãŒã¡ãã»ãŒãžã®ã¢ã€ã³ã³ãã¯ãªãã¯ããŠãã ãã
view_bundle_deploy_deleteConfirm = ãã®ãã³ãã«ãããã€ãåé€ããŠãããããã§ãã?
view_bundle_deploy_deleteFailure = ãã³ãã«ããã〠[{0}] ã®åé€ã«å€±æããŸãã
@@ -1325,25 +1232,14 @@ view_bundle_deploy_time = ãããã€å
view_bundle_deployed = ãããã€
view_bundle_deployments = ãããã€
view_bundle_dest_backToBundle = ãã³ãã«ãžæ»ã
-view_bundle_dest_baseDirName = åºæ¬ã®é
眮
view_bundle_dest_created = äœæããã
-view_bundle_dest_deleteConfirm = ãã®ãã³ãã«å®å
ãåé€ããŠãããããã§ãã? ããã¯ããŒã¿ããŒã¹ããåé€ããã ãã§ããã€ãŸãããªã¢ãŒããã·ã³ã®ãã®å®å
ã«ãããã€ããããã¹ãŠã®ãã³ãã«ã®å
容ã¯æ®ãç¶ããŸã
-view_bundle_dest_deleteFailure = ãã³ãã«å®å
[{0}] ã®åé€ã«å€±æããŸãã
-view_bundle_dest_deleteSuccessful = ãã³ãã«å®å
[{0}] ã®åé€ã«æåããŸãã
view_bundle_dest_deployDir = ãããã€ãã£ã¬ã¯ããª
view_bundle_dest_group = ã°ã«ãŒã
view_bundle_dest_lastDeployedVersion = æåŸã«ãããã€ãããããŒãžã§ã³
view_bundle_dest_lastDeploymentDate = æåŸã®ãããã€ããããæ¥ä»
view_bundle_dest_lastDeploymentStatus = æåŸã«ãããã€ãããã¹ããŒã¿ã¹
-view_bundle_dest_loadFailure = ãã³ãã«ã®å®å
ãããŒãããã®ã«å€±æããŸãã
-view_bundle_dest_loadFailureVersionInfo = ãããã€ãããããŒãžã§ã³æ
å ±ã®ããŒãã«å€±æããŸãã
view_bundle_dest_purgeConfirm = ãã®æäœã¯ãã¹ãŠã®ãªã¢ãŒããã·ã³ãããã³ãã«ã³ã³ãã³ããé€å»ããŸããããããã§ãã?
-view_bundle_dest_purgeFailure = ãªã¢ãŒããã·ã³ã®äžéšãããã¯ãã¹ãŠããã®ãã³ãã«å®å
[{0}] ã®é€å»ã«å€±æããŸãã
-view_bundle_dest_purgeSuccessful = ãªã¢ãŒããã·ã³ã®äžéšãããã¯ãã¹ãŠããã®ãã³ãã«å®å
[{0}] ã®é€å»ã«æåããŸãã
view_bundle_dest_revertConfirm = ããã¯ãã¹ãŠã®ãªã¢ãŒããã·ã³ã以åã®ãã³ãã«ãããã€ã¡ã³ããžæ»ããŸãããããããŠãããããã§ãã?
-view_bundle_dest_tagUpdateFailure = ãã³ãã«å®å
ã¿ã°ã®æŽæ°ã«å€±æããŸãã
-view_bundle_dest_tagUpdateSuccessful = ãã³ãã«å®å
ã¿ã°ã®æŽæ°ã«æåããŸãã
-view_bundle_destinations = å®å
##view_bundle_fail_existingName = Failed to create [{0}]. The name is already being used. Please try another name.
view_bundle_fileListView_fileSize = ãã¡ã€ã«ãµã€ãº
view_bundle_fileListView_loadFailure = ãã³ãã«ãã¡ã€ã«ããŒã¿ãããŒãããã®ã«å€±æããŸãã
@@ -1357,7 +1253,6 @@ view_bundle_list_deleteFailure = ãã³ãã« [{0}] ã®åé€ã«å€±æããŸã
view_bundle_list_deleteSuccessful = ãã³ãã« [{0}] ã®åé€ã«æåããŸãã
view_bundle_list_deletesFailure = ãã³ãã«ã®åé€ã«å€±æããŸãã
view_bundle_list_deletesSuccessful = ãã³ãã«ã®åé€ã«æåããŸãã
-view_bundle_list_destinationsCount = å®å
æ°
view_bundle_list_error1 = [{0}] ããããã€ããããã®ãã³ãã«ã®ããŒãã«å€±æããŸãã
view_bundle_list_error2 = [{0}] ããããã€ããããã®åäžãã³ãã«ã®ååŸã«å€±æããŸãã
view_bundle_list_error3 = ãã³ãã«ã®ããŒãã«å€±æããŸãã
@@ -1376,18 +1271,14 @@ view_bundle_revertWizard_confirmStep_confirmation = åäœäžã®ãããã€ã
view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = åäœäžã®ãããã€ãèŠã€ãããŸãããåãæ¶ããã§ããŸããã
view_bundle_revertWizard_confirmStep_liveDeployment = åäœäžã®ãããã€
view_bundle_revertWizard_confirmStep_name = åãæ¶ããããã€ç¢ºèª
-view_bundle_revertWizard_confirmStep_noLiveDeployment = ãã®å®å
[{0}] çšã®åäœäžã®ãããã€ã¯èŠã€ãããŸããã§ãã
-view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = ãã®å®å
çšã®åäœäžã®ãããã€ã¯èŠã€ãããŸããã§ãã
view_bundle_revertWizard_confirmStep_noPriorDeployment = 以åã®ããã〠[{1}] ãååšããªãã®ã§åäœäžã®ããã〠[{0}] ã¯åãæ¶ãããšãã§ããŸããã§ãã
view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = 以åã®ãããã€ãååšããªãã®ã§åäœäžã®ãããã€ã¯åãæ¶ãããšãã§ããŸããã§ãã
view_bundle_revertWizard_confirmStep_prevDeployment = 以åã®ãããã€
view_bundle_revertWizard_getInfoStep_cleanDeploy = ãããã€ãåé€ããŸãã? (ããã¯å€ããæ¢åã®ãããã€ãã£ã¬ã¯ããªãåãæ¶ããããã€ãéå§ããåã«åé€ããŸã)
view_bundle_revertWizard_getInfoStep_getNameFailure = åãæ¶ããããã€åã®ååŸã«å€±æããŸãã
-view_bundle_revertWizard_getInfoStep_name = åãæ¶ãæ
å ±ã®æäŸ
view_bundle_revertWizard_getInfoStep_revertDeployDesc = ãããã€èšè¿°ã®åãæ¶ã
view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [åãæ¶ã å] {0} [åãæ¶ã åŸ] {1}
view_bundle_revertWizard_getInfoStep_revertDeployName = ãããã€åã®åãæ¶ã
-view_bundle_revertWizard_revertStep_name = å®å
ãã©ãããã©ãŒã ãžãã³ãã«ããããã€
view_bundle_revertWizard_revertStep_reverting = åãæ¶ãäž...
view_bundle_revertWizard_revertStep_scheduled = ãããã€ã®åãæ¶ãã®ã¹ã±ãžã¥ãŒã«ã«æåããŸããã
view_bundle_revertWizard_revertStep_scheduledDetails = ãªãœãŒã¹ã°ã«ãŒã [{1}] ãããã³ãã«ããã〠[{0}] ã®åãæ¶ãã®ã¹ã±ãžã¥ãŒã«ã«æåããŸãã
@@ -1408,12 +1299,10 @@ view_bundle_versions = ããŒãžã§ã³
##view_charts_time_axis_label = Time
view_configCompare_comparingConfigs = æ§æã®æ¯èŒ
view_configCompare_configCompare = æ§æã®æ¯èŒ
-view_configEdit_addItem = ãªã¹ãã«é
ç®ãè¿œå
view_configEdit_confirm_1 = ãã®éãŸãããéžæãããããããã£ãåé€ããŠãããããã§ãã?
view_configEdit_confirm_2 = ãã®è¡ãåé€ããŠãããããã§ãã?
view_configEdit_confirm_3 = [{1}] ãéžæããã [{0}] ãåé€ããŠãããããã§ãã?
view_configEdit_editRow = è¡ã®ç·šé
-view_configEdit_enterPropName = è¿œå ããããããã£ã®ååãå
¥åããŠãã ãã
view_configEdit_error_1 = æ§æã¯ãã®ãªãœãŒã¹ã§ãµããŒããããŠããŸãã
view_configEdit_error_2 = æ¥ç¶èšå®ã¯ãã®ãªãœãŒã¹ã§ãµããŒããããŠããŸãã
view_configEdit_error_3 = [{0}] ãšããååã®ããããã£ãè¿œå ã§ããŸãããããããã£åã¯ãã®éãŸãã§ãã§ã«äœ¿ãããŠããŸãã
@@ -1538,7 +1427,6 @@ view_drift_wizard_addDef_templatePrompt = ããªããå®çŸ©ãã³ãã¬ãŒã
view_drift_wizard_addDef_title = ã¿ã€ãã®ãªãœãŒã¹ [{0}] ã®ããã®ããªããæ€åºå®çŸ©ãè¿œå ããŠãã ãã
view_drift_wizard_addDef_windowTitle = ããªããæ€åºå®çŸ©ãŠã£ã¶ãŒãã®è¿œå
view_drift_wizard_addTemplate_failure = æ°èŠããªããæ€åºãã³ãã¬ãŒã [{0}] ã®è¿œå ã«å€±æããŸãã
-view_drift_wizard_addTemplate_infoStepHelp = åããªãããã³ãã¬ãŒãã¯æ¢åã®ãã³ãã¬ãŒããã掟çããŠäœæã§ããŸããããã¯æ¢åãã³ãã¬ãŒãã«é¡äŒŒãããã®ãããã©ã°ã€ã³ãå®çŸ©ãããã³ãã¬ãŒãããæ°èŠãã³ãã¬ãŒããæ§ç¯ããçŽ æ©ãæ¹æ³ãæäŸããŸããããªããå®çŸ©ã®ããã«ããã®ãã³ãã¬ãŒãã¯ããªãããç£èŠãå®è¡ããäžåŒã®ãã¡ã€ã«ãèšè¿°ããŸããç¶æ³ã«ãã£ãŠã¯ããã®ãã³ãã¬ãŒãããå°åºãããå®çŸ©ã¯ãã®ãã¡ã€ã«ã»ããã®å€æŽããä»ã®èšå®ã®å€æŽãèš±ããããèš±ããªãã£ããããŸãããã³ãã¬ãŒãåã¯äžã€ã®ãªãœãŒã¹ã¿ã€ãå
ã§ãŠããŒã¯ã§ãªããã°ãªããŸããã
view_drift_wizard_addTemplate_infoStepName = éå§ãã³ãã¬ãŒãã®éžæ
view_drift_wizard_addTemplate_success = æ°èŠããªãããã³ãã¬ãŒã [{0}] ã®è¿œå ã«æåããŸãã
view_drift_wizard_addTemplate_title = ã¿ã€ã [{0}] ã®ããªããå®çŸ©ãã³ãã¬ãŒããè¿œå ããŠãã ãã
@@ -1547,7 +1435,6 @@ view_drift_wizard_pinTemplate_confirmNotPinned = ãã®ãã³ãã¬ãŒãã®ã
view_drift_wizard_pinTemplate_confirmPinned = èŠå! ãã®ãã³ãã¬ãŒãã¯ãã§ã«ãã³çããããŠããŸãããã®ãã³ãã¬ãŒãã¯ãã®æ°èŠã¹ãããã·ã§ããã«å床ãã³çãããããšãå¯èœã§ãããã®ãã³ãã¬ãŒãã®ããã®çŸåšãšå°æ¥ã®åããªããå®çŸ©ããã£ãããã³çãããããšããã®ãã³ãã¬ãŒãã¯åæã¹ãããã·ã§ããããã®ãã³ãã¬ãŒããæã€ãã³çããããã¹ãããã·ã§ãããšããŠèšå®ãããããã«ããŸãããã®ãã³ãã¬ãŒãã®æ¢åå®çŸ©ã¯æ°èŠåæã¹ãããã·ã§ãããžãªã»ããããããã¹ãŠã®æ¢åã¹ãããã·ã§ããã¯åé€ãããŸãããã®æ°èŠã¹ãããã·ã§ãããæã€ãã³ãã¬ãŒãã®ãã³çããç¶ããŸãã?
view_drift_wizard_pinTemplate_failure = ããªãããã³ãã¬ãŒã [{0}] ãžã®ã¹ãããã·ã§ããããã³çãããã®ã«å€±æããŸãã
view_drift_wizard_pinTemplate_infoStepExistingTemplate = çŸåšã®ãã³ãã¬ãŒããžã®ãã³çã
-view_drift_wizard_pinTemplate_infoStepHelp = ãã³çãããããã³ãã¬ãŒããéžæããŠãã ããããã®ãã³ãã¬ãŒãã®ããã®çŸåšãšå°æ¥ã®åããªããå®çŸ©ããã£ãããã³çãããããšããã®ãã³ãã¬ãŒãã¯åæã¹ãããã·ã§ããããã®ãã³ãã¬ãŒããæã€ãã³çããããã¹ãããã·ã§ãããšããŠèšå®ãããæã€ããã«ãªããŸããããã«ããŸãããããŠãã®å®çŸ©èªèº«ã¯ãã³çãããããã®ãšããŠããŒã¯ãããŸããããã¯æåŸ
ããããã¡ã€ã«ã»ããããããªãããæ€åºããã®ã«äœ¿ãããŸãããã®ãã³ãã¬ãŒãã®ããã®æ¢åå®çŸ©ã¯æ°èŠã®åæã¹ãããã·ã§ããã«ãªã»ããããããã¹ãŠã®æ¢åã¹ãããã·ã§ããã¯åé€ãããããšã«æ³šæããŠãã ããã
view_drift_wizard_pinTemplate_infoStepName = ãã³çãããããã³ãã¬ãŒãã®éžæ
view_drift_wizard_pinTemplate_infoStepNewTemplate = æ°èŠãã³ãã¬ãŒããžã®ãã³çã (ã¹ãããã·ã§ããã®ããªããå®çŸ©ããå°åºããããã®)
view_drift_wizard_pinTemplate_infoStepRadioHelp = ãã®ã¹ãããã·ã§ããã¯æ°èŠãŸãã¯æ¢åã®ããªãããã³ãã¬ãŒãã«ãã³çãããããšãå¯èœã§ãããã®''æ°èŠãã³ãã¬ãŒã''ãªãã·ã§ã³ã¯ããŠãŒã¶ãŒã®æã«ãã£ãŠä¿¡é Œããå®çŸ©ãã¹ãããã·ã§ãããããªãœãŒã¹ã¬ãã«ãã¿ã€ãã¬ãã«ã§ããã³ãã¬ãŒãåã§ããããã«ããŸãããã®æ°èŠãã³ãã¬ãŒãã¯ã次ã«ããã®ã¿ã€ãã®ã¡ã³ããŒã«å¯ŸããŠé©çšã§ããŸãããã®æ°èŠãã³ãã¬ãŒãã¯åææã¯ã¹ãããã·ã§ããã®ããªããå®çŸ©ã®ã³ããŒã§ããã次ã®ã¹ãããã§ç·šéããããšãã§ããŸãããã®ååã¯å€æŽãã¹ãã§ããã®ã¿ã€ãã®ãŠããŒã¯ãªããªãããã³ãã¬ãŒãåã§ãªããã°ãªããŸããã''æ¢åãã³ãã¬ãŒã''ãªãã·ã§ã³ã¯ããŠãŒã¶ãŒãéžæããã¹ãããã·ã§ãããæã€æ¢åãã³ãã¬ãŒãã«å¯ŸããŠããã³çã
ãŸãã¯å床ãã³çããã§ããããã«ããŸããæ£ããèšå®ããã«ã¯ããã®æ¢åãã³ãã¬ãŒãã¯åããã£ã¬ã¯ããªããã®ã¹ãããã·ã§ããå®çŸ©ãšããŠç£èŠã§ããªããã°ãªããŸãããã»ã¬ã¯ã·ã§ã³ããã¯ã¹ã¯æ£åœãªæ¢åã®ãã³ãã¬ãŒãã ãã衚瀺ããŸããããæ£åœã§ãªãæ¢åãã³ãã¬ãŒããååšãããšããŠããã®ãªãã·ã§ã³ã§ã¯éžæãããŸããã
@@ -1584,9 +1471,7 @@ view_dynagroup_exprBuilder_expressionType_resourceConfig = ãªãœãŒã¹æ§æ
view_dynagroup_exprBuilder_expressionType_resourceType = ãªãœãŒã¹ã¿ã€ã
view_dynagroup_exprBuilder_expressionType_tooltip = ãã®åŒã®ããããã£ã¯ä»¥äžã®ãã®ã«åãæ¿ãããŸãã<br/> <b>ãªãœãŒã¹</b>: ååãããŒãžã§ã³ãšãã£ããªãœãŒã¹ããããã£<br/> <b>ãªãœãŒã¹ã¿ã€ã</b>: ç¹å®ã¿ã€ãã®ãªãœãŒã¹ã®æ€çŽ¢<br/> <b>ãªãœãŒã¹ã«ããŽãª</b>: ãã©ãããã©ãŒã ããµãŒããŒããµãŒãã¹ãšãã£ãã«ããŽãªã«ãããªãœãŒã¹æ€çŽ¢<br/> <b>ãã¬ã€ã</b>: ã¢ãã¿ããããã¬ã€ãã®ããã«éžæãããå€ãæã€ãªãœãŒã¹<br/> <b>ãã©ã°ã€ã³æ§æ</b>: ã³ã³ããŒãã³ãã®ãã©ã°ã€ã³ã³ã³ããŒãã³ãæ§æèšå®ã«ããæ€çŽ¢<br/> <b>ãªãœãŒã¹æ§æ</b>: 管çãªãœãŒã¹ã®æ§æèšå®ã«ããæ€çŽ¢
view_dynagroup_exprBuilder_expressionType_trait = ãã¬ã€ã
-view_dynagroup_exprBuilder_expression_tooltip = ããã¯ä»¥äžã®ãã©ãŒã å
ã®éžæã«ãã£ãŠè¡šçŸãããå®å
šãªåŒã§ãããã®ããã¹ãã¯ã"åŒã®è¿œå "ãã¿ã³ãã¯ãªãã¯ãããšãã°ã«ãŒãå®çŸ©åŒã®ããã¹ãã«è¿œå ãããŸãã
##view_dynagroup_exprBuilder_groupBy = Group by
-view_dynagroup_exprBuilder_groupBy_tooltip = GroupByã¯ã·ã¹ãã ãå
¥ååŒããã®å€ã«ã€ããŠãããã解æãã§ããããã«ããŸããäŸãã°ãã¯ã©ã¹ã¿ãŒåã«ããGroupByã«ãã£ãŠããã¹ãŠã®ã¯ã©ã¹ã¿ãŒã¡ã³ããŒããã®äžã«å«ããããªã¯ã©ã¹ã¿ã®ã°ã«ãŒããäœæããŸãã
##view_dynagroup_exprBuilder_memberOf = Member of
##view_dynagroup_exprBuilder_memberOf_tooltip = memberof will restrict the dynagroup members to be a subset of the specified resource group. Specifying multiple memberof conditions will restrict the dynagroup members to be a subset of the union of members of the specified groups.
view_dynagroup_exprBuilder_noPlugins = --ãã©ã°ã€ã³ãªã--
@@ -1610,7 +1495,6 @@ view_dynagroup_exprBuilder_resource_tooltip = ãªãœãŒã¹ã®ã¬ãã«ãæã¿
view_dynagroup_exprBuilder_savedExpression = ä¿åãããåŒ
view_dynagroup_exprBuilder_title = åŒãã«ããŒ
view_dynagroup_exprBuilder_unset = èšå®è§£é€
-view_dynagroup_exprBuilder_unset_tooltip = èšå®è§£é€ã¯ããŒã¿ããŒã¹å
ã®nullå€ãæã€å€ãã®ãã¹ãŠãçºèŠããŸããããã¯ããŒã¿ããŒã¹ã¹ãã¢ãšåãåããããŒã¿ã®çç±ã«ãã"="ãªãã¬ãŒã¿ã䜿ãããšã¯å¯èœã§ã¯ãããŸããã
view_dynagroup_exprBuilder_value_tooltip = åãåããåŒã®ããã®æååå€
view_dynagroup_expression = åŒ
view_dynagroup_expressionBuilderIconTooltip = åŒãã«ããŒ...
@@ -1641,8 +1525,6 @@ view_dynagroup_template_jbossas4_hostingApp = JBossAS 4 - ãã¹ãã£ã³ã°ã
view_dynagroup_template_jbossas4_nonsecured = JBossAS 4 - ã»ãã¥ã¢ã§ãªããã¹ãŠ
view_dynagroup_template_jbossas4_uniqueVersions = JBossAS 4 - ãŠããŒã¯ããŒãžã§ã³
view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - ã¯ã©ã¹ã¿
-view_dynagroup_template_platforms = ã€ã³ãã³ããªå
ã®ãã©ãããã©ãŒã ãªãœãŒã¹
-view_dynagroup_template_uniqueResourceTypes = ã€ã³ãã³ããªå
ã®ãŠããŒã¯ãªãœãŒã¹ã¿ã€ã
view_groupConfigEdit_member = ã¡ã³ããŒ
view_groupConfigEdit_noListProps = ã°ã«ãŒãæ§æã«çŸåšãµããŒããããŠããªãããããã£ã®ãªã¹ã
view_groupConfigEdit_saveReminder = èšå®ãå€æŽãããŠããŸã - ãããã®å€æŽãä¿åããã®ãå¿ããªãã§ãã ããããããªããšå€±ãããŸãã
@@ -1680,7 +1562,6 @@ view_group_operationScheduleDetails_memberResource = ã¡ã³ããŒãªãœãŒã¹
view_group_operationScheduleDetails_value_parallel = 䞊è¡å®è¡
view_group_operationScheduleDetails_value_sequential = 以äžã«ç€ºããé 㧠(ã¡ã³ããŒãªãœãŒã¹ããã©ãã°&ããããããŠé çªãå€æŽ)
view_group_pluginConfig_edit_currentGroupProperties = çŸåšã®ã°ã«ãŒãããããã£
-view_group_pluginConfig_edit_invalid = 次ã®ã³ãã¯ã·ã§ã³èšå®ããããã£ã«ã¯äžæ£ãªå€ãèšå®ãããŠããŸãã®ã§ãã³ãã¯ã·ã§ã³èšå®ãä¿åããããŸãã«ä¿®æ£ãããå¿
èŠããããŸã: [{0}]
view_group_pluginConfig_edit_noperm = ãã®ã°ã«ãŒãã³ãã¯ã·ã§ã³èšå®ãç·šéããæš©éããããŸãã
view_group_pluginConfig_edit_saveFailure = ã°ã«ãŒãå [{1}] ãšäºææ§ã®ãã [{0}] ã®ããã®ã°ã«ãŒãèšå®æŽæ°ã®éå§ã«å€±æããŸãã
view_group_pluginConfig_edit_saveInitiated_concise = ã°ã«ãŒãã³ãã¯ã·ã§ã³èšå®ã®æŽæ°ãéå§ãããŸãã
@@ -1689,7 +1570,6 @@ view_group_pluginConfig_edit_saveTooltip = ãã¹ãŠã®ã°ã«ãŒãã¡ã³ããŒ
view_group_pluginConfig_edit_valid = ãã¹ãŠã®ã³ãã¯ã·ã§ã³èšå®ããããã£ã«ã¯æ£ããå€ãèšå®ãããŠããŸãã®ã§ãã³ãã¯ã·ã§ã³èšå®ã¯ä¿åã§ããŸã
view_group_pluginConfig_members_fetchFailure = ã°ã«ãŒã [{0}] ã®ã¡ã³ããŒã®ããã®ãã©ã°ã€ã³æ§ææŽæ°å±¥æŽã®ååŸã«å€±æããŸãã
view_group_pluginConfig_members_fetchFailureConn = [{0}] ã®ããã®ã¡ã³ããŒã³ãã¯ã·ã§ã³èšå®ã®åãåºãã«å€±æããŸãã
-view_group_pluginConfig_members_fetchFailureConnInProgress = ã°ã«ãŒããã©ã°ã€ã³æ§æã®æŽæ°ã¯çŸåšé²è¡äžã§ããã°ã«ãŒãèšå®ãé²èŠ§ããåã«æŽæ°ãå®äºãããŸã§åŸ
ã£ãŠãã ããã
view_group_pluginConfig_members_statusDetails = ã¹ããŒã¿ã¹ã®è©³çŽ°
view_group_pluginConfig_members_statusFailure = ãã®æ§æã®æŽæ°ã¯æªç¥ã®çç±ã«ãã倱æããŸãã
view_group_pluginConfig_members_statusInprogress = ãã®æ§æã®æŽæ°ã¯ãŸã é²è¡äžã§ã
@@ -1700,7 +1580,6 @@ view_group_pluginConfig_table_clickStatusIcon = 詳现ã¯ã¹ããŒã¿ã¹ã¢ã€
view_group_pluginConfig_table_deleteFailure = ã°ã«ãŒããã©ã°ã€ã³æ§æå±¥æŽã®åé€ã«å€±æããŸãã
view_group_pluginConfig_table_deleteSuccessful = [{0}] ã®å±¥æŽãåé€ããŸãã
view_group_pluginConfig_table_failFetch = ã°ã«ãŒããã©ã°ã€ã³å±¥æŽã®ååŸã«å€±æããŸãã
-view_group_pluginConfig_table_msg1 = åã
ã®ãªãœãŒã¹ã®ã¹ããŒã¿ã¹ã®ããã®ã¡ã³ããŒå±¥æŽãèŠãŠãã ãã
view_group_pluginConfig_table_statusDetails = ã¹ããŒã¿ã¹ã®è©³çŽ°
view_group_pluginConfig_table_statusFailure = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã¯å€±æããŸãã
view_group_pluginConfig_table_statusInprogress = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã¯é²è¡äžã§ã
@@ -1721,7 +1600,6 @@ view_group_resConfig_edit_saveTooltip = ãã¹ãŠã®ã°ã«ãŒãã¡ã³ããŒã®
view_group_resConfig_edit_valid = ãã¹ãŠã®æ§æããããã£ã¯æ£ããå€ã§ãã®ã§ããã®æ§æã¯ä¿åå¯èœã§ã
view_group_resConfig_members_fetchFailure = ã°ã«ãŒã [{0}] ã®ã¡ã³ããŒã®ããã®ãªãœãŒã¹æ§ææŽæ°å±¥æŽã®ååŸã«å€±æããŸãã
view_group_resConfig_members_fetchFailureConfig = [{0}] ã®ããã®ã¡ã³ããŒãªãœãŒã¹æ§æèšå®ã®åãåºãã«å€±æããŸãã
-view_group_resConfig_members_fetchFailureConfigInProgress = ã°ã«ãŒããªãœãŒã¹æ§æã®æŽæ°ãçŸåšé²è¡äžã§ããã°ã«ãŒãèšå®ãé²èŠ§ããåã«æŽæ°ãçµäºããã®ããåŸ
ã¡ãã ãã
view_group_resConfig_members_statusDetails = ã¹ããŒã¿ã¹ã®è©³çŽ°
view_group_resConfig_members_statusFailure = ãã®æ§æã®æŽæ°ã¯æªç¥ã®çç±ã§å€±æããŸããã
view_group_resConfig_members_statusInprogress = ãã®æ§æã®æŽæ°ã¯ãŸã é²è¡äžã§ã
@@ -1732,7 +1610,6 @@ view_group_resConfig_table_clickStatusIcon = 詳现ã¯ã¹ããŒã¿ã¹ã¢ã€ã³
view_group_resConfig_table_deleteFailure = ã°ã«ãŒããªãœãŒã¹æ§æå±¥æŽã®åé€ã«å€±æããŸãã
view_group_resConfig_table_deleteSuccessful = [{0}] ã®å±¥æŽã®åé€ãããŸãã
view_group_resConfig_table_failFetch = ã°ã«ãŒãæ§æå±¥æŽã®ååŸã«å€±æããŸãã
-view_group_resConfig_table_msg1 = åã
ã®ãªãœãŒã¹ã®ã¹ããŒã¿ã¹ã¯ã¡ã³ããŒå±¥æŽãé²èŠ§ããŠãã ãã
view_group_resConfig_table_statusDetails = ã¹ã¿ãŒã¿ã¹ã®è©³çŽ°
view_group_resConfig_table_statusFailure = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã倱æããŸãã
view_group_resConfig_table_statusInprogress = ãã®ã°ã«ãŒãæ§æã®æŽæ°ã¯ãŸã é²è¡äžã§ã
@@ -1755,7 +1632,6 @@ view_group_summary_mixed = æ··åš
view_group_summary_nameUpdateFailure = ID [{0}] ãæã€ãªãœãŒã¹ã°ã«ãŒãåã®å€æŽã«å€±æããŸãã - [{1}] ãã [{2}] ãžã®å€æŽãã§ããŸããã§ãã
view_group_summary_nameUpdateSuccessful = ID [{0}] ãæã€ãªãœãŒã¹ã°ã«ãŒãã [{1}] ãã [{2}] ãžã®å€æŽããŸãã
view_group_summary_recursive = ååž°
-view_helpTop_description = ãã®ã»ã¯ã·ã§ã³ã¯ããã¥ã¡ã³ããŒã·ã§ã³ããã¥ãŒããªã¢ã«ãããŒãžã§ã³ããã®ä»ã®ãã«ãæ
å ±ãæäŸããŸãã
view_help_section_product = ãããã¯ã
view_help_section_product_about = RHQã«ã€ããŠ
view_inventory_adq = ãã£ã¹ã«ããªãã¥ãŒ
@@ -1791,7 +1667,6 @@ view_inventory_resource_loadFailed = ID [{0}] ãæã€ãªãœãŒã¹ã¯ååšã
view_inventory_resources_deleteConfirm = éžæããããªãœãŒã¹ãåé€ãããã§ãã?
view_inventory_resources_deleteFailed = éžæããããªãœãŒã¹ã®åé€ã«å€±æããŸãã
view_inventory_resources_deleteSuccessful = ãã®ãªãœãŒã¹ãåé€ãããªã¯ãšã¹ãã¯(è€æ°ã®)ãšãŒãžã§ã³ãã«æ£ããéä¿¡ãããŸããã
-view_inventory_resources_disableConfirm = æ¬åœã«éžæãããªãœãŒã¹ãç¡å¹ã«ãããã§ãã? ç¡å¹ãªéã«ãšãŒãžã§ã³ãããå ±åãããã¢ãã€ã©ããªãã£ã¯ç¡èŠãããŸããç¡å¹åã¯éåžžæäœãä¿å®ã®äžéšãšããŠåæ¢ããããšãæåŸ
ãããŠãããªãœãŒã¹ã«å¯ŸããŠåœ¹ã«ç«ã¡ãŸãã
view_inventory_resources_disableFailed = éžæããããªãœãŒã¹ãç¡å¹åããã®ã«å€±æããŸããã
view_inventory_resources_disableSuccessful = éžæããããªãœãŒã¹ãšãã®åãšãªã [{0}] ãªãœãŒã¹ãç¡å¹åããã®ã«æåããŸããã
view_inventory_resources_enableConfirm = æ¬åœã«éžæããããªãœãŒã¹ãæå¹ãããã§ãã? æå¹ã®éã¯ãšãŒãžã§ã³ãããªãœãŒã¹ã®ã¢ãã€ã©ããªãã£ãå ±åãããŸã§ã¢ãã€ã©ããªãã£ã¯UNKNOWNã«èšå®ãããŸãããšãŒãžã§ã³ãã¯çŽè¿ã®éœåã®è¯ããšãã«çŸåšã®ã¢ãã€ã©ããªãã£ãå ±åããããã«èŠæ±ãããŸãã
@@ -1830,13 +1705,10 @@ view_login_invalidEmail = äžæ£ãªE-ã¡ãŒã«ã¢ãã¬ã¹
view_login_login = ãã°ã€ã³
view_login_logout = ãã°ã¢ãŠã
view_login_noBackend = ããã¯ãšã³ãããŒã¿ãœãŒã¹ã¯å©çšã§ããŸãã
-view_login_noLdap = 泚æïŒLDAP詳现ã®ä»»æã®åãåºãã¯æåããŸããã§ãããæåã§ã®å
¥åãèŠæ±ãããŸã
-view_login_noUser = å
¥åããããŠãŒã¶ãŒåãŸãã¯ãã¹ã¯ãŒãã¯èšé²ããããã®ãšäžèŽããŸãã
view_login_prompt = ãã°ã€ã³ããŠãã ãã
view_login_registerLater = (ãã£ã³ã»ã« - ç»é²ãåŸã§å®æãããŠãã ãã)
view_login_registerLdapSuccess = æ°ããLDAPãŠãŒã¶ãŒã®ç»é²ã«æåããŸãã
view_login_registerUser = ãŠãŒã¶ã®ç»é²
-view_login_welcomeMsg = {0}ãžãããã! <br/><br/> ç»é²ãå®æãããããã«æ¬¡ã®ãã£ãŒã«ããå
¥å/æŽæ°ããŠãã ããã<br/> "OK"ãã¯ãªãã¯ãããããã°ã€ã³ããŸãã<br/><br/>
view_measureRange_last = æéã®ç¯å² - çŽå
view_measureRange_simple = ã·ã³ãã«...
view_measureRange_start = æéã®ç¯å² - éå§
@@ -1869,7 +1741,6 @@ view_operationHistoryDetails_error_fetchFailure = ãªãã¬ãŒã·ã§ã³å±¥æŽã®
view_operationHistoryDetails_noResults = ãã®ãªãã¬ãŒã·ã§ã³ã¯å€ãè¿ããŸãã
view_operationHistoryDetails_operation = ãªãã¬ãŒã·ã§ã³
view_operationHistoryDetails_parameters = ãã©ã¡ãŒã¿ãŒ
-view_operationHistoryDetails_requestor = èŠæ±è
view_operationHistoryDetails_results = çµæ
view_operationHistoryDetails_status = ã¹ããŒã¿ã¹
view_operationHistoryList_button_forceDelete = 匷å¶åé€
@@ -1883,7 +1754,6 @@ view_operationHistoryList_button_runOperation = ãªãã¬ãŒã·ã§ã³ã®å®è¡
##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
view_operationHistoryList_notYetStarted = ãŸã éå§ããŠããŸãã
view_operationHistoryList_title = ãªãã¬ãŒã·ã§ã³å±¥æŽ
-view_operationScheduleDetails_enterParametersBelow = 以äžã«ãã©ã¡ãŒã¿ãŒãå
¥åããŠãã ãã...
view_operationScheduleDetails_fieldDefault_description = 説æãèŠããšãããªãã¬ãŒã·ã§ã³ãéžæããŠãã ãã
view_operationScheduleDetails_fieldDefault_parameters = ãã©ã¡ãŒã¿ãŒãèŠãããã«ãªãã¬ãŒã·ã§ã³ãéžæããŠãã ãã
view_operationScheduleDetails_fieldHelp_description = ãã®ã¹ã±ãžã¥ãŒã«ããããªãã¬ãŒã·ã§ã³ã®ããã®ä»»æã®èª¬æ (äŸãå€éä¿å®ã®ããã®ã¢ããªãµãŒããŒåèµ·åïŒ
@@ -1897,9 +1767,7 @@ view_portlet_autodiscovery_setting_platforms = çºèŠããããã©ãããã©
view_portlet_configure_definitionDesc = ããŒãã¬ããã®ããã®æ§æèšå®
view_portlet_configure_definitionTitle = ããŒãã¬ããæ§æ
view_portlet_configure_needed = èšå®ãã¿ã³ãæŒããŠãã®ããŒãã¬ãããæ§æããŠãã ãã
-view_portlet_configure_notNeeded = æ§æã¯ãã®ããŒãã¬ããã«ã¯å¿
èŠãããŸãã
view_portlet_defaultName_autodiscovery = ãã£ã¹ã«ããªãã¥ãŒ
-view_portlet_defaultName_favoriteResources = ãæ°ã«å
¥ããªãœãŒã¹
view_portlet_defaultName_groupMetric = ãªãœãŒã¹ã°ã«ãŒãã¡ããªãã¯ã°ã©ã
view_portlet_defaultName_group_alerts = ã°ã«ãŒã: ã¢ã©ãŒã
view_portlet_defaultName_group_bundles = ã°ã«ãŒã: ãã³ãã«ãããã€
@@ -1933,11 +1801,8 @@ view_portlet_help_autodiscovery = ãã®ããŒãã¬ããã¯æ°èŠã«çºèŠã
view_portlet_help_bundle_deps = ãã®ããŒãã¬ããã¯æ§æããããã£ã¹ãã¬ã€ã¯ã©ã€ããªã¢ãããŒã¹ã«ããé¢é£ãããã³ãã«ãããã€ã衚瀺ããŸã
view_portlet_help_config_updates = ãã®ããŒãã¬ããã¯æ§æèšå®ãšäžèŽããæè¿ã®æ§æå€æŽã衚瀺ããŸã
view_portlet_help_eventcounts = ãã®ããŒãã¬ããã¯æ§æããããã£ã¹ãã¬ã€ã¯ã©ã€ããªã¢ã«äžèŽããã€ãã³ãæ°ã衚瀺ããŸã
-view_portlet_help_favoriteResources = ãã®ããŒãã¬ããã¯çŸåšãŠãŒã¶ãŒã®ãæ°ã«å
¥ããªãœãŒã¹ã衚瀺ããŸã
view_portlet_help_graph = ãã®ããŒãã¬ããã¯ãªãœãŒã¹ã¡ããªãã¯ã°ã©ãã衚瀺ããŸã
view_portlet_help_inventorySummary = ãã®ããŒãã¬ããã¯çŸåšãŠãŒã¶ãŒã®é²èŠ§å¯èœãªã€ã³ãã³ããªãšã¡ããªãã¯åéçã®ã·ã§ãŒããµããªãŒã衚瀺ããŸã
-view_portlet_help_mashup = ãã®ããŒãã¬ããã¯(iframeãä»ããŠ)ãªã¢ãŒãHTTPãªã¯ãšã¹ããè¿ããå
容ã衚瀺ããŸã
-view_portlet_help_message = ãã®ããŒãã¬ããã¯éçãªHTMLã¡ãã»ãŒãžã衚瀺ããŸãã <i>message</i> ããããã£ã®æ§æãå¿
èŠã§ãã
view_portlet_help_metrics = ãã®ããŒãã¬ããã¯æ§æããããã£ã¹ãã¬ã€ã¯ã©ã€ããªã¢ãããŒã¹ã«ããŠé¢é£ããã¡ããªãã¯ããŒã¿ã®ã°ã©ããæããŸã
view_portlet_help_none = ãã®ããŒãã¬ããçšã®ãã«ãã¯å©çšã§ããŸãã
view_portlet_help_oobs = ãã®ããŒãã¬ãã㯠ç¯å²å€ã¡ããªãã¯æ¡ä»¶ã衚瀺ããŸã
@@ -1969,8 +1834,6 @@ view_portlet_problemResources_config_display_range = ããããæ°æéé¡ã£
view_portlet_problemResources_config_display_range2 = {0} ãã {1} ãŸã§
view_portlet_problemResources_maxDisplaySetting = æ倧ãªãœãŒã¹
view_portlet_recentAlerts_config_members = ã¡ã³ããŒã®éžæ
-view_portlet_recentAlerts_config_priority_label = åªå
ã¢ã©ãŒã
-view_portlet_recentAlerts_config_when = 次ã®æé以å
ã§
view_portlet_recentAlerts_fail_msg = ã¢ã©ãŒããã£ã«ã¿ãªã³ã°ã®ããã«å²ãåœãŠããããªãœãŒã¹ãããŒãããã®ã«å€±æããŸãã
view_portlet_recentlyAdded_error1 = æè¿è¿œå ããããªãœãŒã¹ãããŒãããã®ã«å€±æããŸãã
view_portlet_recentlyAdded_setting_addedPlatforms = æè¿è¿œå ããããã©ãããã©ãŒã
@@ -1978,19 +1841,15 @@ view_portlet_results_empty = æå®ãããã¯ã©ã€ããªã¢ã®çµæã¯èŠã€
view_remoteAgentInstall_agentStatus = ãšãŒãžã§ã³ãã®ã¹ããŒã¿ã¹
view_remoteAgentInstall_agentStatusDefault = -ã¹ããŒã¿ã¹ã®æŽæ°ãã¿ã³ãã¯ãªãã¯ããŠãã ãã-
view_remoteAgentInstall_buttonFindAgent = ãšãŒãžã§ã³ãã®çºèŠ
-view_remoteAgentInstall_connInfo = æ¥ç¶æ
å ±
view_remoteAgentInstall_error_1 = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«ãã¹ãæ¢ããŠããéã«ãšã©ãŒãçºçããŸãã
-view_remoteAgentInstall_error_2 = å
±éã®å Žæã§æ¢ããŠãããšãã«ãšãŒãžã§ã³ããèŠã€ããããšãã§ããŸããã§ãã
view_remoteAgentInstall_error_3 = [{0}] 以äžã«ã€ã³ã¹ããŒã«ããããšãŒãžã§ã³ãèŠã€ããããšãã§ããŸããã§ãã
view_remoteAgentInstall_error_4 = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«ã«å€±æããŸãã
view_remoteAgentInstall_error_5 = ãšãŒãžã§ã³ãã®éå§ã«å€±æããŸãã
view_remoteAgentInstall_error_6 = ãšãŒãžã§ã³ãã®åæ¢ã«å€±æããŸãã
view_remoteAgentInstall_installAgent = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«
-view_remoteAgentInstall_installInfo = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«æ
å ±
view_remoteAgentInstall_installPath = ãšãŒãžã§ã³ãã®ã€ã³ã¹ããŒã«ãã¹
view_remoteAgentInstall_owner = ãªãŒããŒ
view_remoteAgentInstall_promptHost = ãšãŒãžã§ã³ããã€ã³ã¹ããŒã«ãããŠããããããã¯ããããã€ã³ã¹ããŒã«ããããã¹ã
-view_remoteAgentInstall_promptInstallPath = ãšãŒãžã§ã³ããã€ã³ã¹ããŒã«ãããŠããããããã¯ããããã€ã³ã¹ããŒã«ãããå Žæãã©ãã«ã€ã³ã¹ããŒã«ãããã確信ããªããªãã芪ãã£ã¬ã¯ããªãå
¥åããŠã''ãšãŒãžã§ã³ãã®çºèŠ''ãã¿ã³ãã¯ãªãã¯ããã®ãã£ã¬ã¯ããªä»¥äžãã¹ãã£ã³ããŠãã ããã空ã®ãã¹ãå
¥åãããªãããšãŒãžã§ã³ããã€ã³ã¹ããŒã«ãããã¹ãäžã®å
±éã®å Žæãæ¢çŽ¢ãããŸãã
view_remoteAgentInstall_promptPassword = SSHãä»ããŠãã¹ãäžã®ãŠãŒã¶ãŒãèªèšŒããããã«äœ¿ãããã¯ã¬ãã³ã·ã£ã«
view_remoteAgentInstall_promptPort = SSHãµãŒããŒããªã¹ã³ããããŒããæå®ãããªããã°ãããã©ã«ãã¯22ã§ãã
view_remoteAgentInstall_promptUser = SSHãä»ããŠãã¹ãã«æž¡ãããã¯ã¬ãã³ã·ã£ã«ãä¿æãããŠãŒã¶ãŒã®åå
@@ -2015,12 +1874,10 @@ view_reports_subsystems = ãµãã·ã¹ãã
view_resourceResourceGroupList_error_fetchFailure = ãªãœãŒã¹ã®ã°ã«ãŒãã®åãåºãã«å€±æããŸãã
view_resourceResourceGroupList_error_updateFailure = å²ãåœãŠããããªãœãŒã¹ã°ã«ãŒãã®æŽæ°ã«å€±æããŸãã
view_resourceResourceGroupList_message_updateSuccess = [{0}] ã®ããã«æŽæ°ãããã°ã«ãŒãã¡ã³ããŒã·ãã.
-view_resource_inventory_activity_changed_by = æŽæ°è
view_resource_inventory_activity_criteria_no_recent_events = 衚瀺ã¯ã©ã€ããªã¢ã«åºã¥ãã€ãã³ãã¯ãããŸãã
view_resource_inventory_activity_no_recent_alerts = æè¿ã®ã¢ã©ãŒãã¯ãããŸãã
view_resource_inventory_activity_no_recent_bundle_deploy = æè¿ã®ãã³ãã«ãããã€ã¡ã³ãã¯ãããŸãã
view_resource_inventory_activity_no_recent_config_history = æ§æå€æŽå±¥æŽã¯ãããŸãã
-view_resource_inventory_activity_no_recent_events = çŽè¿24æé以å
ã«ã€ãã³ãã¯ãããŸãã
view_resource_inventory_activity_no_recent_metrics = ãã®ãªãœãŒã¹ã«ã¯æè¿ã®ã¡ããªãã¯ã¯ãããŸãã
view_resource_inventory_activity_no_recent_oob = ç¯å²å€ã®æ¡ä»¶ã¯ã¿ã€ãããŸãã
view_resource_inventory_activity_no_recent_operations = æè¿ã®ãªãã¬ãŒã·ã§ã³å±¥æŽã¯ãããŸãã
@@ -2032,30 +1889,20 @@ view_resource_inventory_childhistory_status_invalidArtifact = äžæ£ãªçæç©
view_resource_inventory_childhistory_status_invalidConfig = äžæ£ãªæ§æ
view_resource_monitor_availability_currentAsOf = ãã®ããŒã¿ã¯ {0} ã®çŸåšã®ãã®ã§ãã
view_resource_monitor_availability_currentStatus = çŸåšã®ã¹ããŒã¿ã¹
-view_resource_monitor_availability_currentStatus_value = ãã®ãªãœãŒã¹ã¯ {1} ãã {0} ã®ç¶æ
ã®ãŸãŸã§ã
view_resource_monitor_availability_disabledTime = ç¡å¹åãããæé
-view_resource_monitor_availability_disabledTime_tooltip = ãªãœãŒã¹ãDISABLEDç¶æ
ã§ãã环ç©æé
view_resource_monitor_availability_downtime = åæ¢æé
-view_resource_monitor_availability_downtime_tooltip = ãªãœãŒã¹ãDOWNç¶æ
ã§ãã环ç©æé
view_resource_monitor_availability_loadFailed = ã¢ãã€ã©ããªãã£å±¥æŽã®ããŒãã«å€±æããŸãã
view_resource_monitor_availability_mtbf = MTBF
-view_resource_monitor_availability_mtbf_tooltip = å¹³åæ
éééïŒMean Time Before Failure) - ã€ãŸããããã¯DOWNããåã«UPç¶æ
ã§è²»ããããå¹³åæéãæå³ããŸã
view_resource_monitor_availability_mttr = MTTR
-view_resource_monitor_availability_mttr_tooltip = å¹³å埩æ§æé (Mean Time To Recovery) - ã€ãŸããããã¯å床UPããåã«DOWNç¶æ
ã§è²»ããããå¹³åæéãæå³ããŸã
view_resource_monitor_availability_numDisabled = ç¡å¹ååæ°
-view_resource_monitor_availability_numDisabled_tooltip = ãªãœãŒã¹ãDISABLEDç¶æ
ã«å
¥ã£ãåæ°ã®åèš
view_resource_monitor_availability_numFailures = é害æ°
-view_resource_monitor_availability_numFailures_tooltip = ãªãœãŒã¹ãDOWNç¶æ
ã«å
¥ã£ãåæ°ã®åèš
view_resource_monitor_availability_summaryError = ãªãœãŒã¹ã¢ãã€ã©ããªãã£ã®ãµããªãããŒãããã®ã«å€±æããŸãã
view_resource_monitor_availability_tooltip_disabled = ãªãœãŒã¹ãDISABLEDã§ããæéãèµ·åãåæ¢ã®æéãšæ¯èŒããããŒã»ã³ããŒãž
view_resource_monitor_availability_tooltip_down = ãªãœãŒã¹ãDOWNããŠããæéãèµ·åãç¡å¹åã®æéãšæ¯èŒããããŒã»ã³ããŒãž
##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled
-view_resource_monitor_availability_unknown = ãã®ãªãœãŒã¹ã¯ {0} ã®éã¯æªç¥ã®ç¶æ
ã§ããã
view_resource_monitor_availability_uptime = èµ·åæé
-view_resource_monitor_availability_uptime_tooltip = ãªãœãŒã¹ãUPç¶æ
ã§ãã环ç©æé
view_resource_monitor_calltime_average = å¹³å
view_resource_monitor_calltime_count = æ°
-view_resource_monitor_calltime_destination = åŒã³åºãã®å®å
##view_resource_monitor_calltime_destinationFilter = Destination Filter
view_resource_monitor_calltime_loadFailed = åŒã³åºãæéããŒã¿ãããŒãã§ããŸãã
view_resource_monitor_calltime_maximum = æ倧
@@ -2073,7 +1920,6 @@ view_resource_monitor_table_avg = å¹³å
##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = æ倧
view_resource_monitor_table_min = æå°
-view_resource_title_component_errors_cleanup = åé¡ã«åãçµãã åŸã¯ã以äžã®ã¡ãã»ãŒãžãåé€ããŠå
šç»é¢ã®'管çã³ã³ããŒãã³ããšã©ãŒ'ãã¯ãªã¢ããå¿
èŠããããŸãã
view_resource_title_component_errors_tooltip = 管çã³ã³ããŒãã³ããšã©ãŒã®è¡šç€ºã詳现ã¯ã¯ãªãã¯ããŠãã ãã
view_resource_title_tagUpdateFailed = ãªãœãŒã¹ã¿ã°ã®æŽæ°ã«å€±æããŸãã
##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
@@ -2089,8 +1935,6 @@ view_searchBar_savedSearch_namePrompt = ãã¿ãŒã³ãååãä»ããŠãã
view_searchBar_savedSearch_rename = ä¿åæžã¿æ€çŽ¢ã®ååã [{0}] ãžå€æŽããã®ã«æåããŸãã
view_searchBar_savedSearch_save = [{0}] ãšããååã®ä¿åæžã¿æ€çŽ¢ãäœæããã®ã«æåããŸãã
view_searchBar_suggest_failSuggest = ãµãžã§ãã·ã§ã³ã®äœæã«å€±æããŸãããå¯èœæ§ã®ãããšã©ãŒããµãŒããŒãã°ãã調ã¹ãŠãã ããã
-view_searchBar_suggest_noSuggest = äžä»¶ãäžèŽããŸããã§ãããç°ãªããã¿ãŒã³ãå
¥åããŠãã ããã
-view_searchGUI_loginStatus = ãã°ã€ã³ã¹ããŒã¿ã¹ã確å®ã§ããŸããããµãŒããŒã®ç¶æ
ã調ã¹ãŠãã ãã
view_selector_assigned = å²ãåœãŠããã {0}
view_selector_available = å©çšå¯èœãª {0}
view_subTab_error_disabled = ç¡å¹ã«ãªã£ããµãã¿ã [{0}] ãéžæã§ããŸãã
@@ -2159,20 +2003,11 @@ view_tags_error_1 = ã¿ã°ãããŒãããã®ã«å€±æããŸãã
view_tags_tags = ã¿ã°
view_tags_tooltip_1 = ã¯ãªãã¯ãããšãã®ã¿ã°ãåé€ããŸã
view_tags_tooltip_2 = ã¯ãªãã¯ãããšã¿ã°ãç·šéããŸã
-view_tags_tooltip_3 = 次ã®ãã©ãŒãããã§ã¿ã°ãå
¥åããŠãã ãã: (namespace:)(semantic=)tagname (äŸ it:env=QA, or owner=John)
view_testTop_description = ãã®ã»ã¯ã·ã§ã³ã¯ããŸããŸãªGUIã³ã³ããŒãã³ãããã¹ãããããã®ããŒãžãå«ãã§ããŸã
view_testTop_title = ãã¹ã
-view_titleBar_common_addedFav = [{0}] ããæ°ã«å
¥ããšããŠè¿œå ããŸãã
-view_titleBar_common_addedFavFailure = [{0}] ããæ°ã«å
¥ããšããŠè¿œå ããã®ã«å€±æããŸãã
-view_titleBar_common_clickToAddFav = ã¯ãªãã¯ãããšããããæ°ã«å
¥ããšããŠè¿œå ããŸã
-view_titleBar_common_clickToRemoveFav = ã¯ãªãã¯ãããšããããæ°ã«å
¥ãããåé€ããŸã
view_titleBar_common_loadTagsFailure = [{0}] ã®ããã®ã¿ã°ãããŒãããã®ã«å€±æããŸãã
-view_titleBar_common_removedFav = ãæ°ã«å
¥ããã [{0}] ãåé€ããŸãã
-view_titleBar_common_removedFavFailure = ãæ°ã«å
¥ããã [{0}] ãåé€ããã®ã«å€±æããŸãã
view_titleBar_common_updateTagsFailure = [{0}] ã®ã¿ã°ã®æŽæ°ã«å€±æããŸãã
view_titleBar_common_updateTagsSuccessful = [{0}] ã®ã¿ã°ãæŽæ°ãããŸãã
-view_titleBar_group_failInfo = ID [{1}] ãæã€ã°ã«ãŒã [{0}] ã«é¢ããäžè¬æ
å ±ãååŸããã®ã«å€±æããŸãã
-view_titleBar_group_summary_collapsedTooltip = ã¯ãªãã¯ãããšãã®ã°ã«ãŒãã®è©³çŽ°æ
å ±ã衚瀺ããŸã
view_titleBar_group_summary_expandedTooltip = ã¯ãªãã¯ãããšãã®ã°ã«ãŒãã®è©³çŽ°ãé ããŸã
view_tree_common_contextMenu_addChartToDashboard = ããã·ã¥ããŒã [{0}] ãžãã£ãŒããè¿œå ããŸã
view_tree_common_contextMenu_editPluginConfiguration = [{0}] ãã©ã°ã€ã³æ§æãç·šéããŸã
@@ -2207,7 +2042,6 @@ view_type_resourceTypes = ãªãœãŒã¹ã¿ã€ã
view_type_typeTreeLoadFailure = ãªãœãŒã¹ã¿ã€ãã®ããªãŒããŒã¿ãããŒãããã®ã«å€±æããŸãã
view_upload_alreadyUploaded = ãã¡ã€ã«ã¯ãã§ã«æŽæ°ãããŠããŸãã
view_upload_bundleDistFile = åæ£ãã¡ã€ã«
-view_upload_error_bundleDistFile = ãã³ãã«é
åžãã¡ã€ã«ã®ã¢ããããŒããšã©ãŒ
view_upload_error_file = ãã¡ã€ã«ã¢ããããŒããšã©ãŒ
view_upload_error_fileName = ãã¡ã€ã«ã¢ããããŒããšã©ãŒ [{0}]
view_upload_error_fileName_2 = [{0}] ã®ã¢ããããŒããšã©ãŒã§ããäžæ£ãªãã¡ã€ã«ãã¹ã調ã¹ãŠãã ããã
@@ -2223,7 +2057,6 @@ view_upload_tooltip_2 = ãã¡ã€ã«ã¢ããããŒãã¯ä»¥å倱æããŠã
view_upload_upload = ã¢ããããŒã
view_upload_uploadFile = ã¢ããããŒããã¡ã€ã«
widget_colorPicker_tooltip = æ°èŠã«ã©ãŒãéžæããããã«ã¯ãªãã¯ããŠãã ãã
-widget_durationItem_inputUnitLessThanTargetUnit = å
¥ååäœã¯ã¿ãŒã²ããåäœãããå°ããã§ã
widget_durationItem_unitTypeNotSupported = åäœã®ã¿ã€ã [{0}] ã¯ãã® DurationItem ã«ãããµããŒããããŸãã
widget_jobTriggerEditor_fieldHelp_repeatDuration = ãã®ãªãã¬ãŒã·ã§ã³ãäœåãå®è¡ãããããŸãã¯æå®ãããæéãçµäºãããŸã§å®è¡ãç¶ããŸã
widget_jobTriggerEditor_fieldHelp_repeatInterval = ãªãã¬ãŒã·ã§ã³ãå®è¡ãããé »åºŠ
@@ -2250,11 +2083,8 @@ widget_jobTriggerEditor_value_nowAndRepeat = çŸåš & ç¹°ãè¿ã
widget_jobTriggerEditor_value_on = on
widget_jobTriggerEditor_value_until = Until
widget_recordEditor_error_invalidViewPath = ç¡å¹ãªãã¥ãŒãã¹: [{0}]
-widget_recordEditor_error_multipleRecords = è€æ°ã¬ã³ãŒããèŠã€ãããŸãã - 1ã€ã ããæåŸ
ãããŠããŸã
-widget_recordEditor_error_noRecords = ã¬ã³ãŒããäžã€ãèŠã€ãããŸããã§ãã - 1ã€ã ããæåŸ
ãããŠããŸã
widget_recordEditor_error_operation = ãªãã¬ãŒã·ã§ã³ã倱æããŸããããšã©ãŒãçºçããŸããã
widget_recordEditor_error_operationInvalidValues = ãªãã¬ãŒã·ã§ã³ã倱æããŸããã - äžã€ä»¥äžã®ãã£ãŒã«ããç¡å¹ãªå€ãæã£ãŠããŸã
-widget_recordEditor_error_permissionCreate = [{0}] ãæ°èŠäœæããããã«å¿
èŠãªæš©éãæã£ãŠããŸãã
widget_recordEditor_error_unsupportedOperationType = ãµããŒãå€ã®ãªãã¬ãŒã·ã§ã³ ã¿ã€ã: [{0}]
widget_recordEditor_info_recordCreatedConcise = {0} ãäœæãããŸããã
widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] ãäœæãããŸããã
@@ -2272,7 +2102,6 @@ widget_resourceFactoryWizard_contentTemplatePrompt = ãããã€æéæ§æã
widget_resourceFactoryWizard_createWizardTitle = ã¿ã€ã [{0}] ã®æ°èŠãªãœãŒã¹ã®äœæ
widget_resourceFactoryWizard_createWizardWindowTitle = ãªãœãŒã¹äœæãŠã£ã¶ãŒã
widget_resourceFactoryWizard_editConfigStepName = ç·šéã®æ§æ
-widget_resourceFactoryWizard_editConfigStep_nothingToDo = ãã®ãªãœãŒã¹ã®ããã«å®çŸ©ãå¿
èŠãªæ§æã¯ååšããŸãã
widget_resourceFactoryWizard_execute1 = æ°èŠãªãœãŒã¹ã®äœæã«å€±æããŸãã - ããã±ãŒãžããŒãžã§ã³ãååšããŸãã
#widget_resourceFactoryWizard_execute2 = Failed to create a new resource. Cannot connect to the agent. This may indicate that the agent is down.
widget_resourceFactoryWizard_failedToDeleteVersion = ãªãœãŒã¹äœæã®ãã£ã³ã»ã«äžã«ããã±ãŒãžããŒãžã§ã³ã®åé€ã«å€±æããŸãã
@@ -2282,7 +2111,6 @@ widget_resourceFactoryWizard_importFailure = æåã§ã®ãªãœãŒã¹ã®ã€ã³
widget_resourceFactoryWizard_importSubmitted = æ°èŠãªãœãŒã¹ã¿ã€ã [{0}] ã®ã€ã³ããŒããªã¯ãšã¹ããéä¿¡ãããŸãã
widget_resourceFactoryWizard_importWizardTitle = ãªãœãŒã¹ã¿ã€ã [{0}] ãã€ã³ããŒã
widget_resourceFactoryWizard_importWizardWindowTitle = ãªãœãŒã¹ã€ã³ããŒããŠã£ã¶ãŒã
-widget_resourceFactoryWizard_infoStepName = ãªãœãŒã¹æ
å ±
widget_resourceFactoryWizard_infoStep_loadFail = ã¢ãŒããã¯ãã£ãŒãå©çšå¯èœã«ããã®ã«å€±æããŸãã
widget_resourceFactoryWizard_namePrompt = æ°èŠãªãœãŒã¹å
#widget_resourceFactoryWizard_nameComment = Not all management plug-ins or their managed resources allow the agent to set the name for a new resource. This value will only be used by agent plug-ins that support the capability. For plug-ins that do not support the capability, the resource may receive a generic or different name when it is discovered.
@@ -2291,7 +2119,6 @@ widget_resourceFactoryWizard_templatePrompt = ã³ãã¯ã·ã§ã³èšå®ãã³ã
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
widget_resourceFactoryWizard_uploadFailure = ãã¡ã€ã«ã¢ããããŒãã®å€±æ
widget_resourceFactoryWizard_uploadFileStepName = ãªãœãŒã¹ã³ã³ãã³ããã¡ã€ã«ã®ã¢ããããŒã
-widget_resourceFactoryWizard_uploadInProgress = ã¢ããããŒãã¯åŠçäžã§ã... 倧ããªãã¡ã€ã«ãé
åžããã«ã¯æ°åãããããšããããŸãã
widget_resourceFactoryWizard_versionPrompt = ããã±ãŒãžããŒãžã§ã³
widget_resourceSelector_groupCategory = ã°ã«ãŒãã«ããŽãª
widget_resourceSelector_pleaseSelectMultipleResource = äžã€ä»¥äžã®ãªãœãŒã¹ãéžæããŠãã ãã
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
index fe6307b..d640aa9 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
@@ -443,12 +443,12 @@ util_userSession_loadFailSubject = UserSessionManager: ì¬ì©ì Subject ë¡ë
util_userSession_logoutFail = ë¡ê·žììì ì€íšíìµëë€
util_widgetsField_unlimited = 묎ì í
view_aboutBox_allRightsReserved = All Rights Reserved.
-view_aboutBox_buildNumber = ë¹ë ë²íž:
+view_aboutBox_buildNumber = ë¹ë ë²íž
view_aboutBox_failedToLoad = ì í ì 볎ì ë¡ëì ì€íšíìµëë€..
view_aboutBox_homepage = ííìŽì§
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = {0}ì êŽíì¬
-view_aboutBox_version = ë²ì :
+view_aboutBox_version = ë²ì
view_adminConfig_agentPlugins = ììŽì íž íë¬ê·žìž
view_adminConfig_downloads = ë€ìŽë¡ë
##view_adminConfig_ignoreResourceTypes = Ignored Resource Types
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
index 0840783..c8ab1b8 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
@@ -492,12 +492,12 @@ util_userSession_loadFailSubject = UserSessionManager: Falha ao carregar a crede
util_userSession_logoutFail = Falha durante o logout.
util_widgetsField_unlimited = Ilimitado
view_aboutBox_allRightsReserved = Todos os Direitos Reservados.
-view_aboutBox_buildNumber = N\u00FAmero do Build:
+view_aboutBox_buildNumber = N\u00FAmero do Build
view_aboutBox_failedToLoad = Falha ao carregar informa\u00E7oes do produto.
view_aboutBox_homepage = P\u00E1gina Inicial
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = Sobre {0}
-view_aboutBox_version = Vers\u00E3o:
+view_aboutBox_version = Vers\u00E3o
##view_adminConfig_agentPlugins = Agent Plugins
##view_adminConfig_alertDefTemplates = Alert Definition Templates
view_adminConfig_downloads = Downloads
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
index 744ab8c..fa5d9d4 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
@@ -2585,12 +2585,12 @@ util_userSession_loadFailSubject = UserSessionManager\: Ме ÑЎалПÑÑ Ð·Ð°
util_userSession_logoutFail = Ðе ÑЎалПÑÑ Ð²ÑйÑО Оз ÑОÑÑеЌÑ.
util_widgetsField_unlimited = ÐеПгÑаМОÑеММÑй
view_aboutBox_allRightsReserved = ÐÑе пÑава заÑОÑеМÑ.
-view_aboutBox_buildNumber = ÐÐŸÐŒÐµÑ ÑбПÑкО\:
+view_aboutBox_buildNumber = ÐÐŸÐŒÐµÑ ÑбПÑкО\
view_aboutBox_failedToLoad = Ðе ÑЎалПÑÑ Ð·Ð°Ð³ÑÑзОÑÑ ÐžÐœÑПÑЌаÑÐžÑ ÐŸ пÑПЎÑкÑе.
view_aboutBox_homepage = ÐПЌаÑÐœÑÑ ÑÑÑаМОÑа
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = Ð {0}
-view_aboutBox_version = ÐеÑÑОÑ\:
+view_aboutBox_version = ÐеÑÑОÑ\
view_adminConfig_downloads = ÐагÑÑзкО
##view_adminConfig_ignoreResourceTypes = Ignored Resource Types
##view_adminConfig_ignoreResourceTypes_changeTitle = Change?
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
index e7ac94d..ac873e4 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
@@ -481,12 +481,12 @@ util_userSession_loadFailSubject = UserSessionManager: \u52a0\u8f7d\u7528\u6237\
util_userSession_logoutFail = \u6ce8\u9500\u5931\u8d25.
util_widgetsField_unlimited = \u65e0\u9650\u5236
view_aboutBox_allRightsReserved = All Rights Reserved.
-view_aboutBox_buildNumber = \u4ea7\u54c1\u7f16\u8bd1\u53f7:
+view_aboutBox_buildNumber = \u4ea7\u54c1\u7f16\u8bd1\u53f7
view_aboutBox_failedToLoad = \u52a0\u8f7d\u4ea7\u54c1\u4fe1\u606f\u5931\u8d25.
view_aboutBox_homepage = \u4e3b\u9875
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = \u5173\u4e8e {0}
-view_aboutBox_version = \u7248\u672c:
+view_aboutBox_version = \u7248\u672c
##view_adminConfig_agentPlugins = Agent Plugins
##view_adminConfig_alertDefTemplates = Alert Definition Templates
view_adminConfig_downloads = \u4e0b\u8f7d
10 years, 6 months
[rhq] Branch 'release/jon3.2.x' - modules/enterprise
by mazz
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 84 ++++++++++
1 file changed, 84 insertions(+)
New commits:
commit 3d9d35d3c8ace96e931c719908cd0c37ef2a7919
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Oct 23 16:13:04 2013 -0400
BZ 1022573 - tell the agent where the server is
(cherry picked from commit 92f4f9c10e5e11efd79284b88286ee034309dc64)
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
index 6502ebc..6561c22 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
@@ -50,6 +50,7 @@ import org.jboss.as.controller.client.ModelControllerClient;
import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient;
import org.rhq.common.jbossas.client.controller.MCCHelper;
+import org.rhq.core.util.PropertiesFileUpdate;
import org.rhq.core.util.file.FileReverter;
import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
@@ -73,6 +74,10 @@ public abstract class AbstractInstall extends ControlCommand {
private static final String PREF_RHQ_AGENT_CONFIGURATION_SETUP_FLAG = "rhq.agent.configuration-setup-flag";
private static final String PREF_RHQ_AGENT_AUTO_UPDATE_FLAG = "rhq.agent.agent-update.enabled";
private static final String PREF_RHQ_AGENT_SECURITY_TOKEN = "rhq.agent.security-token";
+ private static final String PREF_RHQ_AGENT_SERVER_TRANSPORT = "rhq.agent.server.transport";
+ private static final String PREF_RHQ_AGENT_SERVER_BINDADDRESS = "rhq.agent.server.bind-address";
+ private static final String PREF_RHQ_AGENT_SERVER_BINDPORT = "rhq.agent.server.bind-port";
+ private static final String PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS = "rhq.agent.server.transport-params";
protected void installWindowsService(File workingDir, String batFile, boolean replaceExistingService, boolean start)
throws Exception {
@@ -699,6 +704,26 @@ public abstract class AbstractInstall extends ControlCommand {
preferencesNode.put(PREF_RHQ_AGENT_SECURITY_TOKEN, securityToken);
}
+ // get the configured server endpoint information and tell the agent so it knows where the server is.
+ Properties serverEndpoint = getAgentServerEndpoint();
+ String endpointTransport = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_TRANSPORT);
+ String endpointAddress = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS);
+ String endpointPort = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_BINDPORT);
+ String endpointParams = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS);
+ if (endpointTransport != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_TRANSPORT, endpointTransport);
+ }
+ if (endpointAddress != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_BINDADDRESS, endpointAddress);
+ }
+ if (endpointPort != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_BINDPORT, endpointPort);
+ }
+ if (endpointParams != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS, endpointParams);
+ }
+
+ // if the user provided any overrides to the agent config, use them.
overrideAgentPreferences(commandLine, preferencesNode);
// set some prefs that must be a specific value
@@ -719,6 +744,65 @@ public abstract class AbstractInstall extends ControlCommand {
}
}
+ /**
+ * Returns the server endpoint that the agent should use when connecting to the server.
+ *
+ * @return properties with the values - only those values that could be determined will be in here
+ *
+ * @throws Exception if could not determine the values due to a runtime error
+ */
+ private Properties getAgentServerEndpoint() throws Exception {
+ Properties endpointData = new Properties();
+
+ // load in the server properties file to find out how the server will be listening for agent messages
+ File serverPropsFile = getServerPropertiesFile();
+ Properties serverProps = new PropertiesFileUpdate(serverPropsFile).loadExistingProperties();
+
+ // transport and transport params
+ String transport = serverProps.getProperty("rhq.communications.connector.transport", "servlet");
+ endpointData.put(PREF_RHQ_AGENT_SERVER_TRANSPORT, transport);
+
+ String params = serverProps.getProperty("rhq.communications.connector.transport-params");
+ if (params != null && params.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS, params.trim());
+ }
+
+ // address and port depends on the transport
+ if (transport.contains("servlet")) {
+ String port;
+ if (transport.contains("ssl")) {
+ port = serverProps.getProperty("rhq.server.socket.binding.port.https");
+ } else {
+ port = serverProps.getProperty("rhq.server.socket.binding.port.http");
+ }
+ if (port != null && port.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDPORT, port.trim());
+ }
+
+ String address = serverProps.getProperty("jboss.bind.address");
+ if (address != null && address.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS, address.trim());
+ }
+ } else {
+ String port = serverProps.getProperty("rhq.communications.connector.bind-port");
+ if (port != null && port.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDPORT, port.trim());
+ }
+ String address = serverProps.getProperty("rhq.communications.connector.bind-address");
+ if (address != null && address.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS, address.trim());
+ }
+ }
+
+ // the public endpoint will override anything that was done above
+ String publicEndpoint = serverProps.getProperty("rhq.autoinstall.public-endpoint-address");
+ if (publicEndpoint != null && publicEndpoint.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS, publicEndpoint.trim());
+ }
+
+ return endpointData;
+ }
+
private void overrideAgentPreferences(CommandLine commandLine, Preferences preferencesNode) {
// override the out of box config with user custom agent preference values
String[] customPrefs = commandLine.getOptionValues(AGENT_PREFERENCE);
10 years, 6 months
[rhq] Branch 'release/jon3.2.x' - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java | 4 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 8c2426e96885770cb15235abc6ef0fb23e5bf731
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Oct 24 12:26:48 2013 -0700
[BZ 1017266] - blank.png images on group list pages
(cherry picked from commit 4830ef836fd8ec867a85aef5a6fe4a15e8a16001)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java
index a505f58..0bfd2a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java
@@ -594,6 +594,10 @@ public class ImageManager {
return "subsystems/inventory/CreateChild_16.png";
}
+ public static String getBlankIcon() {
+ return IMAGES_DIR+"blank.png";
+ }
+
public static String getChildCreateIcon(CreateResourceStatus createStatus) {
if (createStatus == null) {
return getChildCreateIcon();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 118d1f2..9943127 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -259,7 +259,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
results.append(getColumn(false, " <img height=\"12\" width=\"12\" src=\"" + imagePath + "\" />", up));
} else {
results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"12px\" height=\"12px\" />"));
+ " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"12px\" height=\"12px\" />"));
}
if (down > 0) {
@@ -268,7 +268,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
results.append(getColumn(false, " <img height=\"12\" width=\"12\" src=\"" + imagePath + "\" />", down));
} else {
results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"12px\" height=\"12px\" />"));
+ " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"12px\" height=\"12px\" />"));
}
if (disabled > 0) {
@@ -278,7 +278,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
disabled));
} else {
results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"12px\" height=\"12px\" />"));
+ " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"12px\" height=\"12px\" />"));
}
if (unknown > 0) {
@@ -288,7 +288,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
unknown));
} else {
results
- .append(getColumn(false, " <img src=\"/images/blank.png\" width=\"1px\" height=\"1px\" />"));
+ .append(getColumn(false, " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"1px\" height=\"1px\" />"));
}
}
results.append("</tr></table>");
10 years, 6 months
[rhq] modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java | 4 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 4830ef836fd8ec867a85aef5a6fe4a15e8a16001
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Oct 24 12:26:48 2013 -0700
[BZ 1017266] - blank.png images on group list pages
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java
index a505f58..0bfd2a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/ImageManager.java
@@ -594,6 +594,10 @@ public class ImageManager {
return "subsystems/inventory/CreateChild_16.png";
}
+ public static String getBlankIcon() {
+ return IMAGES_DIR+"blank.png";
+ }
+
public static String getChildCreateIcon(CreateResourceStatus createStatus) {
if (createStatus == null) {
return getChildCreateIcon();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 118d1f2..9943127 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -259,7 +259,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
results.append(getColumn(false, " <img height=\"12\" width=\"12\" src=\"" + imagePath + "\" />", up));
} else {
results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"12px\" height=\"12px\" />"));
+ " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"12px\" height=\"12px\" />"));
}
if (down > 0) {
@@ -268,7 +268,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
results.append(getColumn(false, " <img height=\"12\" width=\"12\" src=\"" + imagePath + "\" />", down));
} else {
results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"12px\" height=\"12px\" />"));
+ " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"12px\" height=\"12px\" />"));
}
if (disabled > 0) {
@@ -278,7 +278,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
disabled));
} else {
results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"12px\" height=\"12px\" />"));
+ " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"12px\" height=\"12px\" />"));
}
if (unknown > 0) {
@@ -288,7 +288,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
unknown));
} else {
results
- .append(getColumn(false, " <img src=\"/images/blank.png\" width=\"1px\" height=\"1px\" />"));
+ .append(getColumn(false, " <img src=\""+ImageManager.getBlankIcon()+"\" width=\"1px\" height=\"1px\" />"));
}
}
results.append("</tr></table>");
10 years, 6 months
[rhq] Branch 'release/jon3.2.x' - modules/enterprise
by mazz
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 2 +-
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 91516a56d7db69f1fe85408fb7c543c09b6ec1e3
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 8 11:48:17 2013 -0400
BZ 1016703 - change the out-of-box default for a port that conflicted with EAP5.1. This way, you can run EAP 5.1 on the same machine as RHQ without having to change configuration (this should only be done for testing / demoing anyway - in production you should not be running RHQ with other app servers on the same machine)
(cherry picked from commit d3d11da8b475004ffe459cb9eca4964532592e99)
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index ac8bc3b..67eff91 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -636,7 +636,7 @@ rhq.server.socket.binding.port.http=7080
rhq.server.socket.binding.port.https=7443
rhq.server.socket.binding.port.jacorb=2528
rhq.server.socket.binding.port.jacorb-ssl=2529
-rhq.server.socket.binding.port.messaging=4445
+rhq.server.socket.binding.port.messaging=4449
rhq.server.socket.binding.port.messaging-throughput=4455
rhq.server.socket.binding.port.osgi-http=7090
rhq.server.socket.binding.port.remoting=3447
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index f2e1ec6..b4db4e0 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -137,7 +137,7 @@ public class ServerInstallUtil {
defaultSocketBindings.add(new SocketBindingInfo(SocketBindingJBossASClient.DEFAULT_BINDING_JACORB_SSL,
"rhq.server.socket.binding.port.jacorb-ssl", 2529));
defaultSocketBindings.add(new SocketBindingInfo(SocketBindingJBossASClient.DEFAULT_BINDING_MESSAGING,
- "rhq.server.socket.binding.port.messaging", 4445, "management"));
+ "rhq.server.socket.binding.port.messaging", 4449, "management"));
defaultSocketBindings.add(new SocketBindingInfo(SocketBindingJBossASClient.DEFAULT_BINDING_MESSAGING_THRUPUT,
"rhq.server.socket.binding.port.messaging-throughput", 4455, "management"));
defaultSocketBindings.add(new SocketBindingInfo(SocketBindingJBossASClient.DEFAULT_BINDING_MGMT_HTTP,
10 years, 6 months
[rhq] etc/eclipse-tools etc/test-apps modules/core modules/plugins
by Thomas Segismont
etc/eclipse-tools/templates/formatter-profile.xml | 6
etc/test-apps/javaee6-test-app/pom.xml | 97 +++
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleEntity.java | 53 ++
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleQueueMDB.java | 38 +
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleSingleton.java | 44 +
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateful.java | 29 +
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateless.java | 29 +
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleTopicMDB.java | 38 +
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebService.java | 34 +
etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebServiceImpl.java | 33 +
etc/test-apps/javaee6-test-app/src/main/resources/META-INF/persistence.xml | 34 +
etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/beans.xml | 25
etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-ds.xml | 34 +
etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-jms.xml | 34 +
modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java | 3
modules/plugins/jboss-as-7/pom.xml | 1
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java | 264 ++++++++++
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java | 151 +----
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java | 45 +
modules/plugins/jboss-as-7/src/test/resources/itest/javaee6-test-app.war |binary
modules/plugins/jboss-as-7/src/test/resources/log4j.xml | 12
22 files changed, 901 insertions(+), 105 deletions(-)
New commits:
commit ec97c8c7e65ba71b7f8b47fce8c799f2586aa513
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Thu Oct 24 11:09:36 2013 +0200
Bug 1022409 - AS7 plugin: "Hibernate Persistence Unit" service does not show up
Bug due to a typo in the plugin descriptor ('persistance' instead of 'persistence')
Added Sample JavaEE6 application
Added integration test for deployment "*Runtime" child resources
diff --git a/etc/eclipse-tools/templates/formatter-profile.xml b/etc/eclipse-tools/templates/formatter-profile.xml
index 8f6df20..cfe6538 100644
--- a/etc/eclipse-tools/templates/formatter-profile.xml
+++ b/etc/eclipse-tools/templates/formatter-profile.xml
@@ -155,7 +155,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
@@ -163,7 +163,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
@@ -197,7 +197,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
diff --git a/etc/test-apps/javaee6-test-app/pom.xml b/etc/test-apps/javaee6-test-app/pom.xml
new file mode 100644
index 0000000..1831f71
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ RHQ Management Platform
+ ~ Copyright (C) 2005-2013 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation version 2 of the License.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>javaee6-test-app</groupId>
+ <artifactId>javaee6-test-app</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <packaging>war</packaging>
+ <name>javaee6-test-app</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+ <version.jboss.bom>1.0.7.Final</version.jboss.bom>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+ <version>${version.jboss.bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>javaee6-test-app</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.4.Final</version>
+ <configuration>
+ <hostname>127.0.0.18</hostname>
+ <port>9999</port>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleEntity.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleEntity.java
new file mode 100644
index 0000000..41c8660
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleEntity.java
@@ -0,0 +1,53 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @author Thomas Segismont
+ */
+@Entity
+public class SimpleEntity {
+
+ private Long id;
+
+ private String name;
+
+ @Id
+ @GeneratedValue
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleQueueMDB.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleQueueMDB.java
new file mode 100644
index 0000000..17756c1
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleQueueMDB.java
@@ -0,0 +1,38 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+@MessageDriven(name = "SimpleQueueMDB", activationConfig = {
+ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/SimpleQueue"),
+ @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+/**
+ * @author Thomas Segismont
+ */
+public class SimpleQueueMDB implements MessageListener {
+
+ public void onMessage(Message message) {
+ }
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleSingleton.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleSingleton.java
new file mode 100644
index 0000000..d057dd4
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleSingleton.java
@@ -0,0 +1,44 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * @author Thomas Segismont
+ */
+@Singleton
+@Startup
+public class SimpleSingleton {
+
+ @PersistenceContext
+ EntityManager em;
+
+ @PostConstruct
+ public void init() {
+ em.createQuery("from SimpleEntity").getResultList();
+ }
+
+
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateful.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateful.java
new file mode 100644
index 0000000..4267704
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateful.java
@@ -0,0 +1,29 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.ejb.Stateful;
+
+/**
+ * @author Thomas Segismont
+ */
+@Stateful
+public class SimpleStateful {
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateless.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateless.java
new file mode 100644
index 0000000..70dbec6
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleStateless.java
@@ -0,0 +1,29 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.ejb.Stateless;
+
+/**
+ * @author Thomas Segismont
+ */
+@Stateless
+public class SimpleStateless {
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleTopicMDB.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleTopicMDB.java
new file mode 100644
index 0000000..e26728a
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleTopicMDB.java
@@ -0,0 +1,38 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+@MessageDriven(name = "SimpleTopicMDB", activationConfig = {
+ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "topic/SimpleTopic"),
+ @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+/**
+ * @author Thomas Segismont
+ */
+public class SimpleTopicMDB implements MessageListener {
+
+ public void onMessage(Message rcvMessage) {
+ }
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebService.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebService.java
new file mode 100644
index 0000000..cdba606
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebService.java
@@ -0,0 +1,34 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+package org.rhq.test.apps.javaee6;
+
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * @author Thomas Segismont
+ */
+@WebService(targetNamespace = "http://www.jboss.org/rhq/test-apps/javaee6-test-app/SimpleWebService")
+public interface SimpleWebService {
+
+ @WebMethod
+ public String simpleAction();
+}
\ No newline at end of file
diff --git a/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebServiceImpl.java b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebServiceImpl.java
new file mode 100644
index 0000000..1298255
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/java/org/rhq/test/apps/javaee6/SimpleWebServiceImpl.java
@@ -0,0 +1,33 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.test.apps.javaee6;
+
+import javax.jws.WebService;
+
+/**
+ * @author Thomas Segismont
+ */
+@WebService(serviceName = "SimpleWebService", portName = "SimpleWebService", name = "SimpleWebService", endpointInterface = "org.rhq.test.apps.javaee6.SimpleWebService", targetNamespace = "http://www.jboss.org/rhq/test-apps/javaee6-test-app/SimpleWebService")
+public class SimpleWebServiceImpl implements SimpleWebService {
+ @Override
+ public String simpleAction() {
+ return "ok";
+ }
+}
diff --git a/etc/test-apps/javaee6-test-app/src/main/resources/META-INF/persistence.xml b/etc/test-apps/javaee6-test-app/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..55edc7b
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ RHQ Management Platform
+ ~ Copyright (C) 2005-2013 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation version 2 of the License.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ -->
+
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="primary">
+ <jta-data-source>java:jboss/datasources/javaee6-test-appDS</jta-data-source>
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.show_sql" value="true"/>
+ <property name="hibernate.generate_statistics" value="true"/>
+ </properties>
+ </persistence-unit>
+</persistence>
diff --git a/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/beans.xml b/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..cfc146e
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ RHQ Management Platform
+ ~ Copyright (C) 2005-2013 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation version 2 of the License.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ -->
+
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
diff --git a/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-ds.xml b/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-ds.xml
new file mode 100644
index 0000000..081a8e8
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-ds.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ RHQ Management Platform
+ ~ Copyright (C) 2005-2013 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation version 2 of the License.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ -->
+
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+ <datasource jndi-name="java:jboss/datasources/javaee6-test-appDS"
+ pool-name="javaee6-test-app" enabled="true"
+ use-java-context="true">
+ <connection-url>jdbc:h2:mem:javaee6-test-app;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+</datasources>
diff --git a/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-jms.xml b/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-jms.xml
new file mode 100644
index 0000000..2821b43
--- /dev/null
+++ b/etc/test-apps/javaee6-test-app/src/main/webapp/WEB-INF/javaee6-test-app-jms.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ RHQ Management Platform
+ ~ Copyright (C) 2005-2013 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation version 2 of the License.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ -->
+
+<messaging-deployment xmlns="urn:jboss:messaging-deployment:1.0">
+ <hornetq-server>
+ <jms-destinations>
+ <jms-queue name="SimpleQueue">
+ <entry name="/queue/SimpleQueue"/>
+ <durable>true</durable>
+ <selector string="red"/>
+ </jms-queue>
+ <jms-topic name="SimpleTopic">
+ <entry name="/topic/SimpleTopic"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+</messaging-deployment>
\ No newline at end of file
diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java
index 1f56095..94654ee 100644
--- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java
+++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java
@@ -16,6 +16,7 @@
* along with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
+
package org.rhq.test.arquillian;
import java.lang.reflect.Field;
@@ -113,7 +114,7 @@ public class FakeServerInventory {
private void setDepth(int resourceTreeDepth) {
synchronized (sync) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Current tree depth is " + resourceTreeDepth + ", while this checker is waiting for "
+ LOG.debug("Current tree depth is " + resourceTreeDepth + ", this checker is waiting for "
+ expectedDepth + " on " + this);
}
if (!depthReached && resourceTreeDepth >= expectedDepth) {
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 8b5ff0d..8ebe5ac 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -615,6 +615,7 @@
<!--<include>org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java</include>-->
<!--<include>org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java</include>-->
<!--<include>org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java</include>-->
+ <!--<include>org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java</include>-->
<!--<include>org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java</include>-->
<!--<include>org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java</include>-->
<!--<include>org/rhq/modules/plugins/jbossas7/itest/domain/ManagedServerTest.java</include>-->
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 af8474b..aabf8de 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
@@ -10063,7 +10063,7 @@
singleton="true">
<plugin-configuration>
- <c:simple-property name="path" default="hibernate-persistance-unit" readOnly="true"/>
+ <c:simple-property name="path" default="hibernate-persistence-unit" readOnly="true"/>
</plugin-configuration>
<operation name="subsystem:clear" description="Clear statistics.">
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java
new file mode 100644
index 0000000..05237ef
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java
@@ -0,0 +1,264 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.modules.plugins.jbossas7.itest.standalone;
+
+import static java.lang.System.currentTimeMillis;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.rhq.modules.plugins.jbossas7.itest.standalone.DeploymentTest.copyStreamAndReturnCount;
+import static org.rhq.modules.plugins.jbossas7.itest.standalone.DeploymentTest.getMeasurementScheduleRequests;
+import static org.rhq.modules.plugins.jbossas7.itest.standalone.DeploymentTest.getMissingMeasurements;
+import static org.rhq.modules.plugins.jbossas7.itest.standalone.DeploymentTest.getTestDeploymentPackageDetails;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.testng.annotations.Test;
+
+import org.rhq.core.clientapi.agent.PluginContainerException;
+import org.rhq.core.clientapi.agent.inventory.CreateResourceRequest;
+import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse;
+import org.rhq.core.clientapi.agent.inventory.DeleteResourceRequest;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.domain.resource.CreateResourceStatus;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.pc.inventory.ResourceContainer;
+import org.rhq.core.pc.util.FacetLockType;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.modules.plugins.jbossas7.itest.AbstractJBossAS7PluginTest;
+import org.rhq.test.arquillian.DiscoveredResources;
+import org.rhq.test.arquillian.RunDiscovery;
+import org.rhq.test.arquillian.ServerServicesSetup;
+
+/**
+ * This test ensures that "* Runtime" (JPA, Messaging, EJB3) child resources of a deployment get discovered.
+ *
+ * @author Thomas Segismont
+ */
+@Test(groups = { "integration", "pc", "standalone" }, singleThreaded = true)
+public class DeploymentRuntimeResourcesTest extends AbstractJBossAS7PluginTest {
+ private static final Log LOG = LogFactory.getLog(DeploymentRuntimeResourcesTest.class);
+
+ private enum RuntimeServiceType {
+ DATASOURCES_RUNTIME("Datasources Runtime"), //
+ DATASOURCE_RUNTIME("Datasource Runtime"), //
+ MESSAGING_RUNTIME("Messaging Runtime"), //
+ HORNETQ_SERVER_RUNTIME("HornetQ Server Runtime"), //
+ JMS_QUEUE_RUNTIME("JMS Queue Runtime"), //
+ JMS_TOPIC_RUNTIME("JMS Topic Runtime"), //
+ EJB3_RUNTIME("EJB3 Runtime"), //
+ MESSAGE_DRIVEN_BEAN_RUNTIME("Message Driven Bean Runtime"), //
+ SINGLETON_BEAN_RUNTIME("Singleton Bean Runtime"), //
+ STATELESS_SESSION_BEAN_RUNTIME("Stateless Session Bean Runtime"), //
+ STATEFUL_SESSION_BEAN_RUNTIME("Stateful Session Bean Runtime"), //
+ WEBSERVICES_RUNTIME("Webservices Runtime"), //
+ ENDPOINT_RUNTIME("Endpoint Runtime"), //
+ JPA_RUNTIME("JPA Runtime"), //
+ HIBERNATE_PERSISTENCE_UNIT("Hibernate Persistence Unit"), //
+ ENTITY("Entity");
+
+ private String serviceTypeName;
+
+ RuntimeServiceType(String serviceTypeName) {
+ this.serviceTypeName = serviceTypeName;
+ }
+
+ public String getServiceTypeName() {
+ return serviceTypeName;
+ }
+ }
+
+ @DiscoveredResources(plugin = PLUGIN_NAME, resourceType = "JBossAS7 Standalone Server")
+ private Set<Resource> standaloneResources;
+
+ @DiscoveredResources(plugin = PLUGIN_NAME, resourceType = "Deployment")
+ private Set<Resource> deploymentResources;
+
+ @ServerServicesSetup
+ @Test(enabled = false)
+ public void setupContentServices() {
+ Mockito.when(
+ serverServices.getContentServerService().downloadPackageBitsForChildResource(Mockito.anyInt(),
+ Mockito.anyString(), Mockito.any(PackageDetailsKey.class), Mockito.any(OutputStream.class))).then(
+ new Answer<Long>() {
+ @Override
+ public Long answer(InvocationOnMock invocation) throws Throwable {
+ InputStream str = getClass().getClassLoader().getResourceAsStream(
+ TestDeployments.JAVAEE6_TEST_APP.getResourcePath());
+ OutputStream out = (OutputStream) invocation.getArguments()[invocation.getArguments().length - 1];
+ return copyStreamAndReturnCount(str, out);
+ }
+ });
+
+ Mockito.when(
+ serverServices.getContentServerService().downloadPackageBitsGivenResource(Mockito.anyInt(),
+ Mockito.any(PackageDetailsKey.class), Mockito.any(OutputStream.class))).then(new Answer<Long>() {
+ @Override
+ public Long answer(InvocationOnMock invocation) throws Throwable {
+ InputStream str = getClass().getClassLoader().getResourceAsStream(
+ TestDeployments.JAVAEE6_TEST_APP.getResourcePath());
+ OutputStream out = (OutputStream) invocation.getArguments()[invocation.getArguments().length - 1];
+ return copyStreamAndReturnCount(str, out);
+ }
+ });
+ }
+
+ @Test(priority = 10)
+ @RunDiscovery
+ public void testDeploy() throws Exception {
+ assertFalse(standaloneResources == null || standaloneResources.size() != 1,
+ "Exactly 1 AS7 standalone server resource should be present.");
+
+ int serverResourceId = standaloneResources.iterator().next().getId();
+
+ ResourcePackageDetails packageDetails = getTestDeploymentPackageDetails(TestDeployments.JAVAEE6_TEST_APP);
+
+ Configuration deploymentConfig = new Configuration();
+ deploymentConfig.put(new PropertySimple("runtimeName", packageDetails.getName()));
+
+ CreateResourceRequest request = new CreateResourceRequest();
+ request.setPackageDetails(packageDetails);
+ request.setParentResourceId(serverResourceId);
+ request.setPluginConfiguration(null);
+ request.setPluginName(PLUGIN_NAME);
+ request.setResourceConfiguration(deploymentConfig);
+ request.setResourceName(packageDetails.getName());
+ request.setResourceTypeName("Deployment");
+
+ CreateResourceResponse response = pluginContainer.getResourceFactoryManager().executeCreateResourceImmediately(
+ request);
+
+ assertEquals(response.getStatus(), CreateResourceStatus.SUCCESS,
+ "The deployment failed with an error mesasge: " + response.getErrorMessage());
+ }
+
+ @Test(priority = 12)
+ @RunDiscovery
+ public void testRuntimeResources() throws Exception {
+ ensureAllRuntimeServicesAreFound();
+ for (RuntimeServiceType runtimeServiceType : RuntimeServiceType.values()) {
+ testRuntimeResourceMeasurements(runtimeServiceType);
+ }
+ }
+
+ private void ensureAllRuntimeServicesAreFound() throws InterruptedException {
+ long start = currentTimeMillis();
+ boolean foundAllRuntimeServices = false;
+ do {
+ boolean runtimeServiceMissing = false;
+ for (RuntimeServiceType runtimeServiceType : RuntimeServiceType.values()) {
+ Set<Resource> childResources = getChildResourcesOfType(getDeploymentResource(),
+ runtimeServiceType.getServiceTypeName());
+ runtimeServiceMissing = childResources.isEmpty() && canGetMeasurementFacet(childResources);
+ if (runtimeServiceMissing) {
+ break;
+ }
+ }
+ foundAllRuntimeServices = !runtimeServiceMissing;
+ Thread.sleep(SECONDS.toMillis(5));
+ } while (!foundAllRuntimeServices && (currentTimeMillis() - start) < MINUTES.toMillis(10));
+ assertTrue(foundAllRuntimeServices, "Could not find all runtime services");
+ Thread.sleep(MINUTES.toMillis(5));
+ }
+
+ private boolean canGetMeasurementFacet(Set<Resource> resources) {
+ for (Resource resource : resources) {
+ if (getMeasurementFacet(resource) == null) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private void testRuntimeResourceMeasurements(RuntimeServiceType runtimeServiceType) throws Exception {
+ Set<Resource> resources = getChildResourcesOfType(getDeploymentResource(),
+ runtimeServiceType.getServiceTypeName());
+ for (Resource resource : resources) {
+ MeasurementFacet measurementFacet = getMeasurementFacet(resource);
+ MeasurementReport report = new MeasurementReport();
+ Set<MeasurementScheduleRequest> measurementScheduleRequests = getMeasurementScheduleRequests(resource);
+ measurementFacet.getValues(report, measurementScheduleRequests);
+ assertEquals(report.getCallTimeData().size(), 0, runtimeServiceType.getServiceTypeName()
+ + ": no calltime data was requested");
+ assertEquals(
+ report.getNumericData().size() + report.getTraitData().size(),
+ measurementScheduleRequests.size(),
+ runtimeServiceType.getServiceTypeName()
+ + ": some requested measurements are missing: "
+ + getMissingMeasurements(measurementScheduleRequests, report.getNumericData(),
+ report.getTraitData()));
+ }
+ }
+
+ private MeasurementFacet getMeasurementFacet(Resource resource) {
+ ResourceContainer resourceContainer = pluginContainer.getInventoryManager().getResourceContainer(resource);
+ try {
+ return resourceContainer.createResourceComponentProxy(MeasurementFacet.class, FacetLockType.READ,
+ SECONDS.toMillis(5), false, false, false);
+ } catch (PluginContainerException e) {
+ return null;
+ }
+ }
+
+ private Set<Resource> getChildResourcesOfType(final Resource parentResource, final String runtimeServiceType) {
+ Set<Resource> foundResources = new HashSet<Resource>();
+ Set<Resource> childResources = parentResource.getChildResources();
+ if (childResources != null && !childResources.isEmpty()) {
+ for (Resource childResource : childResources) {
+ if (runtimeServiceType.equals(childResource.getResourceType().getName())) {
+ foundResources.add(childResource);
+ }
+ foundResources.addAll(getChildResourcesOfType(childResource, runtimeServiceType));
+ }
+ }
+ return foundResources;
+ }
+
+ @Test(priority = 99)
+ public void testUndeploy() throws Exception {
+ Resource deploymentResource = getDeploymentResource();
+ DeleteResourceRequest request = new DeleteResourceRequest(0, deploymentResource.getId());
+ getServerInventory().removeResource(deploymentResource);
+ pluginContainer.getResourceFactoryManager().deleteResource(request);
+ }
+
+ private Resource getDeploymentResource() {
+ assertFalse(deploymentResources == null || deploymentResources.size() != 1,
+ "Exactly 1 deployment resource should be present.");
+ return pluginContainer.getInventoryManager()
+ .getResourceContainer(deploymentResources.iterator().next().getId()).getResource();
+ }
+
+}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java
index b872ad6..24add24 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java
@@ -24,12 +24,9 @@ import static org.rhq.core.domain.util.ResourceTypeUtility.getMeasurementDefinit
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
@@ -66,6 +63,7 @@ import org.rhq.core.domain.util.MeasurementDefinitionFilter;
import org.rhq.core.pc.inventory.ResourceContainer;
import org.rhq.core.pc.util.FacetLockType;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.modules.plugins.jbossas7.StandaloneASComponent;
import org.rhq.modules.plugins.jbossas7.itest.AbstractJBossAS7PluginTest;
import org.rhq.test.arquillian.DiscoveredResources;
@@ -81,32 +79,6 @@ import org.rhq.test.arquillian.ServerServicesSetup;
@Test(groups = { "integration", "pc", "standalone" }, singleThreaded = true)
public class DeploymentTest extends AbstractJBossAS7PluginTest {
- private enum TestDeployments {
- DEPLOYMENT_1("test-simple.war"), DEPLOYMENT_2("test-simple-2.war");
-
- private String deploymentName;
- private String resourcePath;
- private byte[] hash;
-
- private TestDeployments(String warName) {
- this.deploymentName = warName;
- this.resourcePath = "itest/" + warName;
- hash = computeHash(DeploymentTest.class.getClassLoader().getResourceAsStream(resourcePath));
- }
-
- public String getDeploymentName() {
- return deploymentName;
- }
-
- public String getResourcePath() {
- return resourcePath;
- }
-
- public byte[] getHash() {
- return hash;
- }
- }
-
@ResourceComponentInstances(plugin = PLUGIN_NAME, resourceType = "JBossAS7 Standalone Server")
private Set<StandaloneASComponent> standalones;
@@ -123,19 +95,6 @@ public class DeploymentTest extends AbstractJBossAS7PluginTest {
private static TestDeployments DEPLOYMENT_TO_SERVE = TestDeployments.DEPLOYMENT_1;
- private static long copyStreamAndReturnCount(InputStream in, OutputStream out) throws IOException {
- int data;
- long cnt = 0;
- while ((data = in.read()) != -1) {
- if (out != null) {
- out.write(data);
- }
- cnt++;
- }
-
- return cnt;
- }
-
//this is no test method
@ServerServicesSetup
@Test(enabled = false)
@@ -278,41 +237,9 @@ public class DeploymentTest extends AbstractJBossAS7PluginTest {
measurementFacet.getValues(report, measurementScheduleRequests);
assertEquals(report.getCallTimeData().size(), 0, "No calltime data was requested");
assertTrue(
- report.getNumericData().size() + report.getTraitData().size() == measurementScheduleRequests.size(),
- "Some requested measurements are missing: "
- + getMissingMeasurements(measurementScheduleRequests, report.getNumericData(), report.getTraitData()));
- }
-
- private Set<String> getMissingMeasurements(Set<MeasurementScheduleRequest> measurementScheduleRequests,
- Set<MeasurementDataNumeric> numericData, Set<MeasurementDataTrait> traitData) {
- Set<String> missingMeasurements = new HashSet<String>();
- for (MeasurementScheduleRequest measurementScheduleRequest : measurementScheduleRequests) {
- missingMeasurements.add(measurementScheduleRequest.getName());
- }
- for (MeasurementDataNumeric measurementDataNumeric : numericData) {
- missingMeasurements.remove(measurementDataNumeric.getName());
- }
- for (MeasurementDataTrait measurementDataTrait : traitData) {
- missingMeasurements.remove(measurementDataTrait.getName());
- }
- return missingMeasurements;
- }
-
- private Set<MeasurementScheduleRequest> getMeasurementScheduleRequests(Resource webRuntimeResource) {
- Set<MeasurementDefinition> measurementDefinitions = getMeasurementDefinitions(
- webRuntimeResource.getResourceType(), new MeasurementDefinitionFilter() {
- private final Set<DataType> acceptableDataTypes = EnumSet.of(DataType.MEASUREMENT, DataType.TRAIT);
-
- public boolean accept(MeasurementDefinition measurementDefinition) {
- return acceptableDataTypes.contains(measurementDefinition.getDataType());
- }
- });
- Set<MeasurementScheduleRequest> measurementScheduleRequests = new HashSet<MeasurementScheduleRequest>();
- for (MeasurementDefinition measurementDefinition : measurementDefinitions) {
- measurementScheduleRequests.add(new MeasurementScheduleRequest(-1, measurementDefinition.getName(), -1,
- true, measurementDefinition.getDataType(), measurementDefinition.getRawNumericType()));
- }
- return measurementScheduleRequests;
+ report.getNumericData().size() + report.getTraitData().size() == measurementScheduleRequests.size(),
+ "Some requested measurements are missing: "
+ + getMissingMeasurements(measurementScheduleRequests, report.getNumericData(), report.getTraitData()));
}
@Test(priority = 16)
@@ -344,6 +271,14 @@ public class DeploymentTest extends AbstractJBossAS7PluginTest {
return null;
}
+
+ private byte[] computeHash(InputStream data) {
+ try {
+ return MessageDigestGenerator.getDigest(data);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
})
.when(serverServices.getContentServerService())
.completeRetrievePackageBitsRequest(Mockito.any(ContentServiceResponse.class),
@@ -365,39 +300,55 @@ public class DeploymentTest extends AbstractJBossAS7PluginTest {
}
}
- private ResourcePackageDetails getTestDeploymentPackageDetails(TestDeployments deployment) {
+ static long copyStreamAndReturnCount(InputStream in, OutputStream out) throws IOException {
+ int data;
+ long cnt = 0;
+ while ((data = in.read()) != -1) {
+ if (out != null) {
+ out.write(data);
+ }
+ cnt++;
+ }
+ return cnt;
+ }
+
+ static ResourcePackageDetails getTestDeploymentPackageDetails(TestDeployments deployment) {
ResourcePackageDetails details = new ResourcePackageDetails(new PackageDetailsKey(
deployment.getDeploymentName(), "1.0", "file", "noarch"));
details.setFileName(deployment.getDeploymentName());
details.setDeploymentTimeConfiguration(new Configuration());
-
return details;
+ }
+ static Set<String> getMissingMeasurements(Set<MeasurementScheduleRequest> measurementScheduleRequests,
+ Set<MeasurementDataNumeric> numericData, Set<MeasurementDataTrait> traitData) {
+ Set<String> missingMeasurements = new HashSet<String>();
+ for (MeasurementScheduleRequest measurementScheduleRequest : measurementScheduleRequests) {
+ missingMeasurements.add(measurementScheduleRequest.getName());
+ }
+ for (MeasurementDataNumeric measurementDataNumeric : numericData) {
+ missingMeasurements.remove(measurementDataNumeric.getName());
+ }
+ for (MeasurementDataTrait measurementDataTrait : traitData) {
+ missingMeasurements.remove(measurementDataTrait.getName());
+ }
+ return missingMeasurements;
}
- private static byte[] computeHash(InputStream str) {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- try {
- int data;
- while ((data = str.read()) != -1) {
- out.write(data);
- }
+ static Set<MeasurementScheduleRequest> getMeasurementScheduleRequests(Resource webRuntimeResource) {
+ Set<MeasurementDefinition> measurementDefinitions = getMeasurementDefinitions(
+ webRuntimeResource.getResourceType(), new MeasurementDefinitionFilter() {
+ private final Set<DataType> acceptableDataTypes = EnumSet.of(DataType.MEASUREMENT, DataType.TRAIT);
- return MessageDigest.getInstance("md5").digest(out.toByteArray());
- } catch (IOException e) {
- throw new IllegalStateException("Could not determine the MD5 of the test deployment.", e);
- } catch (NoSuchAlgorithmException e) {
- throw new IllegalStateException(
- "Could not instantiate MD5 message digest algorithm, this should not happen.", e);
- } finally {
- try {
- out.close();
- } catch (IOException e) {
- }
- try {
- str.close();
- } catch (IOException e) {
+ public boolean accept(MeasurementDefinition measurementDefinition) {
+ return acceptableDataTypes.contains(measurementDefinition.getDataType());
}
+ });
+ Set<MeasurementScheduleRequest> measurementScheduleRequests = new HashSet<MeasurementScheduleRequest>();
+ for (MeasurementDefinition measurementDefinition : measurementDefinitions) {
+ measurementScheduleRequests.add(new MeasurementScheduleRequest(-1, measurementDefinition.getName(), -1,
+ true, measurementDefinition.getDataType(), measurementDefinition.getRawNumericType()));
}
+ return measurementScheduleRequests;
}
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java
new file mode 100644
index 0000000..ef265c8
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java
@@ -0,0 +1,45 @@
+package org.rhq.modules.plugins.jbossas7.itest.standalone;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.stream.StreamUtil;
+
+/**
+* @author Thomas Segismont
+*/
+enum TestDeployments {
+ DEPLOYMENT_1("test-simple.war"), //
+ DEPLOYMENT_2("test-simple-2.war"), //
+ JAVAEE6_TEST_APP("javaee6-test-app.war");
+
+ private String deploymentName;
+ private String resourcePath;
+ private byte[] hash;
+
+ TestDeployments(String warName) {
+ this.deploymentName = warName;
+ this.resourcePath = "itest/" + warName;
+ InputStream resourceAsStream = DeploymentTest.class.getClassLoader().getResourceAsStream(resourcePath);
+ try {
+ hash = MessageDigestGenerator.getDigest(resourceAsStream);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ StreamUtil.safeClose(resourceAsStream);
+ }
+ }
+
+ public String getDeploymentName() {
+ return deploymentName;
+ }
+
+ public String getResourcePath() {
+ return resourcePath;
+ }
+
+ public byte[] getHash() {
+ return hash;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/itest/javaee6-test-app.war b/modules/plugins/jboss-as-7/src/test/resources/itest/javaee6-test-app.war
new file mode 100644
index 0000000..f88eab4
Binary files /dev/null and b/modules/plugins/jboss-as-7/src/test/resources/itest/javaee6-test-app.war differ
diff --git a/modules/plugins/jboss-as-7/src/test/resources/log4j.xml b/modules/plugins/jboss-as-7/src/test/resources/log4j.xml
index 16165cb..30a97b1 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/log4j.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/log4j.xml
@@ -35,6 +35,18 @@
</layout>
</appender>
+ <category name="org.apache.http">
+ <priority value="ERROR"/>
+ </category>
+
+ <category name="org.apache.http.wire">
+ <priority value="ERROR"/>
+ </category>
+
+ <category name="org.apache.http.headers">
+ <priority value="ERROR"/>
+ </category>
+
<category name="org.rhq.modules.plugins">
<priority value="DEBUG"/>
</category>
10 years, 6 months
[rhq] modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 4 ++--
modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico |binary
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a265b52be08eeedb030ada08bdad6174bd73e5d7
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Oct 22 17:21:22 2013 -0700
[BZ 1014598] - Favicon is missing.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 42d50c2..0362a7e 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -51,8 +51,8 @@
</script>
<title>RHQ</title>
- <link rel="icon" type="image/png" href="/images/favicon.png"/>
- <link rel="apple-touch-icon" href="/images/favicon.png"/>
+ <link rel="icon" type="image/ico" href="images/favicon.ico"/>
+ <link rel="shortcut icon" href="images/favicon.ico" />
<script type="text/javascript">
var isomorphicDir = "org.rhq.coregui.CoreGUI/sc/";
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico b/modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico
new file mode 100644
index 0000000..40b2fa0
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico differ
10 years, 6 months
[rhq] Branch 'release/jon3.2.x' - 2 commits - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 12 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 117 ++++++++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties | 2
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 4
modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico |binary
12 files changed, 108 insertions(+), 41 deletions(-)
New commits:
commit be54ebd6d9b882804315c825af33340b05157c11
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Oct 21 11:13:44 2013 -0700
[BZ 961366] - Error on clicking 'Get Live Value' button for a metric on resource->Monitoring->Tables tab. Now Adding Live Values to metrics screen after discussing design with UXD. Removed Live values button as live values have replaced last values.
(cherry picked from commit 08fe551f9040218f73dda72b35e0823cc09cdcec)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java
index 1172eb7..61797df 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java
@@ -109,18 +109,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re
setListGridFields(fields.toArray(new ListGridField[0]));
if (!rendered) {
- addTableAction(MSG.view_measureTable_getLive(), new TableAction() {
- @Override
- public boolean isEnabled(ListGridRecord[] selection) {
- return true;
- }
-
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- refresh();
- }
- });
-
addExtraWidget(addToDashboardComponent, false);
addToDashboardComponent.disableAddToDashboardButton();
metricsTableListGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java
index 0f89b36..e154727 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java
@@ -3,11 +3,14 @@ package org.rhq.coregui.client.inventory.resource.detail.monitoring.table;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
+import com.google.gwt.user.client.rpc.InvocationException;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.Record;
@@ -17,8 +20,10 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.Criteria;
import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.ui.MetricDisplaySummary;
import org.rhq.core.domain.measurement.ui.MetricDisplayValue;
@@ -28,6 +33,7 @@ import org.rhq.coregui.client.UserSessionManager;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
import org.rhq.coregui.client.util.BrowserUtility;
import org.rhq.coregui.client.util.Log;
+import org.rhq.coregui.client.util.MeasurementConverterClient;
import org.rhq.coregui.client.util.MeasurementUtility;
import org.rhq.coregui.client.util.RPCDataSource;
import org.rhq.coregui.client.util.async.Command;
@@ -52,7 +58,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
public static final String FIELD_MIN_VALUE = "min";
public static final String FIELD_MAX_VALUE = "max";
public static final String FIELD_AVG_VALUE = "avg";
- public static final String FIELD_LAST_VALUE = "last";
+ public static final String FIELD_LIVE_VALUE = "live";
public static final String FIELD_METRIC_DEF_ID = "defId";
public static final String FIELD_METRIC_SCHED_ID = "schedId";
public static final String FIELD_METRIC_UNITS = "units";
@@ -61,7 +67,10 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
private final Resource resource;
private List<MetricDisplaySummary> metricDisplaySummaries;
private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList;
+ private Set<MeasurementData> liveMeasurementDataSet;
private int[] definitionArrayIds;
+ private int[] scheduleIds;
+ private HashMap<Integer, MeasurementUnits> scheduleToMeasurementUnitMap = new HashMap<Integer, MeasurementUnits>();
private final MeasurementUserPreferences measurementUserPrefs;
public MetricsViewDataSource(Resource resource) {
@@ -112,7 +121,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
avgField.setWidth("15%");
fields.add(avgField);
- ListGridField lastField = new ListGridField(FIELD_LAST_VALUE, MSG.view_resource_monitor_table_last());
+ ListGridField lastField = new ListGridField(FIELD_LIVE_VALUE, MSG.view_resource_monitor_table_last());
lastField.setWidth("15%");
fields.add(lastField);
@@ -143,7 +152,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric()));
record.setAttribute(FIELD_MAX_VALUE, getMetricStringValue(from.getMaxMetric()));
record.setAttribute(FIELD_AVG_VALUE, getMetricStringValue(from.getAvgMetric()));
- record.setAttribute(FIELD_LAST_VALUE, getMetricStringValue(from.getLastMetric()));
+ record.setAttribute(FIELD_LIVE_VALUE, buildLiveValue(from));
record.setAttribute(FIELD_METRIC_DEF_ID, from.getDefinitionId());
record.setAttribute(FIELD_METRIC_SCHED_ID, from.getScheduleId());
record.setAttribute(FIELD_METRIC_UNITS, from.getUnits());
@@ -152,12 +161,34 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
return record;
}
+ private String buildLiveValue(MetricDisplaySummary from) {
+ StringBuilder sb = new StringBuilder();
+ for (MeasurementData measurementData : liveMeasurementDataSet) {
+ if (from.getScheduleId() == measurementData.getScheduleId()) {
+ double doubleValue;
+ if (measurementData.getValue() instanceof Number) {
+ doubleValue = ((Number) measurementData.getValue()).doubleValue();
+ } else {
+ doubleValue = Double.parseDouble(measurementData.getValue().toString());
+ }
+
+ String value = MeasurementConverterClient.formatToSignificantPrecision(new double[] { doubleValue },
+ MeasurementUnits.valueOf(from.getUnits()), true)[0];
+
+ sb.append(value);
+
+ break;
+ }
+ }
+
+ return sb.toString();
+ }
+
private String getCsvMetricsForSparkline(int definitionId) {
StringBuilder sb = new StringBuilder();
List<MeasurementDataNumericHighLowComposite> selectedMetricsList = getMeasurementsForMeasurementDefId(definitionId);
- for (int i = 0; i < selectedMetricsList.size(); i++) {
- MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i);
+ for (MeasurementDataNumericHighLowComposite measurementData : selectedMetricsList) {
if (!Double.isNaN(measurementData.getValue())) {
sb.append((int) measurementData.getValue());
sb.append(",");
@@ -170,15 +201,15 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
// handle the case where we have just installed the server so not much history
// and our date range is set such that only one value returns which the
// sparkline graph will not plot anything, so we need at least 2 values
- if(!sb.toString().contains(",")){
+ if (!sb.toString().contains(",")) {
// append another value just so we have 2 values and it will graph
- return "0,"+sb.toString();
+ return "0," + sb.toString();
}
return sb.toString();
}
- List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId) {
+ private List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId) {
int selectedIndex = 0;
// find the ordinal position as specified when querying the metrics
@@ -209,26 +240,23 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() {
@Override
public void onSuccess(ArrayList<MeasurementSchedule> measurementSchedules) {
- int[] scheduleIds = new int[measurementSchedules.size()];
+ scheduleIds = new int[measurementSchedules.size()];
int i = 0;
for (MeasurementSchedule measurementSchedule : measurementSchedules) {
scheduleIds[i++] = measurementSchedule.getId();
}
+ // This latch is the last thing that gets executed after we have executed the
+ // 2 queries in Parallel
final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() {
@Override
public void execute() {
- response.setData(buildRecords(metricDisplaySummaries));
- processResponse(request.getRequestId(), response);
+ // we needed the ResourceMetrics query and Metric Display Summary
+ // to finish before we can query the live metrics and populate the
+ // result response
+ queryLiveMetrics(request, response);
- new Timer() {
-
- @Override
- public void run() {
- BrowserUtility.graphSparkLines();
- }
- }.schedule(150);
}
});
@@ -245,6 +273,46 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
});
}
+ private void queryLiveMetrics(final DSRequest request, final DSResponse response) {
+
+ // actually go out and ask the agents for the data
+ GWTServiceLookup.getMeasurementDataService(60000).findLiveData(resource.getId(), definitionArrayIds,
+ new AsyncCallback<Set<MeasurementData>>() {
+ @Override
+ public void onSuccess(Set<MeasurementData> result) {
+ if (result == null) {
+ result = new HashSet<MeasurementData>(0);
+ }
+ liveMeasurementDataSet = result;
+ response.setData(buildRecords(metricDisplaySummaries));
+ processResponse(request.getRequestId(), response);
+
+ new Timer() {
+
+ @Override
+ public void run() {
+ BrowserUtility.graphSparkLines();
+ }
+ }.schedule(150);
+ }
+
+ /**
+ * Called when an asynchronous call fails to complete normally. {@link IncompatibleRemoteServiceException}s, {@link
+ * InvocationException}s, or checked exceptions thrown by the service method are examples of the type of failures that
+ * can be passed to this method.
+ * <p/>
+ * <p> If <code>caught</code> is an instance of an {@link IncompatibleRemoteServiceException} the application should
+ * try to get into a state where a browser refresh can be safely done. </p>
+ *
+ * @param caught failure encountered while executing a remote procedure call
+ */
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught);
+ }
+ });
+ }
+
private void queryMetricDisplaySummaries(int[] scheduleIds, Long startTime, Long endTime,
final CountDownLatch countDownLatch) {
GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resource.getId(),
@@ -269,10 +337,19 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
this.metricDisplaySummaries = metricDisplaySummaries;
}
- public void queryResourceMetrics(final Resource resource, Long startTime, Long endTime,
+ public void queryResourceMetrics(final Resource resource, final Long startTime, final Long endTime,
final CountDownLatch countDownLatch) {
Set<MeasurementDefinition> definitions = resource.getResourceType().getMetricDefinitions();
+ // create a mapping of schedules ids to MeasurementUnits
+ for (MeasurementDefinition definition : definitions) {
+ if (null != definition.getSchedules()) {
+ for (MeasurementSchedule schedule : definition.getSchedules()) {
+ scheduleToMeasurementUnitMap.put(schedule.getId(), definition.getUnits());
+ }
+ }
+ }
+
//build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071]
final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>();
for (MeasurementDefinition definition : definitions) {
@@ -311,4 +388,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
});
}
+
}
+
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
index 20cf77f..3470be0 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
@@ -2085,7 +2085,7 @@ view_resource_monitor_graphs_lookupFailed = Failed to find resource for graph
view_resource_monitor_graphs_noneAvailable = No graphs available
view_resource_monitor_schedules_title = Resource Metric Collection Schedules
view_resource_monitor_table_avg = Average
-view_resource_monitor_table_last = Last
+view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = Maximum
view_resource_monitor_table_min = Minimum
view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
index ac09e5e..7d1d9e7 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
@@ -2101,7 +2101,7 @@ view_resource_monitor_graphs_lookupFailed = Nepodařilo se nalézt zdroj pro gra
view_resource_monitor_graphs_noneAvailable = Žádné grafy nejsou dostupné
view_resource_monitor_schedules_title = Rozvrhy sběru metrik pro zdroj
view_resource_monitor_table_avg = Průměr
-view_resource_monitor_table_last = Poslední
+##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = Maximum
view_resource_monitor_table_min = Minimum
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
index 8b356bf..c456c46 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
@@ -1938,7 +1938,7 @@ view_resource_monitor_calltime_minimum = Minimum
view_resource_monitor_graphs_noneAvailable = Keine Charts verf\u00FCgbar
view_resource_monitor_schedules_title = Zeitplan f\u00FCr das Sammeln von Metriken
view_resource_monitor_table_avg = Durchschnitt
-view_resource_monitor_table_last = Letzter
+##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = Maximum
view_resource_monitor_table_min = Minimum
view_resource_title_component_errors_tooltip = Zeigt Fehler der gemanagten Ressource. Klicken für Details
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
index 2872500..f2b4d20 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
@@ -2070,7 +2070,7 @@ view_resource_monitor_graphs_lookupFailed = グラフのためのリソースの
view_resource_monitor_graphs_noneAvailable = 利用できるグラフはありません
view_resource_monitor_schedules_title = リソースメトリック収集スケジュール
view_resource_monitor_table_avg = 平均
-view_resource_monitor_table_last = 最新
+##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = 最大
view_resource_monitor_table_min = 最小
view_resource_title_component_errors_cleanup = 問題に取り組んだ後は、以下のメッセージを削除して全画面の'管理コンポーネントエラー'をクリアする必要があります。
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
index a6c4de1..fe6307b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
@@ -1769,7 +1769,7 @@ view_resource_monitor_graphs_lookupFailed = 그래프를 위한 리소스를 찾
view_resource_monitor_graphs_noneAvailable = 유효한 그래프가 없습니다
view_resource_monitor_schedules_title = 리소스 통계 수집 일정
view_resource_monitor_table_avg = 평균
-view_resource_monitor_table_last = 최신
+##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = 최대
view_resource_monitor_table_min = 최소
view_resource_title_component_errors_cleanup = 이 문제를 해결 한 후에는 이전 화면에서 '관리 구성 요소 오류'아이콘을 삭제하려면 아래의 메시지를 삭제해야합니다.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
index 06c76d1..0840783 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
@@ -2183,7 +2183,7 @@ view_resource_monitor_graphs_lookupFailed = Failed to find resource for graph
view_resource_monitor_graphs_noneAvailable = No graphs available
view_resource_monitor_schedules_title = Resource Metric Collection Schedules
view_resource_monitor_table_avg = Average
-view_resource_monitor_table_last = Last
+##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = Maximum
view_resource_monitor_table_min = Minimum
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
index b181def..744ab8c 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
@@ -1947,7 +1947,7 @@
#view_resource_monitor_graphs_noneAvailable = No graphs available
#view_resource_monitor_schedules_title = Resource Metric Collection Schedules
#view_resource_monitor_table_avg = Average
-#view_resource_monitor_table_last = Last
+#view_resource_monitor_table_last = Live Value
#view_resource_monitor_table_max = Maximum
#view_resource_monitor_table_min = Minimum
#view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
index c0da3c3..e7ac94d 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
@@ -2073,7 +2073,7 @@ view_resource_monitor_graphs_lookupFailed = Failed to find resource for graph
view_resource_monitor_graphs_noneAvailable = \u6ca1\u6709\u53ef\u7528\u56fe
view_resource_monitor_schedules_title = Resource Metric Collection Schedules
view_resource_monitor_table_avg = \u5e73\u5747
-view_resource_monitor_table_last = Last
+##view_resource_monitor_table_last = Live Value
view_resource_monitor_table_max = \u6700\u5927
view_resource_monitor_table_min = \u6700\u5c0f
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
commit ec3b8cc98dfc194a0f6aa215394ef9baf8f6fc15
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Oct 22 17:21:22 2013 -0700
[BZ 1014598] - Favicon is missing.
(cherry picked from commit 9d75a12285b352742d36e1c441b2bd60f227cbcd)
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 42d50c2..0362a7e 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -51,8 +51,8 @@
</script>
<title>RHQ</title>
- <link rel="icon" type="image/png" href="/images/favicon.png"/>
- <link rel="apple-touch-icon" href="/images/favicon.png"/>
+ <link rel="icon" type="image/ico" href="images/favicon.ico"/>
+ <link rel="shortcut icon" href="images/favicon.ico" />
<script type="text/javascript">
var isomorphicDir = "org.rhq.coregui.CoreGUI/sc/";
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico b/modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico
new file mode 100644
index 0000000..40b2fa0
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/favicon.ico differ
10 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 84 ++++++++++
1 file changed, 84 insertions(+)
New commits:
commit 92f4f9c10e5e11efd79284b88286ee034309dc64
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Oct 23 16:13:04 2013 -0400
BZ 1022573 - tell the agent where the server is
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
index 6502ebc..6561c22 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
@@ -50,6 +50,7 @@ import org.jboss.as.controller.client.ModelControllerClient;
import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient;
import org.rhq.common.jbossas.client.controller.MCCHelper;
+import org.rhq.core.util.PropertiesFileUpdate;
import org.rhq.core.util.file.FileReverter;
import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
@@ -73,6 +74,10 @@ public abstract class AbstractInstall extends ControlCommand {
private static final String PREF_RHQ_AGENT_CONFIGURATION_SETUP_FLAG = "rhq.agent.configuration-setup-flag";
private static final String PREF_RHQ_AGENT_AUTO_UPDATE_FLAG = "rhq.agent.agent-update.enabled";
private static final String PREF_RHQ_AGENT_SECURITY_TOKEN = "rhq.agent.security-token";
+ private static final String PREF_RHQ_AGENT_SERVER_TRANSPORT = "rhq.agent.server.transport";
+ private static final String PREF_RHQ_AGENT_SERVER_BINDADDRESS = "rhq.agent.server.bind-address";
+ private static final String PREF_RHQ_AGENT_SERVER_BINDPORT = "rhq.agent.server.bind-port";
+ private static final String PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS = "rhq.agent.server.transport-params";
protected void installWindowsService(File workingDir, String batFile, boolean replaceExistingService, boolean start)
throws Exception {
@@ -699,6 +704,26 @@ public abstract class AbstractInstall extends ControlCommand {
preferencesNode.put(PREF_RHQ_AGENT_SECURITY_TOKEN, securityToken);
}
+ // get the configured server endpoint information and tell the agent so it knows where the server is.
+ Properties serverEndpoint = getAgentServerEndpoint();
+ String endpointTransport = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_TRANSPORT);
+ String endpointAddress = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS);
+ String endpointPort = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_BINDPORT);
+ String endpointParams = serverEndpoint.getProperty(PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS);
+ if (endpointTransport != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_TRANSPORT, endpointTransport);
+ }
+ if (endpointAddress != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_BINDADDRESS, endpointAddress);
+ }
+ if (endpointPort != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_BINDPORT, endpointPort);
+ }
+ if (endpointParams != null) {
+ preferencesNode.put(PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS, endpointParams);
+ }
+
+ // if the user provided any overrides to the agent config, use them.
overrideAgentPreferences(commandLine, preferencesNode);
// set some prefs that must be a specific value
@@ -719,6 +744,65 @@ public abstract class AbstractInstall extends ControlCommand {
}
}
+ /**
+ * Returns the server endpoint that the agent should use when connecting to the server.
+ *
+ * @return properties with the values - only those values that could be determined will be in here
+ *
+ * @throws Exception if could not determine the values due to a runtime error
+ */
+ private Properties getAgentServerEndpoint() throws Exception {
+ Properties endpointData = new Properties();
+
+ // load in the server properties file to find out how the server will be listening for agent messages
+ File serverPropsFile = getServerPropertiesFile();
+ Properties serverProps = new PropertiesFileUpdate(serverPropsFile).loadExistingProperties();
+
+ // transport and transport params
+ String transport = serverProps.getProperty("rhq.communications.connector.transport", "servlet");
+ endpointData.put(PREF_RHQ_AGENT_SERVER_TRANSPORT, transport);
+
+ String params = serverProps.getProperty("rhq.communications.connector.transport-params");
+ if (params != null && params.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_TRANSPORTPARAMS, params.trim());
+ }
+
+ // address and port depends on the transport
+ if (transport.contains("servlet")) {
+ String port;
+ if (transport.contains("ssl")) {
+ port = serverProps.getProperty("rhq.server.socket.binding.port.https");
+ } else {
+ port = serverProps.getProperty("rhq.server.socket.binding.port.http");
+ }
+ if (port != null && port.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDPORT, port.trim());
+ }
+
+ String address = serverProps.getProperty("jboss.bind.address");
+ if (address != null && address.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS, address.trim());
+ }
+ } else {
+ String port = serverProps.getProperty("rhq.communications.connector.bind-port");
+ if (port != null && port.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDPORT, port.trim());
+ }
+ String address = serverProps.getProperty("rhq.communications.connector.bind-address");
+ if (address != null && address.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS, address.trim());
+ }
+ }
+
+ // the public endpoint will override anything that was done above
+ String publicEndpoint = serverProps.getProperty("rhq.autoinstall.public-endpoint-address");
+ if (publicEndpoint != null && publicEndpoint.trim().length() > 0) {
+ endpointData.setProperty(PREF_RHQ_AGENT_SERVER_BINDADDRESS, publicEndpoint.trim());
+ }
+
+ return endpointData;
+ }
+
private void overrideAgentPreferences(CommandLine commandLine, Preferences preferencesNode) {
// override the out of box config with user custom agent preference values
String[] customPrefs = commandLine.getOptionValues(AGENT_PREFERENCE);
10 years, 6 months
[rhq] Branch 'bug/1009945' - modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java | 12 ++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregate1HourData.java | 27 +++++-
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateRawData.java | 6 -
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregator.java | 2
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 45 +++++-----
5 files changed, 64 insertions(+), 28 deletions(-)
New commits:
commit f138443b065aad7372a44ff4a3d6d62c3f8318f5
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Oct 23 15:12:15 2013 -0400
make connection pool sizes and rate limits configurable
Connection pools per host and rate limits are configurable via system
properties. While the connection pool sizes are only set at start up, I plan to
make the rate limits self-tuning.
This commit also adds the missing method body to kick off 6 hour data
aggregation in Aggregate1HourData.java.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
index 98d1405..190614c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
@@ -36,6 +36,8 @@ import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.HostDistance;
+import com.datastax.driver.core.PoolingOptions;
import com.datastax.driver.core.ProtocolOptions;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
@@ -254,6 +256,16 @@ public class StorageClientManagerBean {
.withLoadBalancingPolicy(new RoundRobinPolicy())
.withRetryPolicy(new LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE)).withCompression(compression).build();
+ PoolingOptions poolingOptions = cluster.getConfiguration().getPoolingOptions();
+ poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, Integer.parseInt(
+ System.getProperty("rhq.storage.client.local-connections", "24")));
+ poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, Integer.parseInt(
+ System.getProperty("rhq.storage.client.remote-connections", "16")));
+ poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, Integer.parseInt(
+ System.getProperty("rhq.storage.client.max-local-connections", "32")));
+ poolingOptions.setMaxConnectionsPerHost(HostDistance.REMOTE, Integer.parseInt(
+ System.getProperty("rhq.storage.client.max-remote-connections", "24")));
+
return cluster.connect(RHQ_KEYSPACE);
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregate1HourData.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregate1HourData.java
index c6584ca..bf50f26 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregate1HourData.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregate1HourData.java
@@ -1,5 +1,6 @@
package org.rhq.server.metrics;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -54,19 +55,43 @@ public class Aggregate1HourData implements Runnable {
log.debug("Finished aggregating 1 hour data for " + result.size() + " schedules in " +
(System.currentTimeMillis() - start) + " ms");
state.getRemaining1HourData().addAndGet(-scheduleIds.size());
+ start6HourDataAggregationIfNecessary();
}
@Override
public void onFailure(Throwable t) {
log.warn("Failed to aggregate 1 hour data", t);
state.getRemaining1HourData().addAndGet(-scheduleIds.size());
+ start6HourDataAggregationIfNecessary();
}
});
}
private void start6HourDataAggregationIfNecessary() {
if (state.is24HourTimeSliceFinished()) {
- // TODO
+ log.debug("Starting 6 hour data aggregation for " + scheduleIds.size() + " schedules");
+ try {
+ state.getSixHourIndexEntriesArrival().await();
+ try {
+ state.getSixHourIndexEntriesLock().writeLock().lock();
+ state.getSixHourIndexEntries().removeAll(scheduleIds);
+ } finally {
+ state.getSixHourIndexEntriesLock().writeLock().unlock();
+ }
+ } catch (InterruptedException e) {
+ log.warn("An interrupt occurred waiting for 6 hour index entries", e);
+ } catch (AbortedException e) {
+ // This means we failed to retrieve the index entries. We can however
+ // continue generating 6 hour data because we do not need the index
+ // here since we already have 6 hour data to aggregate along with the
+ // schedule ids.
+ }
+ List<StorageResultSetFuture> queryFutures = new ArrayList<StorageResultSetFuture>(scheduleIds.size());
+ for (Integer scheduleId : scheduleIds) {
+ queryFutures.add(dao.findSixHourMetricsAsync(scheduleId, state.getTwentyFourHourTimeSlice().getMillis(),
+ state.getTwentyFourHourTimeSliceEnd().getMillis()));
+ }
+ state.getAggregationTasks().submit(new Aggregate6HourData(dao, state, scheduleIds, queryFutures));
}
}
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateRawData.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateRawData.java
index a7b0695..2cde763 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateRawData.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateRawData.java
@@ -38,7 +38,6 @@ public class AggregateRawData implements Runnable {
@Override
public void run() {
- log.debug("Aggregating raw data for schedule ids " + scheduleIds);
final long start = System.currentTimeMillis();
ListenableFuture<List<ResultSet>> rawDataFutures = Futures.successfulAsList(queryFutures);
Futures.withFallback(rawDataFutures, new FutureFallback<List<ResultSet>>() {
@@ -71,8 +70,8 @@ public class AggregateRawData implements Runnable {
}
private void start1HourDataAggregationIfNecessary() {
- log.debug("Aggregating 1 hour data for schedule ids " + scheduleIds);
if (state.is6HourTimeSliceFinished()) {
+ log.debug("Starting 1 hour data aggregation for " + scheduleIds.size() + " schedules");
try {
state.getOneHourIndexEntriesArrival().await();
try {
@@ -86,11 +85,10 @@ public class AggregateRawData implements Runnable {
return;
} catch (AbortedException e) {
// This means we failed to retrieve the index entries. We can however
- // continue generating 6 hour data because we do not need the index
+ // continue generating 1 hour data because we do not need the index
// here since we already have 1 hour data to aggregate along with the
// schedule ids.
}
- log.debug("Fetching 1 hour data");
List<StorageResultSetFuture> oneHourDataQueryFutures = new ArrayList<StorageResultSetFuture>(
scheduleIds.size());
for (Integer scheduleId : scheduleIds) {
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregator.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregator.java
index d2d3f7d..efb7784 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregator.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Aggregator.java
@@ -134,7 +134,7 @@ public class Aggregator {
}
public Set<AggregateNumericMetric> run() {
- log.debug("There are " + remainingIndexEntries.get() + " remaining index entries");
+ log.info("Starting aggregation for time slice " + startTime);
readPermits.acquire();
StorageResultSetFuture rawFuture = dao.findMetricsIndexEntriesAsync(MetricsTable.ONE_HOUR,
startTime.getMillis());
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
index 0741fd2..05a8fba 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import com.datastax.driver.core.ResultSet;
@@ -71,17 +72,11 @@ public class MetricsServer {
private MetricsConfiguration configuration;
-// private RateLimiter readPermits = RateLimiter.create(Integer.parseInt(
-// System.getProperty("rhq.storage.read-limit", "1000")));
-//
-// private RateLimiter writePermits = RateLimiter.create(Integer.parseInt(
-// System.getProperty("rhq.storage.write-limit", "2500")));
-
private RateLimiter readPermits = RateLimiter.create(Integer.parseInt(
- System.getProperty("rhq.storage.read-limit", "1200")));
+ System.getProperty("rhq.storage.read-limit", "1000")), 3, TimeUnit.MINUTES);
private RateLimiter writePermits = RateLimiter.create(Integer.parseInt(
- System.getProperty("rhq.storage.write-limit", "3000")));
+ System.getProperty("rhq.storage.write-limit", "2500")), 3, TimeUnit.MINUTES);
private boolean pastAggregationMissed;
@@ -92,7 +87,7 @@ public class MetricsServer {
private int aggregationBatchSize;
- private boolean useAsyncAggregation;
+ private boolean useAsyncAggregation = System.getProperty("rhq.metrics.aggregation.async") != null;
public void setDAO(MetricsDAO dao) {
this.dao = dao;
@@ -131,6 +126,9 @@ public class MetricsServer {
}
public void init() {
+ if (log.isDebugEnabled() && useAsyncAggregation) {
+ log.debug("Async aggregation is enabled");
+ }
determineMostRecentRawDataSinceLastShutdown();
}
@@ -428,24 +426,28 @@ public class MetricsServer {
* for subsequently computing baselines.
*/
public Iterable<AggregateNumericMetric> calculateAggregates() {
- DateTime theHour = currentHour();
+ long start = System.currentTimeMillis();
+ try {
+ DateTime theHour = currentHour();
- if (pastAggregationMissed) {
- theHour = roundDownToHour(mostRecentRawDataPriorToStartup).plusHours(1);
- pastAggregationMissed = false;
- }
+ if (pastAggregationMissed) {
+ theHour = roundDownToHour(mostRecentRawDataPriorToStartup).plusHours(1);
+ pastAggregationMissed = false;
+ }
- if (useAsyncAggregation) {
- DateTime timeSlice = theHour.minus(configuration.getRawTimeSliceDuration());
- return new Aggregator(aggregationWorkers, dao, configuration, dateTimeService, timeSlice,
- aggregationBatchSize, writePermits, readPermits).run();
- } else {
- return calculateAggregates(theHour.getMillis());
+ if (useAsyncAggregation) {
+ DateTime timeSlice = theHour.minus(configuration.getRawTimeSliceDuration());
+ return new Aggregator(aggregationWorkers, dao, configuration, dateTimeService, timeSlice,
+ aggregationBatchSize, writePermits, readPermits).run();
+ } else {
+ return calculateAggregates(theHour.getMillis());
+ }
+ } finally {
+ log.info("Finished metrics aggregation in " + (System.currentTimeMillis() - start) + " ms");
}
}
private Iterable<AggregateNumericMetric> calculateAggregates(long startTime) {
- long start = System.currentTimeMillis();
DateTime dt = new DateTime(startTime);
DateTime currentHour = dateTimeService.getTimeSlice(dt, configuration.getRawTimeSliceDuration());
DateTime lastHour = currentHour.minus(configuration.getRawTimeSliceDuration());
@@ -486,7 +488,6 @@ public class MetricsServer {
dao.deleteMetricsIndexEntries(MetricsTable.TWENTY_FOUR_HOUR, twentyFourHourTimeSlice);
}
- log.info("Finished aggregation in " + (System.currentTimeMillis() - start) + " ms");
return newOneHourAggregates;
}
10 years, 6 months