intermediate release 1.2.10-M3
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 10 Nov 2013 16:34:19 +0000 (18:34 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 10 Nov 2013 16:34:19 +0000 (18:34 +0200)
16 files changed:
.gitignore
build/next_build_number.pl
src/install/windows/netxms-x64.iss
src/install/windows/setup.iss
src/java/build/pack.cmd
src/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java [new file with mode: 0644]
src/java/netxms-eclipse/core/nxmc.product
src/java/netxms-eclipse/core/plugin.xml
webui/webapp/Core/nxmc.warproduct
webui/webapp/Core/src/org/netxms/webui/core/ApplicationActionBarAdvisor.java
webui/webapp/Core/src/org/netxms/webui/core/Messages.java
webui/webapp/Core/src/org/netxms/webui/core/dialogs/DefaultLoginForm.java
webui/webapp/Core/src/org/netxms/webui/core/messages.properties
webui/webapp/Core/src/org/netxms/webui/core/messages_es.properties
webui/webapp/Core/src/org/netxms/webui/core/messages_ru.properties
webui/webapp/Core/src/org/netxms/webui/core/messages_zh_CN.properties

index 280b664..86910ab 100644 (file)
@@ -106,6 +106,13 @@ target
 /src/client/nxsms/nxsms
 /src/flow_analyzer/nxflowd/MSG00001.bin
 /src/flow_analyzer/nxflowd/messages.h
+/src/install/windows/Output
+/src/java/build/*.gz
+/src/java/build/*.zip
+/src/java/build/linux.*
+/src/java/build/macosx.*
+/src/java/build/solaris.*
+/src/java/build/win32.*
 /src/java/certificate-manager/.classpath
 /src/java/certificate-manager/.project
 /src/java/certificate-manager/.settings
index ce5c14b..ac1302d 100644 (file)
@@ -33,3 +33,11 @@ copy("../android/src/console/res/values/build_number.xml","../android/src/agent/
 open my $outcmd, '>', "../src/java/build/set_build_number.cmd" or die "cannot open set_build_number.cmd";
 print $outcmd "set build_number=$build\n";
 close $outcmd;
+
+open my $outjava, '>', "../src/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java" or die "cannot open BuildNumber.java";
+print $outjava "package org.netxms.base;\n";
+print $outjava "public final class BuildNumber {\n";
+print $outjava "   public static final String TEXT = \"$build\";\n";
+print $outjava "   public static final int NUMBER = $build;\n";
+print $outjava "}\n";
+close $outjava;
index f0d3c62..6850d00 100644 (file)
@@ -1,7 +1,7 @@
 ; Installation script for NetXMS Server / Windows x64
 
 #include "setup.iss"
-OutputBaseFilename=netxms-1.2.9-x64
+OutputBaseFilename=netxms-1.2.10-M3-x64
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
@@ -175,18 +175,18 @@ Source: "..\..\..\x64\Release\nxpush.exe"; DestDir: "{app}\bin"; Flags: ignoreve
 Source: "..\..\..\x64\Release\nxapush.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 Source: "..\..\..\x64\Release\nxappget.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 ; Third party files
-Source: "Files-x64\libeay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "Files-x64\ssleay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "Files-x64\libmysql.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\mysql
-Source: "Files-x64\libpq.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
-Source: "Files-x64\libintl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
-Source: "Files-x64\oci.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
-Source: "Files-x64\oraociei11.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
-Source: "Files-x64\jre\*"; DestDir: "{app}\bin\jre"; Flags: ignoreversion recursesubdirs; Components: jre
+Source: "..\files\windows\x64\libeay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
+Source: "..\files\windows\x64\ssleay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
+Source: "..\files\windows\x64\libmysql.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\mysql
+Source: "..\files\windows\x64\libpq.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
+Source: "..\files\windows\x64\libintl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
+Source: "..\files\windows\x64\oci.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
+Source: "..\files\windows\x64\oraociei11.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
+Source: "..\files\windows\x64\jre\*"; DestDir: "{app}\bin\jre"; Flags: ignoreversion recursesubdirs; Components: jre
 ; Install-time files
-Source: "Files-x64\vcredist_x64.exe"; DestDir: "{app}\var"; DestName: "vcredist.exe"; Flags: ignoreversion deleteafterinstall; Components: base
-Source: "Files\rm.exe"; DestDir: "{app}\var"; Flags: ignoreversion deleteafterinstall; Components: base
-Source: "Files-x64\sqlncli.msi"; DestDir: "{app}\var"; Flags: ignoreversion deleteafterinstall; Components: server\mssql
+Source: "..\files\windows\x64\vcredist_x64.exe"; DestDir: "{app}\var"; DestName: "vcredist.exe"; Flags: ignoreversion deleteafterinstall; Components: base
+Source: "..\files\windows\x86\rm.exe"; DestDir: "{app}\var"; Flags: ignoreversion deleteafterinstall; Components: base
+Source: "..\files\windows\x64\sqlncli.msi"; DestDir: "{app}\var"; Flags: ignoreversion deleteafterinstall; Components: server\mssql
 
 #include "icons.iss"
 #include "run-full.iss"
index e517a09..72818eb 100644 (file)
@@ -1,7 +1,7 @@
 [Setup]
 AppName=NetXMS
-AppVerName=NetXMS 1.2.10-M2
-AppVersion=1.2.10-M2
+AppVerName=NetXMS 1.2.10-M3
+AppVersion=1.2.10-M3
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org
index 4ba3a42..5e5893e 100644 (file)
@@ -1,6 +1,6 @@
 @echo off
 call set_build_number.cmd
-set version=1.2.10-M2-%build_number%
+set version=1.2.10-M3-%build_number%
 
 cd win32.win32.x86
 zip -r nxmc-%version%-win32-x86.zip nxmc
diff --git a/src/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java b/src/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java
new file mode 100644 (file)
index 0000000..b394111
--- /dev/null
@@ -0,0 +1,5 @@
+package org.netxms.base;
+public final class BuildNumber {
+   public static final String TEXT = "7848";
+   public static final int NUMBER = 7848;
+}
index 574cfa5..01ae3e5 100644 (file)
@@ -8,7 +8,7 @@
       <text>
          NetXMS Management Console
 
-Version 1.2.10
+Version 1.2.10-M3
 Copyright (c) 2003-2013 Victor Kirhenshtein, Alex Kirhenshtein
       </text>
    </aboutInfo>
@@ -36,6 +36,7 @@ Copyright (c) 2003-2013 Victor Kirhenshtein, Alex Kirhenshtein
       </win>
    </launcher>
 
+
    <vm>
    </vm>
 
index 528dc0e..4c44072 100644 (file)
@@ -71,7 +71,7 @@
          </property>
          <property
                name="aboutText"
-               value="NetXMS Management Console&#x0A;&#x0A;Version 1.2.10&#x0A;Copyright (c) 2003-2013 Victor Kirhenshtein, Alex Kirhenshtein">
+               value="NetXMS Management Console&#x0A;&#x0A;Version 1.2.10-M3&#x0A;Copyright (c) 2003-2013 Victor Kirhenshtein, Alex Kirhenshtein">
          </property>
          <property
                name="startupForegroundColor"
index 6930adf..8efb8e5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="NXMC" uid="org.netxms.nxmc" version="1.2.9" useFeatures="false" includeLaunchers="false">
+<product name="NXMC" uid="org.netxms.nxmc" version="1.2.10" useFeatures="false" includeLaunchers="false">
    <plugins>
       <plugin id="com.ibm.icu"/>
       <plugin id="javax.xml"/>
index 8b514bd..37b7a67 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.actions.ContributionItemFactory;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
+import org.netxms.base.BuildNumber;
 import org.netxms.base.NXCommon;
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;
 import org.netxms.ui.eclipse.shared.IActionConstants;
@@ -84,7 +85,9 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor
                                }
                                else
                                {
-                                       MessageDialog.openInformation(window.getShell(), Messages.get().ApplicationActionBarAdvisor_About, Messages.get().ApplicationActionBarAdvisor_AboutText1 + NXCommon.VERSION + Messages.get().ApplicationActionBarAdvisor_AboutText2);
+                                       MessageDialog.openInformation(window.getShell(), 
+                                                       Messages.get().ApplicationActionBarAdvisor_About, 
+                                                       String.format(Messages.get().ApplicationActionBarAdvisor_AboutText, NXCommon.VERSION + " (" + BuildNumber.TEXT +")"));
                                }
                        }
                };
index 97eca8b..f232a20 100644 (file)
@@ -13,8 +13,7 @@ public class Messages extends NLS
        public String ApplicationActionBarAdvisor_About;
        public String ApplicationActionBarAdvisor_AboutActionName;
        public String ApplicationActionBarAdvisor_AboutProductName;
-       public String ApplicationActionBarAdvisor_AboutText1;
-       public String ApplicationActionBarAdvisor_AboutText2;
+       public String ApplicationActionBarAdvisor_AboutText;
        public String ApplicationActionBarAdvisor_Config;
        public String ApplicationActionBarAdvisor_File;
        public String ApplicationActionBarAdvisor_Help;
index 85d682b..40362a1 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2012 Victor Kirhenshtein
+ * Copyright (C) 2003-2013 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
@@ -47,6 +47,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.ImageHyperlink;
+import org.netxms.base.BuildNumber;
 import org.netxms.base.NXCommon;
 import org.netxms.ui.eclipse.console.api.LoginForm;
 import org.netxms.ui.eclipse.tools.ColorCache;
@@ -242,7 +243,7 @@ public class DefaultLoginForm extends Window implements LoginForm
                });
                
                Label version = new Label(parent, SWT.NONE);
-               version.setText(Messages.get().LoginForm_Version + NXCommon.VERSION);
+               version.setText(String.format(Messages.get().LoginForm_Version, NXCommon.VERSION + " (" + BuildNumber.TEXT + ")"));
                version.setBackground(parent.getBackground());
                version.setForeground(colors.create(255, 255, 255));
                gd = new GridData();
index eccbf34..62fb82f 100644 (file)
@@ -8,8 +8,7 @@ AbstractTraceView_ShowFilter=Show &filter
 ApplicationActionBarAdvisor_About=About
 ApplicationActionBarAdvisor_AboutActionName=&About %s
 ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
-ApplicationActionBarAdvisor_AboutText1=NetXMS Management Console (Web Edition)\nVersion 
-ApplicationActionBarAdvisor_AboutText2=\nCopyright (c) 2003-2013 Raden Solutions
+ApplicationActionBarAdvisor_AboutText=NetXMS Management Console (Web Edition)\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_Config=&Configuration
 ApplicationActionBarAdvisor_File=&File
 ApplicationActionBarAdvisor_Help=&Help
@@ -41,7 +40,7 @@ LoginForm_Options=Options
 LoginForm_Password=Password
 LoginForm_Title=NetXMS Server Login
 LoginForm_UserName=User name
-LoginForm_Version=Version 
+LoginForm_Version=Version %s
 LoginJob_InitExtensions=Initializing extensions...
 LoginJob_LoadingEvents=Loading event configuration...
 LoginJob_Subscribing=Subscribing to notifications...
index d3b2f6e..c3877c3 100644 (file)
@@ -8,8 +8,7 @@ AbstractTraceView_ShowFilter=Show &filter
 ApplicationActionBarAdvisor_About=About
 ApplicationActionBarAdvisor_AboutActionName=&About %s
 ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
-ApplicationActionBarAdvisor_AboutText1=NetXMS Management Console (Web Edition)\nVersion 
-ApplicationActionBarAdvisor_AboutText2=\nCopyright (c) 2003-2013 Raden Solutions
+ApplicationActionBarAdvisor_AboutText=NetXMS Management Console (Web Edition)\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_Config=&Configuración
 ApplicationActionBarAdvisor_File=&Fichero
 ApplicationActionBarAdvisor_Help=&Ayuda
@@ -41,7 +40,7 @@ LoginForm_Options=Opciones
 LoginForm_Password=Contraseña
 LoginForm_Title=NetXMS Server Login
 LoginForm_UserName=Usuario
-LoginForm_Version=Version 
+LoginForm_Version=Version %s
 LoginJob_InitExtensions=Inicializando extensiones...
 LoginJob_LoadingEvents=Sincronizando configuración de eventos...
 LoginJob_Subscribing=Subscribiendo para notificaciones...
index 43367d9..91bfe41 100644 (file)
@@ -8,8 +8,7 @@ AbstractTraceView_ShowFilter=Show &filter
 ApplicationActionBarAdvisor_About=About
 ApplicationActionBarAdvisor_AboutActionName=&About %s
 ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
-ApplicationActionBarAdvisor_AboutText1=NetXMS Management Console (Web Edition)\nVersion 
-ApplicationActionBarAdvisor_AboutText2=\nCopyright (c) 2003-2013 Raden Solutions
+ApplicationActionBarAdvisor_AboutText=NetXMS Management Console (Web Edition)\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_Config=&Configuration
 ApplicationActionBarAdvisor_File=&File
 ApplicationActionBarAdvisor_Help=&Help
@@ -41,7 +40,7 @@ LoginForm_Options=Options
 LoginForm_Password=Password
 LoginForm_Title=NetXMS Server Login
 LoginForm_UserName=User name
-LoginForm_Version=Version 
+LoginForm_Version=Version %s
 LoginJob_InitExtensions=Initializing extensions...
 LoginJob_LoadingEvents=Loading event configuration...
 LoginJob_Subscribing=Subscribing to notifications...
index eccbf34..62fb82f 100644 (file)
@@ -8,8 +8,7 @@ AbstractTraceView_ShowFilter=Show &filter
 ApplicationActionBarAdvisor_About=About
 ApplicationActionBarAdvisor_AboutActionName=&About %s
 ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
-ApplicationActionBarAdvisor_AboutText1=NetXMS Management Console (Web Edition)\nVersion 
-ApplicationActionBarAdvisor_AboutText2=\nCopyright (c) 2003-2013 Raden Solutions
+ApplicationActionBarAdvisor_AboutText=NetXMS Management Console (Web Edition)\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_Config=&Configuration
 ApplicationActionBarAdvisor_File=&File
 ApplicationActionBarAdvisor_Help=&Help
@@ -41,7 +40,7 @@ LoginForm_Options=Options
 LoginForm_Password=Password
 LoginForm_Title=NetXMS Server Login
 LoginForm_UserName=User name
-LoginForm_Version=Version 
+LoginForm_Version=Version %s
 LoginJob_InitExtensions=Initializing extensions...
 LoginJob_LoadingEvents=Loading event configuration...
 LoginJob_Subscribing=Subscribing to notifications...