configuration pack for BayStack/ERS traps; event manager code sync between rcp and...
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 18 Sep 2013 16:56:43 +0000 (16:56 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 18 Sep 2013 16:56:43 +0000 (16:56 +0000)
39 files changed:
.gitattributes
ChangeLog
contrib/mgmtpacks/baystack_notifications.xml [new file with mode: 0644]
src/java/netxms-eclipse/EventManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/Activator.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/actions/OpenEventConfigurator.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/actions/OpenSyslogMonitor.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EditEventTemplateDialog.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EventSelectionDialog.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventConfigurator.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventMonitor.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/SyslogMonitor.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventLabelProvider.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventMonitorFilter.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventTemplateLabelProvider.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/SyslogLabelProvider.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/SyslogMonitorFilter.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/widgets/EventSelector.java
webui/webapp/EventManager/META-INF/MANIFEST.MF
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/Activator.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/actions/OpenEventConfigurator.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/actions/OpenEventMonitor.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/actions/OpenSyslogMonitor.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EditEventTemplateDialog.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EventSelectionDialog.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/helpers/EventListFilter.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_es.properties
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_ru.properties [new file with mode: 0644]
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_zh_CN.properties [new file with mode: 0644]
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventConfigurator.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventMonitor.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/SyslogMonitor.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventLabelProvider.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventMonitorFilter.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventTemplateComparator.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/EventTemplateLabelProvider.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/SyslogLabelProvider.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/helpers/SyslogMonitorFilter.java
webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/widgets/EventSelector.java

index 3451ba3..0325d34 100644 (file)
@@ -293,6 +293,7 @@ android/src/console/src/org/netxms/ui/android/tools/BarcodeScannerIntentResult.j
 contrib/backgrounds/.keep -text
 contrib/integration/HP_EVA/hp_eva_collect_data.pl -text
 contrib/logo.jpg -text
+contrib/mgmtpacks/baystack_notifications.xml -text
 contrib/mibs/ATM-TC-MIB.txt -text
 contrib/mibs/BAY-STACK-MIB.txt -text
 contrib/mibs/CISCO-ENTITY-VENDORTYPE-OID-MIB.txt -text
@@ -3018,6 +3019,8 @@ webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EventSe
 webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/helpers/EventListFilter.java -text
 webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages.properties -text
 webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_es.properties -text
+webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_ru.properties -text
+webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_zh_CN.properties -text
 webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventConfigurator.java -text
 webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventMonitor.java -text
 webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/SyslogMonitor.java -text
index 3b8be4e..7291821 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@
 - New NXSL functions: chr, ord
 - Added MIBs for Nortel/Trapeze Wireless security switches
 - New MIBs: BAY-STACK-NOTIFICATIONS-MIB, SUN-HW-CTRL-MIB, SUN-HW-TRAP-MIB, SUN-PLATFORM-MIB
-- Fixed issues: #202, #300, #305, #311, #325, #337, #338
+- Fixed issues: #202, #300, #305, #311, #325, #336, #337, #338
 
 
 *
diff --git a/contrib/mgmtpacks/baystack_notifications.xml b/contrib/mgmtpacks/baystack_notifications.xml
new file mode 100644 (file)
index 0000000..828f0e9
--- /dev/null
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+       <formatVersion>3</formatVersion>
+       <description>BayStack/ERS notifications</description>
+       <events>
+               <event id="100013">
+                       <name>BSN_TEMPERATURE_EXCEEDED</name>
+                       <code>100013</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>Temperature of a chassis component exceeded threshold</message>
+                       <description>This notification is generated when the temperature of a chassis component has exceeded some threshold.  The instance of s5ChasComType included in the notification identifies the component.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) s5ChasComType</description>
+               </event>
+               <event id="100002">
+                       <name>BSN_LOGIN_FAILURE</name>
+                       <code>100002</code>
+                       <severity>1</severity>
+                       <flags>1</flags>
+                       <message>Login failure (user %5, address %4)</message>
+                       <description>This notification is generated when an attempt to login to the system fails as a result of an incorrect password.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) bsnLoginFailureType&#x0D;&#x0A;&#x09;3) bsnLoginFailureAddressType&#x0D;&#x0A;&#x09;4) bsnLoginFailureAddress&#x0D;&#x0A;&#x09;5) bsnLoginFailureUsername</description>
+               </event>
+               <event id="100009">
+                       <name>BSN_STACK_CONFIGURATION_ERROR</name>
+                       <code>100009</code>
+                       <severity>4</severity>
+                       <flags>1</flags>
+                       <message>Stack configuration error (expected size %2, actual size %3)</message>
+                       <description>This notification is generated when the expected size of a stack is not equal to the actual size of the stack.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Expected stack size&#x0D;&#x0A;&#x09;3) Actual stack size</description>
+               </event>
+               <event id="100014">
+                       <name>BSN_TRIAL_LICENSE_EXPIRATION</name>
+                       <code>100014</code>
+                       <severity>2</severity>
+                       <flags>1</flags>
+                       <message>Trial license %3 expires in %2 days</message>
+                       <description>This notification is generated to indicate that a trial license is going to expire soon, or has already expired.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) The number of days until a feature trial license will expire&#x0D;&#x0A;&#x09;3) The number of the license that will expire or that has expired</description>
+               </event>
+               <event id="100003">
+                       <name>BSN_LAC_TRUNK_UNAVAILABLE</name>
+                       <code>100003</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>LAC trunk unavailable</message>
+                       <description>This notification is generated when an attempt is made to form an 802.3ad LAG trunk, but there are no available resources to create a new trunk.  The condition usually occurs because a system has some hardware or software limit on the number of trunks that can be created.</description>
+               </event>
+               <event id="100012">
+                       <name>BSN_TRUNK_PORT_ENABLED</name>
+                       <code>100012</code>
+                       <severity>0</severity>
+                       <flags>1</flags>
+                       <message>Trunk port %2 enabled</message>
+                       <description>This notification is generated when an MLT port is enabled.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Interface index</description>
+               </event>
+               <event id="100010">
+                       <name>BSN_STACK_MANAGER_RECONFIGURATION</name>
+                       <code>100010</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>Stack manager reconfiguration</message>
+                       <description>This notification is generated by a stackable system when the stack manager detects a problem with a link between stack members.</description>
+               </event>
+               <event id="100001">
+                       <name>BSN_CONFIG_SAVED</name>
+                       <code>100001</code>
+                       <severity>0</severity>
+                       <flags>1</flags>
+                       <message>Configuration was saved to NVRAM</message>
+                       <description>This notification is generated whenever the device saves its configuration to non-volatile storage.</description>
+               </event>
+               <event id="100007">
+                       <name>BSN_MLT_HEALTH_FAILURE</name>
+                       <code>100007</code>
+                       <severity>4</severity>
+                       <flags>1</flags>
+                       <message>MLT health failure</message>
+                       <description>This notification is generated when a receiving switch does not receive an expected number of autotopology frames on an MLT in a given time interval from the sending switch(es) on the other end of the MLT. Once notification has been sent, further notifications may be sent, but it is suggested these be at least 5 minutes apart. The ifAdminStatus object reflects the state of the port. The port may be partitioned by the switch or still be active depending on the detection algorithm&apos;s control parameters.</description>
+               </event>
+               <event id="100011">
+                       <name>BSN_TRUNK_PORT_DISABLED</name>
+                       <code>100011</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>Trunk port %2 disabled to prevent broadcast storm</message>
+                       <description>This notification is generated when an MLT port is disabled as a result of an MLT trunk being disabled.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Interface index</description>
+               </event>
+               <event id="100005">
+                       <name>BSN_VLACPDU_LOSS</name>
+                       <code>100005</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>Port %2 was disabled due to VLACP PDU loss</message>
+                       <description>Generated when a port is disabled due to the loss of a VLACP PDU.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Interface index</description>
+               </event>
+               <event id="100008">
+                       <name>BSN_PORT_SPEED_SUPLEX_MISMATCH</name>
+                       <code>100008</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>Speed or duplex mismatch on port %2</message>
+                       <description>This notification is generated when a speed or duplex mismatch is detected. Once notification has been sent, further notifications may be sent, but it is suggested these be at least 5 minutes apart.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Interface index</description>
+               </event>
+               <event id="100004">
+                       <name>BSN_PORT_DISABLED_BSTORM</name>
+                       <code>100004</code>
+                       <severity>3</severity>
+                       <flags>1</flags>
+                       <message>Port %2 was disabled to prevent broadcast storm</message>
+                       <description>This notification is generated when a LAG port that was port of a trunk is disabled as a result of the LAC setting on the port being turned off.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Interface index&#x0D;&#x0A;</description>
+               </event>
+               <event id="100006">
+                       <name>BSN_VLACPDU_RECEIPT</name>
+                       <code>100006</code>
+                       <severity>0</severity>
+                       <flags>1</flags>
+                       <message>Port %2 was enabled due to receipt of a VLACP PDU</message>
+                       <description>Generated when a port is enabled due to receipt of a VLACP PDU.&#x0D;&#x0A;&#x0D;&#x0A;Parameters:&#x0D;&#x0A;&#x09;1) SNMP trap OID&#x0D;&#x0A;&#x09;2) Interface index</description>
+               </event>
+       </events>
+       <templates>
+       </templates>
+       <traps>
+               <trap id="20">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.10</oid>
+                       <description>bsnTrunkPortEnabledToPreventBroadcastStorm</description>
+                       <userTag></userTag>
+                       <event>BSN_TRUNK_PORT_ENABLED</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>ifIndex</description>
+                                       <oid>.1.3.6.1.2.1.2.2.1.1</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="14">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.3</oid>
+                       <description>bsnPortSpeedDuplexMismatch</description>
+                       <userTag></userTag>
+                       <event>BSN_PORT_SPEED_SUPLEX_MISMATCH</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>ifINdex</description>
+                                       <oid>.1.3.6.1.2.1.2.2.1.1</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="19">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.8</oid>
+                       <description>bsnTrunkPortDisabledToPreventBroadcastStorm</description>
+                       <userTag></userTag>
+                       <event>BSN_TRUNK_PORT_DISABLED</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>ifIndex</description>
+                                       <oid>.1.3.6.1.2.1.2.2.1.1</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="16">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.4</oid>
+                       <description>bsnStackManagerReconfiguration</description>
+                       <userTag></userTag>
+                       <event>BSN_STACK_MANAGER_RECONFIGURATION</event>
+               </trap>
+               <trap id="15">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.13</oid>
+                       <description>bsnStackConfigurationError</description>
+                       <userTag></userTag>
+                       <event>BSN_STACK_CONFIGURATION_ERROR</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>bayStackConfigExpectedStackSize</description>
+                                       <oid>.1.3.6.1.4.1.45.5.13.1.1.1</oid>
+                               </parameter>
+                               <parameter id="2">
+                                       <flags>0</flags>
+                                       <description>bsnActualStackSize</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.6</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="8">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.11</oid>
+                       <description>bsnLacPortDisabledDueToLossOfVLACPDU</description>
+                       <userTag></userTag>
+                       <event>BSN_VLACPDU_LOSS</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>ifIndex</description>
+                                       <oid>.1.3.6.1.2.1.2.2.1.1</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="7">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.1</oid>
+                       <description>bsnConfigurationSavedToNvram</description>
+                       <userTag></userTag>
+                       <event>BSN_CONFIG_SAVED</event>
+               </trap>
+               <trap id="13">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.7</oid>
+                       <description>bsnMLTHealthFailure</description>
+                       <userTag></userTag>
+                       <event>BSN_MLT_HEALTH_FAILURE</event>
+               </trap>
+               <trap id="12">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.6</oid>
+                       <description>bsnLoginFailure</description>
+                       <userTag></userTag>
+                       <event>BSN_LOGIN_FAILURE</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>bsnLoginFailureType</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.2</oid>
+                               </parameter>
+                               <parameter id="2">
+                                       <flags>0</flags>
+                                       <description>bsnLoginFailureAddressType</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.3</oid>
+                               </parameter>
+                               <parameter id="3">
+                                       <flags>0</flags>
+                                       <description>bsnLoginFailureAddress</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.4</oid>
+                               </parameter>
+                               <parameter id="4">
+                                       <flags>0</flags>
+                                       <description>bsnLoginFailureUsername</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.5</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="11">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.5</oid>
+                       <description>bsnLacTrunkUnavailable</description>
+                       <userTag></userTag>
+                       <event>BSN_LAC_TRUNK_UNAVAILABLE</event>
+               </trap>
+               <trap id="10">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.12</oid>
+                       <description>bsnLacPortEnabledDueToReceiptOfVLACPDU</description>
+                       <userTag></userTag>
+                       <event>BSN_VLACPDU_RECEIPT</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>ifIndex</description>
+                                       <oid>.1.3.6.1.2.1.2.2.1.1</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="9">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.9</oid>
+                       <description>bsnLacPortDisabledToPreventBroadcastStorm</description>
+                       <userTag></userTag>
+                       <event>BSN_PORT_DISABLED_BSTORM</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>ifIndex</description>
+                                       <oid>.1.3.6.1.2.1.2.2.1.1</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="17">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.17</oid>
+                       <description>bsnTemperatureExceeded</description>
+                       <userTag></userTag>
+                       <event>BSN_TEMPERATURE_EXCEEDED</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>s5ChasComType</description>
+                                       <oid>.1.3.6.1.4.1.45.1.6.3.3.1.1.4</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+               <trap id="18">
+                       <oid>.1.3.6.1.4.1.45.5.2.2.0.15</oid>
+                       <description>bsnTrialLicenseExpiration</description>
+                       <userTag></userTag>
+                       <event>BSN_TRIAL_LICENSE_EXPIRATION</event>
+                       <parameters>
+                               <parameter id="1">
+                                       <flags>0</flags>
+                                       <description>bsnTrialLicenseExpirationTime</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.10</oid>
+                               </parameter>
+                               <parameter id="2">
+                                       <flags>0</flags>
+                                       <description>bsnTrialLicenseExpirationNumber</description>
+                                       <oid>.1.3.6.1.4.1.45.5.2.1.11</oid>
+                               </parameter>
+                       </parameters>
+               </trap>
+       </traps>
+</configuration>
index 1aadd5d..50002c1 100644 (file)
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Event Management Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.eventmanager;singleton:=true
-Bundle-Version: 1.2.7
+Bundle-Version: 1.2.9
 Bundle-Activator: org.netxms.ui.eclipse.eventmanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.netxms.ui.eclipse.console;bundle-version="1.2.7"
