RCC codes fixed; versions fixed
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 7 Oct 2014 11:42:07 +0000 (14:42 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 7 Oct 2014 11:42:56 +0000 (14:42 +0300)
include/nxclapi.h
src/agent/subagents/logwatch/main.cpp
src/java/netxms-base/src/main/java/org/netxms/base/CommonRCC.java
src/java/netxms-client/src/main/java/org/netxms/client/constants/RCC.java
src/java/netxms-client/src/main/resources/messages.properties
src/java/netxms-client/src/main/resources/messages_es.properties
src/java/netxms-client/src/main/resources/messages_ru.properties
src/java/nxreporting/.classpath
src/java/nxreporting/pom.xml
src/java/nxshell/pom.xml
src/libnxcl/main.cpp

index a58066f..f8d7d27 100644 (file)
@@ -537,7 +537,8 @@ enum
 #define RCC_NO_LDAP_CONNECTION       ((UINT32)112)
 #define RCC_NO_ROUTING_TABLE         ((UINT32)113)
 #define RCC_NO_FDB                   ((UINT32)114)
-#define RCC_NO_LOC_HISTORY           ((UINT32)115)
+#define RCC_NO_LOCATION_HISTORY      ((UINT32)115)
+#define RCC_OBJECT_IN_USE            ((UINT32)116)
 
 /**
  * Mask bits for NXCModifyEventTemplate()
index 0eef306..573d57c 100644 (file)
@@ -1,6 +1,6 @@
 /*
 ** NetXMS LogWatch subagent
-** Copyright (C) 2008-2012 Victor Kirhenshtein
+** Copyright (C) 2008-2014 Victor Kirhenshtein
 **
 ** 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
 
 #include "logwatch.h"
 
-
-//
-// Externals
-//
-
 #ifdef _WIN32
 THREAD_RESULT THREAD_CALL ParserThreadEventLog(void *);
 THREAD_RESULT THREAD_CALL ParserThreadEventLogV6(void *);
 bool InitEventLogParsersV6();
 #endif
 
-
-//
-// Global variables
-//
-
+/**
+ * Shutdown condition
+ */
 CONDITION g_hCondShutdown = INVALID_CONDITION_HANDLE;
 
+/**
+ * Configured parsers
+ */
+static ObjectArray<LogParser> s_parsers(16, 16, true);
 
-//
-// Static data
-//
-
-#ifdef _NETWARE
-static CONDITION m_hCondTerminate = INVALID_CONDITION_HANDLE;
-#endif
-static DWORD m_numParsers = 0;
-static LogParser **m_parserList = NULL;
-
-
-//
-// File parsing thread
-//
-
+/**
+ * File parsing thread
+ */
 THREAD_RESULT THREAD_CALL ParserThreadFile(void *arg)
 {
        ((LogParser *)arg)->monitorFile(g_hCondShutdown, AgentWriteLog);
@@ -73,12 +58,15 @@ static LONG H_ParserStats(const TCHAR *cmd, const TCHAR *arg, TCHAR *value)
                return SYSINFO_RC_UNSUPPORTED;
 
        LogParser *parser = NULL;
-       for(DWORD i = 0; i < m_numParsers; i++)
-               if (!_tcsicmp(m_parserList[i]->getName(), name))
+       for(int i = 0; i < s_parsers.size(); i++)
+   {
+      LogParser *p = m_parsers.get(i);
+               if (!_tcsicmp(p->getName(), name))
                {
-                       parser = m_parserList[i];
+                       parser = p;
                        break;
                }
+   }
 
        if (parser == NULL)
        {
@@ -108,8 +96,8 @@ static LONG H_ParserStats(const TCHAR *cmd, const TCHAR *arg, TCHAR *value)
  */
 static LONG H_ParserList(const TCHAR *cmd, const TCHAR *arg, StringList *value)
 {
-       for(DWORD i = 0; i < m_numParsers; i++)
-               value->add(m_parserList[i]->getName());
+       for(int i = 0; i < s_parsers.size(); i++)
+               value->add(s_parsers.get(i)->getName());
        return SYSINFO_RC_SUCCESS;
 }
 
@@ -123,12 +111,10 @@ static void SubagentShutdown()
        if (g_hCondShutdown != INVALID_CONDITION_HANDLE)
                ConditionSet(g_hCondShutdown);
 
-       for(i = 0; i < m_numParsers; i++)
+       for(int i = 0; i < s_parsers.size(); i++)
        {
-               ThreadJoin(m_parserList[i]->getThread());
-               delete m_parserList[i];
+               ThreadJoin(s_parsers.get(i)->getThread());
        }
-       safe_free(m_parserList);
 
 #ifdef _WIN32
        CleanupEventLogParsers();
@@ -261,19 +247,19 @@ static BOOL SubagentInit(Config *config)
        for(int i = 0; i < (int)m_numParsers; i++)
        {
 #ifdef _WIN32
-               if (m_parserList[i]->getFileName()[0] == _T('*'))       // event log
+               if (s_parsers.get(i)->getFileName()[0] == _T('*'))      // event log
                {
-                       m_parserList[i]->setThread(ThreadCreateEx(eventLogParserThread, 0, m_parserList[i]));
+                       s_parsers.get(i)->setThread(ThreadCreateEx(eventLogParserThread, 0, s_parsers.get(i)));
                        // Seems that simultaneous calls to OpenEventLog() from two or more threads may
                        // cause entire process to hang
                        ThreadSleepMs(200);
                }
                else    // regular file
                {
-                       m_parserList[i]->setThread(ThreadCreateEx(ParserThreadFile, 0, m_parserList[i]));
+                       s_parsers.get(i)->setThread(ThreadCreateEx(ParserThreadFile, 0, s_parsers.get(i)));
                }
 #else
-               m_parserList[i]->setThread(ThreadCreateEx(ParserThreadFile, 0, m_parserList[i]));
+               s_parsers.get(i)->setThread(ThreadCreateEx(ParserThreadFile, 0, s_parsers.get(i)));
 #endif
        }
 
index 561e4d3..21c42b6 100644 (file)
@@ -60,5 +60,6 @@ public class CommonRCC
        public static final int HIGH_QUERY_COST = 104;
        public static final int LICENSE_VIOLATION = 105;
        public static final int CLIENT_LICENSE_EXCEEDED = 106;
-       public static final int OBJECT_ALREADY_EXISTS = 107;    
+       public static final int OBJECT_ALREADY_EXISTS = 107;
+   public static final int OBJECT_IN_USE = 116;
 }
index 8f98c91..395c3a1 100644 (file)
@@ -103,6 +103,7 @@ public final class RCC extends CommonRCC
    public static final int NO_LDAP_CONNECTION = 112;
    public static final int NO_ROUTING_TABLE = 113;
    public static final int NO_FDB = 114;
+   public static final int NO_LOCATION_HISTORY = 115;
        
        // SNMP-specific, has no corresponding RCC_xxx constants in C library
        public static final int BAD_MIB_FILE_HEADER = 1001;
index 81d108f..9702297 100644 (file)
@@ -113,6 +113,8 @@ RCC_0111 = Helpdesk link internal error
 RCC_0112 = LDAP connection error
 RCC_0113 = Routing table unavailable
 RCC_0114 = Switch forwading database unavailable
+RCC_0115 = Location history not available
+RCC_0116 = Object is in use and cannot be deleted
 RCC_1001 = Bad MIB file header
 RCC_1002 = Bad MIB file data
 RCC_UNKNOWN = Error %d
index bc8ddc5..89844b0 100644 (file)
@@ -113,6 +113,8 @@ RCC_0111 = Helpdesk link internal error
 RCC_0112 = LDAP connection error
 RCC_0113 = Routing table unavailable
 RCC_0114 = Switch forwading database unavailable
+RCC_0115 = Location history not available
+RCC_0116 = Object is in use and cannot be deleted
 RCC_1001 = Error en la cabecera del fichero MIB
 RCC_1002 = Error en los datos del fichero MIB
 RCC_UNKNOWN = Error %d
index 1dfc5d2..d757c5d 100644 (file)
@@ -113,6 +113,8 @@ RCC_0111 = \u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0441\u043e\
 RCC_0112 = \u041d\u0435\u0442 \u0441\u0432\u044f\u0437\u0438 \u0441 LDAP \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c
 RCC_0113 = \u0422\u0430\u0431\u043b\u0438\u0446\u0430 \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0446\u0438\u0438 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430
 RCC_0114 = \u0422\u0430\u0431\u043b\u0438\u0446\u0430 MAC \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430
+RCC_0115 = \u0418\u0441\u0442\u043e\u0440\u0438\u044f \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0439 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430
+RCC_0116 = \u041e\u0431\u044a\u0435\u043a\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0434\u0430\u043b\u0435\u043d
 RCC_1001 = \u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0444\u0430\u0439\u043b\u0430 MIB
 RCC_1002 = \u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0444\u0430\u0439\u043b\u0430 MIB
 RCC_UNKNOWN = \u041e\u0448\u0438\u0431\u043a\u0430 %d
index b5c1b80..79bdfc9 100644 (file)
@@ -1,74 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-       <classpathentry excluding="nxreporting.properties|logback.xml|**/*.java" kind="src" path="src/main/resources"/>
-       <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.7/mail-1.4.7.jar"/>
-       <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/4.0.4.RELEASE/spring-core-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/4.0.4.RELEASE/spring-context-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/4.0.4.RELEASE/spring-aop-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/4.0.4.RELEASE/spring-beans-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/4.0.4.RELEASE/spring-expression-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/4.0.4.RELEASE/spring-context-support-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/4.0.4.RELEASE/spring-orm-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/4.0.4.RELEASE/spring-jdbc-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/4.0.4.RELEASE/spring-tx-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/4.3.5.Final/hibernate-entitymanager-4.3.5.Final.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-annotations/1.2.0.Beta1/jboss-logging-annotations-1.2.0.Beta1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/4.3.5.Final/hibernate-core-4.3.5.Final.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.0.Final/jboss-transaction-api_1.2_spec-1.0.0.Final.jar"/>
-       <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/hibernate/common/hibernate-commons-annotations/4.0.4.Final/hibernate-commons-annotations-4.0.4.Final.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar"/>
-       <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/jboss/jandex/1.1.0.Final/jandex-1.1.0.Final.jar"/>
-       <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
-       <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.0.10/logback-classic-1.0.10.jar"/>
-       <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.0.10/logback-core-1.0.10.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.2.1/quartz-2.2.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1.1/c3p0-0.9.1.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/4.0.4.RELEASE/spring-test-4.0.4.RELEASE.jar"/>
-       <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-       <classpathentry kind="var" path="M2_REPO/net/sf/jpathwatch/jpathwatch/0.95/jpathwatch-0.95.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/2.2.2/groovy-all-2.2.2.jar"/>
-       <classpathentry kind="var" path="M2_REPO/net/sf/jasperreports/jasperreports/5.5.2/jasperreports-5.5.2.jar"/>
-       <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar"/>
-       <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/2.1/commons-digester-2.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.7.js2/itext-2.1.7.js2.jar"/>
-       <classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar"/>
-       <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bctsp-jdk14/1.38/bctsp-jdk14-1.38.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bcprov-jdk14/1.38/bcprov-jdk14-1.38.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bcmail-jdk14/1.38/bcmail-jdk14-1.38.jar"/>
-       <classpathentry kind="var" path="M2_REPO/jfree/jcommon/1.0.15/jcommon-1.0.15.jar"/>
-       <classpathentry kind="var" path="M2_REPO/jfree/jfreechart/1.0.12/jfreechart-1.0.12.jar"/>
-       <classpathentry kind="var" path="M2_REPO/eclipse/jdtcore/3.1.0/jdtcore-3.1.0.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/codehaus/castor/castor/1.2/castor-1.2.jar"/>
-       <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.1.4/jackson-databind-2.1.4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.1.4/jackson-annotations-2.1.4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/4.5.1/lucene-core-4.5.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.5.1/lucene-analyzers-common-4.5.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queryparser/4.5.1/lucene-queryparser-4.5.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queries/4.5.1/lucene-queries-4.5.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-sandbox/4.5.1/lucene-sandbox-4.5.1.jar"/>
-       <classpathentry kind="var" path="M2_REPO/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/olap4j/olap4j/0.9.7.309-JS-3/olap4j-0.9.7.309-JS-3.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.7/poi-3.7.jar"/>
-       <classpathentry kind="var" path="M2_REPO/org/postgresql/postgresql/9.3-1101-jdbc4/postgresql-9.3-1101-jdbc4.jar"/>
-       <classpathentry kind="var" path="M2_REPO/com/informix/ifxjdbc/4.10.0/ifxjdbc-4.10.0.jar"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/netxms-base"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/netxms-client-api"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="nxreporting.properties|logback.xml|**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.7/mail-1.4.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/4.0.4.RELEASE/spring-core-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/4.0.4.RELEASE/spring-context-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/4.0.4.RELEASE/spring-aop-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/4.0.4.RELEASE/spring-beans-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/4.0.4.RELEASE/spring-expression-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/4.0.4.RELEASE/spring-context-support-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/4.0.4.RELEASE/spring-orm-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/4.0.4.RELEASE/spring-jdbc-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/4.0.4.RELEASE/spring-tx-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/4.3.5.Final/hibernate-entitymanager-4.3.5.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-annotations/1.2.0.Beta1/jboss-logging-annotations-1.2.0.Beta1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/4.3.5.Final/hibernate-core-4.3.5.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.0.Final/jboss-transaction-api_1.2_spec-1.0.0.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/common/hibernate-commons-annotations/4.0.4.Final/hibernate-commons-annotations-4.0.4.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jandex/1.1.0.Final/jandex-1.1.0.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.0.10/logback-classic-1.0.10.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.0.10/logback-core-1.0.10.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.2.1/quartz-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1.1/c3p0-0.9.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/netxms/netxms-base/1.2.17/netxms-base-1.2.17.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/netxms/netxms-client-api/1.2.17/netxms-client-api-1.2.17.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/4.0.4.RELEASE/spring-test-4.0.4.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/jpathwatch/jpathwatch/0.95/jpathwatch-0.95.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/2.2.2/groovy-all-2.2.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/jasperreports/jasperreports/5.5.2/jasperreports-5.5.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/2.1/commons-digester-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.7.js2/itext-2.1.7.js2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar"/>
+  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bctsp-jdk14/1.38/bctsp-jdk14-1.38.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bcprov-jdk14/1.38/bcprov-jdk14-1.38.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bcmail-jdk14/1.38/bcmail-jdk14-1.38.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jfree/jcommon/1.0.15/jcommon-1.0.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jfree/jfreechart/1.0.12/jfreechart-1.0.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/eclipse/jdtcore/3.1.0/jdtcore-3.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/castor/castor/1.2/castor-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.1.4/jackson-databind-2.1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.1.4/jackson-annotations-2.1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/4.5.1/lucene-core-4.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.5.1/lucene-analyzers-common-4.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queryparser/4.5.1/lucene-queryparser-4.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queries/4.5.1/lucene-queries-4.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-sandbox/4.5.1/lucene-sandbox-4.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/olap4j/olap4j/0.9.7.309-JS-3/olap4j-0.9.7.309-JS-3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.7/poi-3.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/postgresql/postgresql/9.3-1101-jdbc4/postgresql-9.3-1101-jdbc4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/informix/ifxjdbc/4.10.0/ifxjdbc-4.10.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/oracle/ojdbc6/11.2.0.3/ojdbc6-11.2.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.31/mysql-connector-java-5.1.31.jar"/>
+</classpath>
\ No newline at end of file
index fb74b9f..914b488 100644 (file)
@@ -6,7 +6,7 @@
 
     <groupId>com.radensolutions</groupId>
     <artifactId>nxreporting</artifactId>
-    <version>1.2.15</version>
+    <version>1.2.17</version>
 
     <properties>
         <spring.version>4.0.4.RELEASE</spring.version>
index b7f2fcb..c3a1b5d 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
       <groupId>org.netxms</groupId>
       <artifactId>netxms</artifactId>
-      <version>1.2.16</version>
+      <version>1.2.17</version>
     </parent>
 
     <groupId>org.netxms</groupId>
index c577d1c..20eb4b1 100644 (file)
@@ -390,9 +390,11 @@ const TCHAR LIBNXCL_EXPORTABLE *NXCGetErrorText(UINT32 dwError)
       _T("Helpdesk link internal error"),
       _T("LDAP connection error"),
       _T("Routing table unavailable"),
-      _T("Switch forwarding database unavailable")
+      _T("Switch forwarding database unavailable"),
+      _T("Location history not available"),
+      _T("Object is in use and cannot be deleted")
    };
-       return (dwError <= RCC_NO_FDB) ? pszErrorText[dwError] : _T("No text message for this error");
+       return (dwError <= RCC_OBJECT_IN_USE) ? pszErrorText[dwError] : _T("No text message for this error");
 }
 
 #if defined(_WIN32) && !defined(UNDER_CE)