+ org.netxms.ui.eclipse.console;bundle-version="1.2.9"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.eventmanager.dialogs,
index 98bb3fb..4106ac2 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index a9c4c16..b845a34 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2009 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 52e02b5..d0dcd23 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 2319921..f8a4c45 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -119,7 +119,7 @@ public class EditEventTemplateDialog extends Dialog
       gd.widthHint = 450;\r
       message.setLayoutData(gd);\r
                \r
-      description = new LabeledText(dialogArea, SWT.NONE, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);\r
+      description = new LabeledText(dialogArea, SWT.NONE, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);\r
       description.setLabel(Messages.EditEventTemplateDialog_Description);\r
       description.setText(object.getDescription());\r
       gd = new GridData();\r
@@ -127,6 +127,7 @@ public class EditEventTemplateDialog extends Dialog
       gd.grabExcessHorizontalSpace = true;\r
       gd.horizontalAlignment = SWT.FILL;\r
       gd.heightHint = 200;\r
+      gd.widthHint = 450;\r
       gd.verticalAlignment = SWT.FILL;\r
       description.setLayoutData(gd);\r
                \r
index a12fa66..7ad86b1 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index bd35842..31fae78 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2012 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -259,11 +259,7 @@ public class EventConfigurator extends ViewPart implements SessionListener
         */\r
        private void makeActions()\r
        {\r
-               actionRefresh = new RefreshAction()\r
-               {\r
-                       /* (non-Javadoc)\r
-                        * @see org.eclipse.jface.action.Action#run()\r
-                        */\r
+               actionRefresh = new RefreshAction() {\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -272,9 +268,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                };\r
 \r
                actionNew = new Action() {\r
-                       /* (non-Javadoc)\r
-                        * @see org.eclipse.jface.action.Action#run()\r
-                        */\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -285,9 +278,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                actionNew.setImageDescriptor(Activator.getImageDescriptor("icons/new.png")); //$NON-NLS-1$\r
 \r
                actionEdit = new Action() {\r
-                       /* (non-Javadoc)\r
-                        * @see org.eclipse.jface.action.Action#run()\r
-                        */\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -299,9 +289,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                actionEdit.setEnabled(false);\r
 \r
                actionDelete = new Action() {\r
-                       /* (non-Javadoc)\r
-                        * @see org.eclipse.jface.action.Action#run()\r
-                        */\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -321,8 +308,7 @@ public class EventConfigurator extends ViewPart implements SessionListener
                // Create menu manager.\r
                MenuManager menuMgr = new MenuManager();\r
                menuMgr.setRemoveAllWhenShown(true);\r
-               menuMgr.addMenuListener(new IMenuListener()\r
-               {\r
+               menuMgr.addMenuListener(new IMenuListener() {\r
                        public void menuAboutToShow(IMenuManager mgr)\r
                        {\r
                                fillContextMenu(mgr);\r
index e56e7f9..7d98d71 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 156fa83..134bd40 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 0987f6f..d36e352 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index e731391..825e539 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index c7ab4f4..a02b745 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index b7d78b4..975b0df 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 4b591fc..4fdc511 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 50cb6b5..712e9b1 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index a300914..fcf56b5 100644 (file)
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Event Management Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.eventmanager;singleton:=true
-Bundle-Version: 1.2.6
+Bundle-Version: 1.2.9
 Bundle-Activator: org.netxms.ui.eclipse.eventmanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.rap.ui;bundle-version="2.0.0",
- org.netxms.webui.core;bundle-version="1.2.6"
+ org.netxms.webui.core;bundle-version="1.2.9"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.eventmanager.dialogs,
index 9ca0c5b..751e1a8 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
index 9532b2b..b845a34 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2009 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
 package org.netxms.ui.eclipse.eventmanager.actions;\r
 \r
 import org.eclipse.jface.action.IAction;\r
-import org.eclipse.jface.dialogs.MessageDialog;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;\r
 import org.eclipse.ui.PartInitException;\r
 import org.netxms.ui.eclipse.eventmanager.Messages;\r
 import org.netxms.ui.eclipse.eventmanager.views.EventConfigurator;\r
+import org.netxms.ui.eclipse.tools.MessageDialogHelper;\r
 \r
 public class OpenEventConfigurator implements IWorkbenchWindowActionDelegate\r
 {\r
@@ -62,7 +62,7 @@ public class OpenEventConfigurator implements IWorkbenchWindowActionDelegate
                        } \r
                        catch (PartInitException e) \r
                        {\r
-                               MessageDialog.openError(window.getShell(), Messages.OpenEventConfigurator_Error, Messages.OpenEventConfigurator_ErrorText + e.getMessage());\r
+                               MessageDialogHelper.openError(window.getShell(), Messages.OpenEventConfigurator_Error, Messages.OpenEventConfigurator_ErrorText + e.getMessage());\r
                        }\r
                }\r
        }\r
index 886d8ad..28fbbbe 100644 (file)
 package org.netxms.ui.eclipse.eventmanager.actions;\r
 \r
 import org.eclipse.jface.action.IAction;\r
-import org.eclipse.jface.dialogs.MessageDialog;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;\r
 import org.eclipse.ui.PartInitException;\r
 import org.netxms.ui.eclipse.eventmanager.Messages;\r
 import org.netxms.ui.eclipse.eventmanager.views.EventMonitor;\r
+import org.netxms.ui.eclipse.tools.MessageDialogHelper;\r
 \r
 /**\r
  * Open event monitor view\r
@@ -65,7 +65,7 @@ public class OpenEventMonitor implements IWorkbenchWindowActionDelegate
                        } \r
                        catch (PartInitException e) \r
                        {\r
-                               MessageDialog.openError(window.getShell(), Messages.OpenEventMonitor_Error, Messages.OpenEventMonitor_ErrorText + e.getMessage());\r
+                               MessageDialogHelper.openError(window.getShell(), Messages.OpenEventMonitor_Error, Messages.OpenEventMonitor_ErrorText + e.getMessage());\r
                        }\r
                }\r
        }\r
index d9aeaea..d0dcd23 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -20,7 +20,6 @@ package org.netxms.ui.eclipse.eventmanager.actions;
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.jface.action.IAction;\r
-import org.eclipse.jface.dialogs.MessageDialog;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;\r
@@ -31,6 +30,7 @@ import org.netxms.ui.eclipse.eventmanager.Messages;
 import org.netxms.ui.eclipse.eventmanager.views.SyslogMonitor;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
+import org.netxms.ui.eclipse.tools.MessageDialogHelper;\r
 \r
 /**\r
  * Open syslog monitor view\r
@@ -81,7 +81,7 @@ public class OpenSyslogMonitor implements IWorkbenchWindowActionDelegate
                                                } \r
                                                catch (PartInitException e) \r
                                                {\r
-                                                       MessageDialog.openError(window.getShell(), Messages.OpenSyslogMonitor_Error, Messages.OpenSyslogMonitor_ErrorText + e.getMessage());\r
+                                                       MessageDialogHelper.openError(window.getShell(), Messages.OpenSyslogMonitor_Error, Messages.OpenSyslogMonitor_ErrorText + e.getMessage());\r
                                                }\r
                                        }\r
                                });\r
index a84772b..f8a4c45 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -40,8 +40,6 @@ import org.netxms.ui.eclipse.widgets.LabeledText;
  */\r
 public class EditEventTemplateDialog extends Dialog\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private EventTemplate object;\r
        private boolean isNew;\r
        private LabeledText id;\r
@@ -121,7 +119,7 @@ public class EditEventTemplateDialog extends Dialog
       gd.widthHint = 450;\r
       message.setLayoutData(gd);\r
                \r
-      description = new LabeledText(dialogArea, SWT.NONE, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);\r
+      description = new LabeledText(dialogArea, SWT.NONE, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);\r
       description.setLabel(Messages.EditEventTemplateDialog_Description);\r
       description.setText(object.getDescription());\r
       gd = new GridData();\r
@@ -129,6 +127,7 @@ public class EditEventTemplateDialog extends Dialog
       gd.grabExcessHorizontalSpace = true;\r
       gd.horizontalAlignment = SWT.FILL;\r
       gd.heightHint = 200;\r
+      gd.widthHint = 450;\r
       gd.verticalAlignment = SWT.FILL;\r
       description.setLayoutData(gd);\r
                \r
index 9ac9f84..7ad86b1 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -54,8 +54,6 @@ import org.netxms.ui.eclipse.widgets.SortableTableViewer;
  */\r
 public class EventSelectionDialog extends Dialog\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private boolean multiSelection;\r
        private Text filterText;\r
        private TableViewer eventList;\r
@@ -139,8 +137,6 @@ public class EventSelectionDialog extends Dialog
                eventList.getTable().setLayoutData(gd);\r
                \r
                filterText.addModifyListener(new ModifyListener() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void modifyText(ModifyEvent e)\r
                        {\r
index e79b46e..a0cdad6 100644 (file)
@@ -28,8 +28,6 @@ import org.netxms.client.events.EventTemplate;
  */\r
 public class EventListFilter extends ViewerFilter\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private String filterString = null;\r
        \r
        /* (non-Javadoc)\r
index f50f2fd..dac3dd2 100644 (file)
@@ -1,13 +1,13 @@
-EditEventTemplateDialog_Description=Descripción\r
-EditEventTemplateDialog_EventCode=Código del evento\r
+EditEventTemplateDialog_Description=Descripci\u00f3n\r
+EditEventTemplateDialog_EventCode=C\u00f3digo del evento\r
 EditEventTemplateDialog_EventName=Nombre del evento\r
 EditEventTemplateDialog_Message=Mensaje\r
 EditEventTemplateDialog_Severity=Gravedad\r
 EditEventTemplateDialog_TitleCreate=Crear Plantilla de Evento\r
 EditEventTemplateDialog_TitleEdit=Editar Plantilla de Evento\r
 EditEventTemplateDialog_WriteToLog=&Escribir en el registro de eventos\r
-EventConfigurator_ColCode=Código\r
-EventConfigurator_ColDescription=Descripción\r
+EventConfigurator_ColCode=C\u00f3digo\r
+EventConfigurator_ColDescription=Descripci\u00f3n\r
 EventConfigurator_ColFlags=Marcadores\r
 EventConfigurator_ColMessage=Mensaje\r
 EventConfigurator_ColName=Nombre\r
@@ -15,14 +15,14 @@ EventConfigurator_ColSeverity=Gravedad
 EventConfigurator_CreateJob_Error=No es posible crear una nueva plantilla de eventos\r
 EventConfigurator_CreateJob_Title=Crear una nueva plantilla de eventos\r
 EventConfigurator_Delete=&Eliminar\r
-EventConfigurator_DeleteConfirmation_Plural=¿Confirmar la eliminación de las plantillas de eventos seleccionadas?\r
-EventConfigurator_DeleteConfirmation_Singular=¿Confirmar la eliminación de la plantilla de eventos seleccionada?\r
-EventConfigurator_DeleteConfirmationTitle=Confirmar eliminación de la plantilla de eventos\r
+EventConfigurator_DeleteConfirmationTitle=Confirmar eliminaci\u00f3n de la plantilla de eventos\r
+EventConfigurator_DeleteConfirmation_Plural=\u00bfConfirmar la eliminaci\u00f3n de las plantillas de eventos seleccionadas?\r
+EventConfigurator_DeleteConfirmation_Singular=\u00bfConfirmar la eliminaci\u00f3n de la plantilla de eventos seleccionada?\r
 EventConfigurator_DeleteJob_Error=No es posible eliminar la plantilla de eventos\r
 EventConfigurator_DeleteJob_Title=Eliminar plantilla de eventos\r
 EventConfigurator_NewEvent=&Nueva plantilla de eventos...\r
 EventConfigurator_OpenJob_Error=No es posible configurar el evento\r
-EventConfigurator_OpenJob_Title=Abrir configuración de eventos\r
+EventConfigurator_OpenJob_Title=Abrir configuraci\u00f3n de eventos\r
 EventConfigurator_Properties=&Propiedades...\r
 EventConfigurator_UpdateJob_Error=No es posible actualizar la plantilla de eventos\r
 EventConfigurator_UpdateJob_Title=Actualizar plantilla de eventos\r
@@ -34,7 +34,7 @@ EventMonitor_ColSource=Origen
 EventMonitor_ColTimestamp=Fecha y hora\r
 EventMonitor_ShowStatusColors=Mostrar &colores para el estado\r
 EventMonitor_ShowStatusIcons=Mostrar &iconos para el estado\r
-EventSelectionDialog_Code=Código\r
+EventSelectionDialog_Code=C\u00f3digo\r
 EventSelectionDialog_Filter=Filtro:\r
 EventSelectionDialog_Name=Nombre\r
 EventSelectionDialog_Title=Seleccionar Evento\r
@@ -64,26 +64,26 @@ SyslogLabelProvider_FacLocal5=Local5
 SyslogLabelProvider_FacLocal6=Local6\r
 SyslogLabelProvider_FacLocal7=Local7\r
 SyslogLabelProvider_FacLogAlert=Registrar Alerta\r
-SyslogLabelProvider_FacLogAudit=Registrar Auditoría\r
+SyslogLabelProvider_FacLogAudit=Registrar Auditor\u00eda\r
 SyslogLabelProvider_FacLpr=Lpr\r
 SyslogLabelProvider_FacMail=Correo\r
-SyslogLabelProvider_FacNews=Noticias\r
 SyslogLabelProvider_FacNTP=NTP\r
+SyslogLabelProvider_FacNews=Noticias\r
 SyslogLabelProvider_FacSecurity=Seguridad\r
 SyslogLabelProvider_FacSyslog=Syslog\r
 SyslogLabelProvider_FacSystem=Sistema\r
-SyslogLabelProvider_FacUser=Usuario\r
 SyslogLabelProvider_FacUUCP=UUCP\r
+SyslogLabelProvider_FacUser=Usuario\r
 SyslogLabelProvider_SevAlert=Alerta\r
-SyslogLabelProvider_SevCritical=Crítica\r
-SyslogLabelProvider_SevDebug=Depuración\r
+SyslogLabelProvider_SevCritical=Cr\u00edtica\r
+SyslogLabelProvider_SevDebug=Depuraci\u00f3n\r
 SyslogLabelProvider_SevEmergency=Emergencia\r
 SyslogLabelProvider_SevError=Error\r
 SyslogLabelProvider_SevInfo=Informativa\r
 SyslogLabelProvider_SevNotice=Noticia\r
 SyslogLabelProvider_SevWarning=Advertencia\r
 SyslogLabelProvider_Unknown=<desconocida>\r
-SyslogMonitor_ColFacility=Instalación\r
+SyslogMonitor_ColFacility=Instalaci\u00f3n\r
 SyslogMonitor_ColHostName=Nombre del Equipo\r
 SyslogMonitor_ColMessage=Mensaje\r
 SyslogMonitor_ColSeverity=Gravedad\r
@@ -94,5 +94,5 @@ SyslogMonitor_ShowStatusColors=Mostrar &colores para el estado
 SyslogMonitor_ShowStatusIcons=Mostrar &iconos para el estado\r
 SyslogMonitor_SubscribeJob_Error=No es posible suscribir al syslog de eventos\r
 SyslogMonitor_SubscribeJob_Title=Suscribiendo al syslog de eventos\r
-SyslogMonitor_UnsubscribeJob_Error=No es posible cancelar la suscripción al syslog de eventos\r
-SyslogMonitor_UnsubscribeJob_Title=Cancelar la suscripción al syslog de eventos\r
+SyslogMonitor_UnsubscribeJob_Error=No es posible cancelar la suscripci\u00f3n al syslog de eventos\r
+SyslogMonitor_UnsubscribeJob_Title=Cancelar la suscripci\u00f3n al syslog de eventos\r
diff --git a/webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_ru.properties b/webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_ru.properties
new file mode 100644 (file)
index 0000000..b84a1e5
--- /dev/null
@@ -0,0 +1,98 @@
+EditEventTemplateDialog_Description=Description
+EditEventTemplateDialog_EventCode=Event code
+EditEventTemplateDialog_EventName=Event name
+EditEventTemplateDialog_Message=Message
+EditEventTemplateDialog_Severity=Severity
+EditEventTemplateDialog_TitleCreate=Create Event Template
+EditEventTemplateDialog_TitleEdit=Edit Event Template
+EditEventTemplateDialog_WriteToLog=&Write to event log
+EventConfigurator_ColCode=Code
+EventConfigurator_ColDescription=Description
+EventConfigurator_ColFlags=Flags
+EventConfigurator_ColMessage=Message
+EventConfigurator_ColName=Name
+EventConfigurator_ColSeverity=Severity
+EventConfigurator_CreateJob_Error=Cannot create new event template
+EventConfigurator_CreateJob_Title=Create new event template
+EventConfigurator_Delete=&Delete
+EventConfigurator_DeleteConfirmationTitle=Confirm event template deletion
+EventConfigurator_DeleteConfirmation_Plural=Do you really wish to delete selected event templates?
+EventConfigurator_DeleteConfirmation_Singular=Do you really wish to delete selected event template?
+EventConfigurator_DeleteJob_Error=Cannot delete event template
+EventConfigurator_DeleteJob_Title=Delete event templates
+EventConfigurator_NewEvent=&New event template...
+EventConfigurator_OpenJob_Error=Cannot open event configuration
+EventConfigurator_OpenJob_Title=Open event configuration
+EventConfigurator_Properties=&Properties...
+EventConfigurator_UpdateJob_Error=Cannot update event template
+EventConfigurator_UpdateJob_Title=Update event template
+EventLabelProvider_Unknown=<unknown>
+EventMonitor_ColEvent=Event
+EventMonitor_ColMessage=Message
+EventMonitor_ColSeverity=Severity
+EventMonitor_ColSource=Source
+EventMonitor_ColTimestamp=Timestamp
+EventMonitor_ShowStatusColors=Show status &colors
+EventMonitor_ShowStatusIcons=Show status &icons
+EventSelectionDialog_Code=Code
+EventSelectionDialog_Filter=Filter:
+EventSelectionDialog_Name=Name
+EventSelectionDialog_Title=Select Event
+EventSelector_None=<none>
+EventSelector_Severity=]\nSeverity: 
+EventSelector_Tooltip=Select event
+EventSelector_Unknown=<unknown>
+OpenEventConfigurator_Error=Error
+OpenEventConfigurator_ErrorText=Error opening view: 
+OpenEventMonitor_Error=Error
+OpenEventMonitor_ErrorText=Error opening view: 
+OpenSyslogMonitor_Error=Error
+OpenSyslogMonitor_ErrorText=Error opening view: 
+OpenSyslogMonitor_JobError=Cannot subscribe to syslog events
+OpenSyslogMonitor_JobTitle=Subscribing to syslog events
+SyslogLabelProvider_FacAuth=Auth
+SyslogLabelProvider_FacClock=Clock
+SyslogLabelProvider_FacCron=Cron
+SyslogLabelProvider_FacFTPD=FTPD
+SyslogLabelProvider_FacKernel=Kernel
+SyslogLabelProvider_FacLocal0=Local0
+SyslogLabelProvider_FacLocal1=Local1
+SyslogLabelProvider_FacLocal2=Local2
+SyslogLabelProvider_FacLocal3=Local3
+SyslogLabelProvider_FacLocal4=Local4
+SyslogLabelProvider_FacLocal5=Local5
+SyslogLabelProvider_FacLocal6=Local6
+SyslogLabelProvider_FacLocal7=Local7
+SyslogLabelProvider_FacLogAlert=Log Alert
+SyslogLabelProvider_FacLogAudit=Log Audit
+SyslogLabelProvider_FacLpr=Lpr
+SyslogLabelProvider_FacMail=Mail
+SyslogLabelProvider_FacNTP=NTP
+SyslogLabelProvider_FacNews=News
+SyslogLabelProvider_FacSecurity=Security
+SyslogLabelProvider_FacSyslog=Syslog
+SyslogLabelProvider_FacSystem=System
+SyslogLabelProvider_FacUUCP=UUCP
+SyslogLabelProvider_FacUser=User
+SyslogLabelProvider_SevAlert=Alert
+SyslogLabelProvider_SevCritical=Critical
+SyslogLabelProvider_SevDebug=Debug
+SyslogLabelProvider_SevEmergency=Emergency
+SyslogLabelProvider_SevError=Error
+SyslogLabelProvider_SevInfo=Informational
+SyslogLabelProvider_SevNotice=Notice
+SyslogLabelProvider_SevWarning=Warning
+SyslogLabelProvider_Unknown=<unknown>
+SyslogMonitor_ColFacility=Facility
+SyslogMonitor_ColHostName=Host Name
+SyslogMonitor_ColMessage=Message
+SyslogMonitor_ColSeverity=Severity
+SyslogMonitor_ColSource=Source
+SyslogMonitor_ColTag=Tag
+SyslogMonitor_ColTimestamp=Timestamp
+SyslogMonitor_ShowStatusColors=Show status &colors
+SyslogMonitor_ShowStatusIcons=Show status &icons
+SyslogMonitor_SubscribeJob_Error=Cannot subscribe to syslog events
+SyslogMonitor_SubscribeJob_Title=Subscribing to syslog events
+SyslogMonitor_UnsubscribeJob_Error=Cannot unsubscribe from syslog events
+SyslogMonitor_UnsubscribeJob_Title=Unsubscribe from syslog events
diff --git a/webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_zh_CN.properties b/webui/webapp/EventManager/src/org/netxms/ui/eclipse/eventmanager/messages_zh_CN.properties
new file mode 100644 (file)
index 0000000..b84a1e5
--- /dev/null
@@ -0,0 +1,98 @@
+EditEventTemplateDialog_Description=Description
+EditEventTemplateDialog_EventCode=Event code
+EditEventTemplateDialog_EventName=Event name
+EditEventTemplateDialog_Message=Message
+EditEventTemplateDialog_Severity=Severity
+EditEventTemplateDialog_TitleCreate=Create Event Template
+EditEventTemplateDialog_TitleEdit=Edit Event Template
+EditEventTemplateDialog_WriteToLog=&Write to event log
+EventConfigurator_ColCode=Code
+EventConfigurator_ColDescription=Description
+EventConfigurator_ColFlags=Flags
+EventConfigurator_ColMessage=Message
+EventConfigurator_ColName=Name
+EventConfigurator_ColSeverity=Severity
+EventConfigurator_CreateJob_Error=Cannot create new event template
+EventConfigurator_CreateJob_Title=Create new event template
+EventConfigurator_Delete=&Delete
+EventConfigurator_DeleteConfirmationTitle=Confirm event template deletion
+EventConfigurator_DeleteConfirmation_Plural=Do you really wish to delete selected event templates?
+EventConfigurator_DeleteConfirmation_Singular=Do you really wish to delete selected event template?
+EventConfigurator_DeleteJob_Error=Cannot delete event template
+EventConfigurator_DeleteJob_Title=Delete event templates
+EventConfigurator_NewEvent=&New event template...
+EventConfigurator_OpenJob_Error=Cannot open event configuration
+EventConfigurator_OpenJob_Title=Open event configuration
+EventConfigurator_Properties=&Properties...
+EventConfigurator_UpdateJob_Error=Cannot update event template
+EventConfigurator_UpdateJob_Title=Update event template
+EventLabelProvider_Unknown=<unknown>
+EventMonitor_ColEvent=Event
+EventMonitor_ColMessage=Message
+EventMonitor_ColSeverity=Severity
+EventMonitor_ColSource=Source
+EventMonitor_ColTimestamp=Timestamp
+EventMonitor_ShowStatusColors=Show status &colors
+EventMonitor_ShowStatusIcons=Show status &icons
+EventSelectionDialog_Code=Code
+EventSelectionDialog_Filter=Filter:
+EventSelectionDialog_Name=Name
+EventSelectionDialog_Title=Select Event
+EventSelector_None=<none>
+EventSelector_Severity=]\nSeverity: 
+EventSelector_Tooltip=Select event
+EventSelector_Unknown=<unknown>
+OpenEventConfigurator_Error=Error
+OpenEventConfigurator_ErrorText=Error opening view: 
+OpenEventMonitor_Error=Error
+OpenEventMonitor_ErrorText=Error opening view: 
+OpenSyslogMonitor_Error=Error
+OpenSyslogMonitor_ErrorText=Error opening view: 
+OpenSyslogMonitor_JobError=Cannot subscribe to syslog events
+OpenSyslogMonitor_JobTitle=Subscribing to syslog events
+SyslogLabelProvider_FacAuth=Auth
+SyslogLabelProvider_FacClock=Clock
+SyslogLabelProvider_FacCron=Cron
+SyslogLabelProvider_FacFTPD=FTPD
+SyslogLabelProvider_FacKernel=Kernel
+SyslogLabelProvider_FacLocal0=Local0
+SyslogLabelProvider_FacLocal1=Local1
+SyslogLabelProvider_FacLocal2=Local2
+SyslogLabelProvider_FacLocal3=Local3
+SyslogLabelProvider_FacLocal4=Local4
+SyslogLabelProvider_FacLocal5=Local5
+SyslogLabelProvider_FacLocal6=Local6
+SyslogLabelProvider_FacLocal7=Local7
+SyslogLabelProvider_FacLogAlert=Log Alert
+SyslogLabelProvider_FacLogAudit=Log Audit
+SyslogLabelProvider_FacLpr=Lpr
+SyslogLabelProvider_FacMail=Mail
+SyslogLabelProvider_FacNTP=NTP
+SyslogLabelProvider_FacNews=News
+SyslogLabelProvider_FacSecurity=Security
+SyslogLabelProvider_FacSyslog=Syslog
+SyslogLabelProvider_FacSystem=System
+SyslogLabelProvider_FacUUCP=UUCP
+SyslogLabelProvider_FacUser=User
+SyslogLabelProvider_SevAlert=Alert
+SyslogLabelProvider_SevCritical=Critical
+SyslogLabelProvider_SevDebug=Debug
+SyslogLabelProvider_SevEmergency=Emergency
+SyslogLabelProvider_SevError=Error
+SyslogLabelProvider_SevInfo=Informational
+SyslogLabelProvider_SevNotice=Notice
+SyslogLabelProvider_SevWarning=Warning
+SyslogLabelProvider_Unknown=<unknown>
+SyslogMonitor_ColFacility=Facility
+SyslogMonitor_ColHostName=Host Name
+SyslogMonitor_ColMessage=Message
+SyslogMonitor_ColSeverity=Severity
+SyslogMonitor_ColSource=Source
+SyslogMonitor_ColTag=Tag
+SyslogMonitor_ColTimestamp=Timestamp
+SyslogMonitor_ShowStatusColors=Show status &colors
+SyslogMonitor_ShowStatusIcons=Show status &icons
+SyslogMonitor_SubscribeJob_Error=Cannot subscribe to syslog events
+SyslogMonitor_SubscribeJob_Title=Subscribing to syslog events
+SyslogMonitor_UnsubscribeJob_Error=Cannot unsubscribe from syslog events
+SyslogMonitor_UnsubscribeJob_Title=Unsubscribe from syslog events
index ba52db5..31fae78 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2012 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -126,8 +126,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                        }\r
                });\r
                viewer.getTable().addDisposeListener(new DisposeListener() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void widgetDisposed(DisposeEvent e)\r
                        {\r
@@ -262,8 +260,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
        private void makeActions()\r
        {\r
                actionRefresh = new RefreshAction() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -272,8 +268,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                };\r
 \r
                actionNew = new Action() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -284,8 +278,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                actionNew.setImageDescriptor(Activator.getImageDescriptor("icons/new.png")); //$NON-NLS-1$\r
 \r
                actionEdit = new Action() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -297,8 +289,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                actionEdit.setEnabled(false);\r
 \r
                actionDelete = new Action() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -319,8 +309,6 @@ public class EventConfigurator extends ViewPart implements SessionListener
                MenuManager menuMgr = new MenuManager();\r
                menuMgr.setRemoveAllWhenShown(true);\r
                menuMgr.addMenuListener(new IMenuListener() {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        public void menuAboutToShow(IMenuManager mgr)\r
                        {\r
                                fillContextMenu(mgr);\r
index cf5183d..7d98d71 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -97,8 +97,6 @@ public class EventMonitor extends AbstractTraceView implements SessionListener
                super.createActions();\r
                \r
                actionShowColor = new Action(Messages.EventMonitor_ShowStatusColors, Action.AS_CHECK_BOX) {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -109,8 +107,6 @@ public class EventMonitor extends AbstractTraceView implements SessionListener
                actionShowColor.setChecked(labelProvider.isShowColor());\r
                \r
                actionShowIcons = new Action(Messages.EventMonitor_ShowStatusIcons, Action.AS_CHECK_BOX) {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
index 9c9ad8c..134bd40 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -130,8 +130,6 @@ public class SyslogMonitor extends AbstractTraceView implements SessionListener
                super.createActions();\r
                \r
                actionShowColor = new Action(Messages.SyslogMonitor_ShowStatusColors, Action.AS_CHECK_BOX) {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
@@ -142,8 +140,6 @@ public class SyslogMonitor extends AbstractTraceView implements SessionListener
                actionShowColor.setChecked(labelProvider.isShowColor());\r
                \r
                actionShowIcons = new Action(Messages.SyslogMonitor_ShowStatusIcons, Action.AS_CHECK_BOX) {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
                        @Override\r
                        public void run()\r
                        {\r
index 817e9bc..d36e352 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -39,8 +39,6 @@ import org.netxms.ui.eclipse.shared.ConsoleSharedData;
  */\r
 public class EventLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private static final Color FOREGROUND_COLOR_DARK = new Color(Display.getCurrent(), 0, 0, 0);\r
        private static final Color FOREGROUND_COLOR_LIGHT = new Color(Display.getCurrent(), 255, 255, 255);\r
        private static final Color[] FOREGROUND_COLORS =\r
index 6506f39..825e539 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -30,8 +30,6 @@ import org.netxms.ui.eclipse.views.helpers.AbstractTraceViewFilter;
  */\r
 public class EventMonitorFilter extends AbstractTraceViewFilter\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private NXCSession session;\r
        \r
        /**\r
index ef93dd3..c3505f0 100644 (file)
@@ -16,8 +16,6 @@ import org.netxms.ui.eclipse.widgets.SortableTableViewer;
  */\r
 public class EventTemplateComparator extends ViewerComparator\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)\r
         */\r
index 4a25857..a02b745 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -30,8 +30,6 @@ import org.netxms.ui.eclipse.eventmanager.views.EventConfigurator;
  */\r
 public class EventTemplateLabelProvider extends WorkbenchLabelProvider implements ITableLabelProvider\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        @Override\r
        public Image getColumnImage(Object element, int columnIndex)\r
        {\r
index a92d97c..975b0df 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -39,8 +39,6 @@ import org.netxms.ui.eclipse.shared.ConsoleSharedData;
  */\r
 public class SyslogLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private static final Color FOREGROUND_COLOR_DARK = new Color(Display.getCurrent(), 0, 0, 0);\r
        private static final Color FOREGROUND_COLOR_LIGHT = new Color(Display.getCurrent(), 255, 255, 255);\r
        private static final Color[] FOREGROUND_COLORS =\r
index 180e3ff..4fdc511 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2011 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -30,8 +30,6 @@ import org.netxms.ui.eclipse.views.helpers.AbstractTraceViewFilter;
  */\r
 public class SyslogMonitorFilter extends AbstractTraceViewFilter\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private NXCSession session;\r
        \r
        /**\r
index b45499d..712e9b1 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -34,8 +34,6 @@ import org.netxms.ui.eclipse.widgets.AbstractSelector;
  */\r
 public class EventSelector extends AbstractSelector\r
 {\r
-       private static final long serialVersionUID = 1L;\r
-\r
        private long eventCode = 0;\r
        \r
        /**\r