Merge branch 'master' into CP-15410

Conflicts: XenAdmin/Core/Registry.cs
2025-01-20 07:19:18 +01:00 · 2016-01-27 14:06:13 +00:00 · 2016-01-27 14:06:13 +00:00 · 5461838925
commit 5461838925
parent 2c41a4cfeb 1990980228
16 changed files with 164 additions and 61 deletions
--- a/Branding/branding.sh
+++ b/Branding/branding.sh
@ -34,3 +34,21 @@ BRANDING_XC_PRODUCT_5_6_VERSION=5.6
 BRANDING_XC_PRODUCT_6_2_VERSION=6.2
 BRANDING_XC_PRODUCT_6_5_VERSION=6.5
 BRANDING_XENSERVER_UPDATE_URL="http://updates.xensource.com/XenServer/updates.xml"
+BRANDING_HIDDEN_FEATURE=license_nag
+
+#GUID
+BRANDING_VNC_CONTROL_UPGRADE_CODE_GUID=A77AF69F-14AF-4cd0-B978-236945C7AC97
+BRANDING_VNC_MAIN_CONTROL_GUID=C2E335C1-3ADF-492d-BD03-27DA10A44232
+BRANDING_XENCENTER_UPGRADE_CODE_GUID=EA0EF50F-5CC6-452B-B09F-3F5EC564899D
+BRANDING_JA_RESOURCES_GUID=D3ADD803-AF0B-4787-AC29-C6387FFF403B
+BRANDING_SC_RESOURCES_GUID=381e9319-f0c4-4c69-a1c2-0a2fc725bd19
+BRANDING_REPORT_VIEWER_GUID=D01090B9-1988-4ab4-B48A-D0B6161FAA48
+BRANDING_MAIN_EXECUTABLE_GUID=64FEF765-7593-4612-8D4D-EE81CF704DEB
+BRANDING_TEST_RESOURCES_GUID=FA8D4F56-A94A-467c-9E6B-F3DC26F95B1E
+BRANDING_EXTERNAL_TOOLS_GUID=D5FC0252-C97B-46e7-9633-A6B68EDB6654
+BRANDING_SCHEMAS_FILES_GUID=E2186CD8-5064-4414-8AD7-E4495B6A3204
+BRANDING_REGISTRY_ENTRIES_GUID=193BAE1F-F2AE-4451-94DC-4B105DB5179C
+BRANDING_APPLICAION_SHOTCUT_GUID=6B875059-26BC-4fa7-ACB7-0B9A4E4665CA
+BRANDING_README_FILE_GUID=47427a60-4064-4fdb-878d-04309a0fd9ce
+BRANDING_XSUPDATE_FILE_GUID=1cfbf607-cc80-4bf8-b2fc-37e69c872316
+BRANDING_HEALTH_CHECK_GUID=9D686BFC-B4FD-435F-AC74-0ACE29425095
--- a/WixInstaller/XenCenter.l10n.diff
+++ b/WixInstaller/XenCenter.l10n.diff
@ -28,10 +28,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 # SUCH DAMAGE.

--- XenCenter.wxs	2016-01-22 10:35:17.587404800 +0800
-+++ XenCenter.l10n.wxs	2016-01-22 10:35:46.740319800 +0800
+--- XenCenter.wxs	2016-01-25 17:12:12.929899400 +0800
+++ XenCenter.l10n.wxs	2016-01-25 17:13:13.493104800 +0800
@@ -38,7 +38,7 @@
-     <?define UpgradeCode="{EA0EF50F-5CC6-452B-B09F-3F5EC564899D}"?>
+     <?define UpgradeCode="{@BRANDING_XENCENTER_UPGRADE_CODE_GUID@}"?>
     <?define ProductCode="{65AE1345-A520-456D-8A19-2F52D43D3A09}"?>
     <Product Id="$(var.ProductCode)" Name="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Language="$(env.WixLangId)" Version="$(var.ProductVersion)" Manufacturer="@BRANDING_COMPANY_NAME_LEGAL@" UpgradeCode="$(var.UpgradeCode)">
 -        <Package Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Comments="none." InstallerVersion="200" Compressed="yes" />
@ -39,7 +39,7 @@
         <Media Id="1" Cabinet="XenCenter.cab" EmbedCab="yes" />
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
-@@ -86,68 +86,68 @@
+@@ -86,64 +86,64 @@
                             <File Id="XslicIcon" Source="..\Branding\Images\file_license.ico" />
                             <File Id="XkbIcon" Source="..\Branding\Images\file_backup.ico" />
                             <File Id="XsupdateIcon" Source="..\Branding\Images\file_updates.ico" />
@ -127,17 +127,21 @@
                                 </Extension>
                             </ProgId>
                         </Component>
-                        <Component Id="xsupdatesfiles" Guid="1cfbf607-cc80-4bf8-b2fc-37e69c872316">
-+                        <Component Id="xsupdatesfiles" Guid="1cfbf607-cc80-4bf8-b2fc-37e69c872316">
-                             <Condition>"$(env.Branding)"="XenCenter"</Condition>
-                             <File Id="hotfixCowley" Source="..\XenAdmin\XS56EFP1002.xsupdate" />
-                             <File Id="hotfixMNR" Source="..\XenAdmin\XS56E008.xsupdate" />
-@@ -166,6 +166,26 @@
+@@ -159,7 +159,7 @@
+                         </Component>
+                         <Component Id="readmefile" Guid="@BRANDING_README_FILE_GUID@">
+                             <Condition><![CDATA["$(env.Branding)"<>"XenCenter"]]></Condition>
+-                            <File Id="Readme" Source="..\Branding\WixInstaller\README.TXT" />
+                            <File Id="Readme" Source="..\Branding\WixInstaller\!(loc.Readme)" />
+                         </Component>
+                         <!-- TestResources -->
+                         <Directory Id="TestReso" ShortName="TestReso" Name="TestResources">
+@@ -171,6 +171,26 @@
                                 <File Id="interes3.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-xenapp.xml" />
                             </Component>
                         </Directory>
 +                        <Directory Id="ja" Name="ja">
-+                            <Component Id="JaResources" Guid="D3ADD803-AF0B-4787-AC29-C6387FFF403B">
+                            <Component Id="JaResources" Guid="@BRANDING_JA_RESOURCES_GUID@">
 +                                <File Id="JaResourcesDLL" Source="..\XenAdmin\bin\Release\ja\XenCenterMain.resources.dll" />
 +                                <File Id="JaXenModResourcesDLL" Source="..\XenAdmin\bin\Release\ja\XenModel.resources.dll" />
 +                                <File Id="JaMicRepVwrCmnResDLL" Source="..\XenAdmin\ReportViewer\Microsoft.ReportViewer.Common.resources.dll" />
@ -147,7 +151,7 @@
 +                            </Component>
 +                        </Directory>
 +                        <Directory Id="sc" Name="zh-CN">
-+                            <Component Id="ScResources" Guid="381e9319-f0c4-4c69-a1c2-0a2fc725bd19">
+                            <Component Id="ScResources" Guid="@BRANDING_SC_RESOURCES_GUID@">
 +                                <File Id="ScResourcesDLL" Source="..\XenAdmin\bin\Release\zh-CN\XenCenterMain.resources.dll" />
 +                                <File Id="ScXenModResourcesDLL" Source="..\XenAdmin\bin\Release\zh-CN\XenModel.resources.dll" />
 +                                <File Id="ScMicRepVwrCmnResDLL" Source="..\XenAdmin\ReportViewer\Microsoft.ReportViewer.Common.resources.dll" />
@ -157,9 +161,9 @@
 +                            </Component>
 +                        </Directory>
                         <Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
-                             <Component Id="ExternalToolsComponent" Guid="D5FC0252-C97B-46e7-9633-A6B68EDB6654">
+                             <Component Id="ExternalToolsComponent" Guid="@BRANDING_EXTERNAL_TOOLS_GUID@">
                                 <File Id="XENSERVERLINUXFIXUP" Source="..\XenOvfApi\External Tools\xenserver-linuxfixup-disk.iso" />
-@@ -246,8 +266,10 @@
+@@ -253,9 +273,11 @@
 	
         <Feature Id="MainProgram" Title="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow" >
             <ComponentRef Id="MainExecutable" />
@ -167,11 +171,12 @@
 +            <ComponentRef Id="JaResources" />
 +            <ComponentRef Id="ScResources" />
             <ComponentRef Id="xsupdatesfiles" />
+             <ComponentRef Id="readmefile" />
 +            <ComponentRef Id="ReportViewer" />
             <ComponentRef Id="TestResources" />
             <ComponentRef Id="SchemasFilesComponent" />
             <ComponentRef Id="ExternalToolsComponent" />
-@@ -266,7 +288,7 @@
+@@ -274,7 +296,7 @@
         <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
         <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
         <PropertyRef Id="NETFRAMEWORK45" />
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@ -35,7 +35,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
    <?define ProductVersion="1.0.0" ?>
-    <?define UpgradeCode="{EA0EF50F-5CC6-452B-B09F-3F5EC564899D}"?>
+    <?define UpgradeCode="{@BRANDING_XENCENTER_UPGRADE_CODE_GUID@}"?>
    <?define ProductCode="{65AE1345-A520-456D-8A19-2F52D43D3A09}"?>
    <Product Id="$(var.ProductCode)" Name="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Language="$(env.WixLangId)" Version="$(var.ProductVersion)" Manufacturer="@BRANDING_COMPANY_NAME_LEGAL@" UpgradeCode="$(var.UpgradeCode)">
        <Package Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Comments="none." InstallerVersion="200" Compressed="yes" />
@ -44,7 +44,7 @@
            <Directory Id="ProgramFilesFolder">
                <Directory Id="Citrix" Name="@BRANDING_COMPANY_NAME_SHORT@">
                    <Directory Id="INSTALLDIR" ShortName="XenCente" Name="@BRANDING_BRAND_CONSOLE@">
-                        <Component Id="ReportViewer" Guid="D01090B9-1988-4ab4-B48A-D0B6161FAA48">
+                        <Component Id="ReportViewer" Guid="@BRANDING_REPORT_VIEWER_GUID@">
                            <File Id="MicRepVwrCmnDLL" Source="..\XenAdmin\ReportViewer\Microsoft.ReportViewer.Common.dll" />
                            <File Id="MicRepVwrPrcObjDLL" Source="..\XenAdmin\ReportViewer\Microsoft.ReportViewer.ProcessingObjectModel.dll" />
                            <File Id="MicRepVwrWFDLL" Source="..\XenAdmin\ReportViewer\Microsoft.ReportViewer.WinForms.dll" />
@ -57,7 +57,7 @@
                            <File Id="ReportConfigXML" Source="..\XenAdmin\ReportViewer\reports.xml" />
                            <File Id="ResourceReportRDLC" Source="..\XenAdmin\ReportViewer\resource_report.rdlc" />
                        </Component>
-                        <Component Id="MainExecutable" Guid="64FEF765-7593-4612-8D4D-EE81CF704DEB">
+                        <Component Id="MainExecutable" Guid="@BRANDING_MAIN_EXECUTABLE_GUID@">
                            <!-- XenCenter EXE -->
                            <File Id="XenCenterEXE" Source="..\XenAdmin\bin\Release\@BRANDING_BRAND_CONSOLE@.exe" KeyPath="yes" />
                            <!-- other EXEs -->
@ -147,7 +147,7 @@
                                </Extension>
                            </ProgId>
                        </Component>
-                        <Component Id="xsupdatesfiles" Guid="1cfbf607-cc80-4bf8-b2fc-37e69c872316">
+                        <Component Id="xsupdatesfiles" Guid="@BRANDING_XSUPDATE_FILE_GUID@">
                            <Condition>"$(env.Branding)"="XenCenter"</Condition>
                            <File Id="hotfixCowley" Source="..\XenAdmin\XS56EFP1002.xsupdate" />
                            <File Id="hotfixMNR" Source="..\XenAdmin\XS56E008.xsupdate" />
@ -157,9 +157,14 @@
                            <File Id="hotfixSanibelToClearwaterSource" Source="..\XenAdmin\XS62E006-src-pkgs.tar.gz" />
                            <File Id="hotfixCreedence" Source="..\XenAdmin\XS65ESP1006.xsupdate" />
                        </Component>
+                        <Component Id="readmefile" Guid="@BRANDING_README_FILE_GUID@">
+                            <Condition><![CDATA["$(env.Branding)"<>"XenCenter"]]></Condition>
+                            <File Id="Readme" Source="..\Branding\WixInstaller\README.TXT" />
+                        </Component>
                        <!-- TestResources -->
                        <Directory Id="TestReso" ShortName="TestReso" Name="TestResources">
-                            <Component Id="TestResources" Guid="FA8D4F56-A94A-467c-9E6B-F3DC26F95B1E">
+                            <Component Id="TestResources" Guid="@BRANDING_TEST_RESOURCES_GUID@">
+                                <Condition>"$(env.Branding)"="XenCenter"</Condition>
                                <File Source="..\XenAdmin\bin\Release\TestResources\credits.xml" />
                                <File Id="interes1.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-development.xml" />
                                <File Id="interes2.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-production.xml" />
@ -167,13 +172,13 @@
                            </Component>
                        </Directory>
                        <Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
-                            <Component Id="ExternalToolsComponent" Guid="D5FC0252-C97B-46e7-9633-A6B68EDB6654">
+                            <Component Id="ExternalToolsComponent" Guid="@BRANDING_EXTERNAL_TOOLS_GUID@">
                                <File Id="XENSERVERLINUXFIXUP" Source="..\XenOvfApi\External Tools\xenserver-linuxfixup-disk.iso" />
                                <File Id="REFERENCEVHD" Source="..\XenOvfApi\External Tools\bootablereference.vhd.bz2" />
                            </Component>
                        </Directory>
                        <Directory Id="SCHEMAS" Name="Schemas">
-                            <Component Id="SchemasFilesComponent" Guid="E2186CD8-5064-4414-8AD7-E4495B6A3204">
+                            <Component Id="SchemasFilesComponent" Guid="@BRANDING_SCHEMAS_FILES_GUID@">
                                <File Id="CIMOSXML" Source="..\XenAdmin\bin\Release\Schemas\CIM_OperatingSystem.xml" />
                                <File Id="CIMRASDXML" Source="..\XenAdmin\bin\Release\Schemas\CIM_ResourceAllocationSettingData.xml" />
                                <File Id="CIMRASDXSD" Source="..\XenAdmin\bin\Release\Schemas\CIM_ResourceAllocationSettingData.xsd" />
@ -191,7 +196,8 @@
                        </Directory>
                    </Directory>
                	<Directory Id="HEALTHCHECKSERVICEDIR" Name="XenServerHealthCheckService">
-							<Component Id="XenServerHealthCheck" Guid="{9D686BFC-B4FD-435F-AC74-0ACE29425095}">
+							<Component Id="XenServerHealthCheck" Guid="{@BRANDING_HEALTH_CHECK_GUID@}">
+                                <Condition>"$(env.Branding)"="XenCenter"</Condition>
 								<File Id="HealthCheck_XenServerHealthCheck.exe" Name="XenServerHealthCheck.exe" KeyPath="yes" Source="..\XenServerHealthCheck\bin\Release\XenServerHealthCheck.exe" />
 								<File Id="HealthCheck_CommandLib.dll" Name="CommandLib.dll" Source="..\XenServerHealthCheck\bin\Release\CommandLib.dll" />
 								<File Id="HealthCheck_CookComputing.XmlRpcV2.dll" Name="CookComputing.XmlRpcV2.dll" Source="..\XenServerHealthCheck\bin\Release\CookComputing.XmlRpcV2.dll" />
@ -230,14 +236,15 @@
            </Directory>
        </Directory>
        <DirectoryRef Id="TARGETDIR">
-            <Component Id="RegistryEntries" Guid="193BAE1F-F2AE-4451-94DC-4B105DB5179C">
+            <Component Id="RegistryEntries" Guid="@BRANDING_REGISTRY_ENTRIES_GUID@">
                <RegistryKey Root="HKMU" Key="Software\@BRANDING_COMPANY_NAME_SHORT@\@BRANDING_BRAND_CONSOLE@">
                    <RegistryValue Type="string" Name="InstallDir" Value="[INSTALLDIR]" />
+                    <RegistryValue Type="string" Name="HiddenFeatures" Value="@BRANDING_HIDDEN_FEATURE@" />
                </RegistryKey>
            </Component>
        </DirectoryRef>
        <DirectoryRef Id="ApplicationProgramsFolder">
-            <Component Id="ApplicationShortcut" Guid="6B875059-26BC-4fa7-ACB7-0B9A4E4665CA">
+            <Component Id="ApplicationShortcut" Guid="@BRANDING_APPLICAION_SHOTCUT_GUID@">
                <Shortcut Id="startmenuXenCenter" ShortName="XenCen50" Name="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Description="@BRANDING_BRAND_CONSOLE@ Shortcut" Target="[INSTALLDIR]@BRANDING_BRAND_CONSOLE@.exe" WorkingDirectory="INSTALLDIR" Icon="XenCenterICO" />
                <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
                <RegistryValue Root="HKCU" Key="Software\@BRANDING_COMPANY_NAME_SHORT@\@BRANDING_BRAND_CONSOLE@" Name="installed" Type="integer" Value="1" KeyPath="yes" />
@ -248,6 +255,7 @@
            <ComponentRef Id="MainExecutable" />
            <ComponentRef Id="ReportViewer" />
            <ComponentRef Id="xsupdatesfiles" />
+            <ComponentRef Id="readmefile" />
            <ComponentRef Id="TestResources" />
            <ComponentRef Id="SchemasFilesComponent" />
            <ComponentRef Id="ExternalToolsComponent" />
--- a/WixInstaller/en-us.wxl
+++ b/WixInstaller/en-us.wxl
@ -12,4 +12,5 @@
    <String Id="XenServer_OEM_Update_File">@BRANDING_SERVER@ OEM Update File</String>
    <String Id="XenCenter_Saved_Search">@BRANDING_BRAND_CONSOLE@ Saved Search</String>
    <String Id="Required_For_Installation">.NET Framework 4 is required for this installation.</String>
+    <String Id="Readme">README.TXT</String>
 </WixLocalization>
--- a/WixInstaller/ja-jp.wxl
+++ b/WixInstaller/ja-jp.wxl
@ -12,4 +12,5 @@
    <String Id="XenServer_OEM_Update_File">@BRANDING_SERVER@ OEM アップデート ファイル</String>
    <String Id="XenCenter_Saved_Search">@BRANDING_BRAND_CONSOLE@ 保存された検索条件</String>
    <String Id="Required_For_Installation">この製品をインストールするには、.NET Framework 4 が必要です。</String>
+    <String Id="Readme">README.TXT</String>
 </WixLocalization>
--- a/WixInstaller/vnccontrol.wxs
+++ b/WixInstaller/vnccontrol.wxs
@ -35,7 +35,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
    <?define ProductVersion="1.0.0" ?>
-    <?define UpgradeCode="{A77AF69F-14AF-4cd0-B978-236945C7AC97}"?>
+    <?define UpgradeCode="{@BRANDING_VNC_CONTROL_UPGRADE_CODE_GUID@}"?>
    <?define ProductCode="{0CE5C3E7-E786-467a-80CF-F3EC04D414E4}"?>
    <?define VersionShort="5.5" ?>
    <Product Id="$(var.ProductCode)" Name="@BRANDING_COMPANY_NAME_SHORT@ VNCControl" Language="$(env.WiXLangId)" Version="$(var.ProductVersion)" Manufacturer="@BRANDING_COMPANY_NAME_LEGAL@" UpgradeCode="$(var.UpgradeCode)">
@ -45,7 +45,7 @@
            <Directory Id="ProgramFilesFolder">
                <Directory Id="Citrix" Name="@BRANDING_COMPANY_NAME_SHORT@">
                    <Directory Id="INSTALLDIR" ShortName="VNCContr" Name="VNCControl">
-                        <Component Id="MainControl" Guid="C2E335C1-3ADF-492d-BD03-27DA10A44232">
+                        <Component Id="MainControl" Guid="@BRANDING_VNC_MAIN_CONTROL_GUID@">
                            <!--Main VNC Control-->
                            <File Id="VNCControlDLL" Source="..\VNCControl\bin\Release\VNCControl.dll" />
                            <!-- DLLs -->
--- a/WixInstaller/zh-cn.wxl
+++ b/WixInstaller/zh-cn.wxl
@ -12,4 +12,5 @@
    <String Id="XenServer_OEM_Update_File">@BRANDING_SERVER@ OEM 更新文件</String>
    <String Id="XenCenter_Saved_Search">@BRANDING_BRAND_CONSOLE@ 保存的搜索</String>
    <String Id="Required_For_Installation">此安装需要 .NET Framework 4。</String>
+    <String Id="Readme">声明.TXT</String>
 </WixLocalization>
--- a/XenAdmin/Controls/CheckableDataGridView/CheckableDataGridView.cs
+++ b/XenAdmin/Controls/CheckableDataGridView/CheckableDataGridView.cs
@ -291,7 +291,16 @@ namespace XenAdmin.Controls.CheckableDataGridView
            if (rowIndex < 0 || rowIndex >= Rows.Count)
                return;

-            CurrentCell = Rows[rowIndex].Cells[0];
+            CurrentCell = null;
+            // Set CurrentCell to first visible cell
+            for (int i = 0; i < Rows[rowIndex].Cells.Count; i++)
+            {
+                if (Rows[rowIndex].Cells[i].Visible)
+                {
+                    CurrentCell = Rows[rowIndex].Cells[i];
+                    break;
+                }
+            } 
            Rows[rowIndex].Selected = highlightStatus;
        }

--- a/XenAdmin/Core/Registry.cs
+++ b/XenAdmin/Core/Registry.cs
@ -394,6 +394,12 @@ namespace XenAdmin.Core
            { return HiddenFeatures != null && HiddenFeatures.Contains(LICENSE_NAG_HIDDEN); }
        }

+        internal static bool LicenseOperationsHidden
+        {
+            get
+            { return HiddenFeatures != null && HiddenFeatures.Contains(LICENSE_OPERATIONS_HIDDEN); }
+        }
+
        private const string SSL_CERTIFICATES_CHANGED_ONLY = "CHANGED";
        private const string SSL_CERTIFICATES_ALL = "ALL";
        private const string SSL_CERTIFICATES_KEY = "ForceSSLCertificates";
@ -423,9 +429,10 @@ namespace XenAdmin.Core
        private const string TOOL_STRIP_MENU_ITEM_HIDDEN = "tool_strip_menu_item";
        private const string CROSS_SERVER_PRIVATE_NETWORK_HIDDEN = "cross_server_private_network";
        private const string COPYRIGHT_HIDDEN = "copyright";
-        private const string HEALTH_CHECK_HIDDEN = "health_check"; 
+        private const string HEALTH_CHECK_HIDDEN = "health_check";
        private const string UPLOAD_OPTION_HIDDEN = "upload_option";
        private const string LICENSE_NAG_HIDDEN = "license_nag";
+        private const string LICENSE_OPERATIONS_HIDDEN = "license_operations";
    }

    public enum SSLCertificateTypes { None, Changed, All }
--- a/XenAdmin/Dialogs/LicenseManager/ILicenseManagerView.cs
+++ b/XenAdmin/Dialogs/LicenseManager/ILicenseManagerView.cs
@ -60,5 +60,6 @@ namespace XenAdmin.Dialogs
        Control Parent { get; }
        void DrawSummaryInformation(string info, bool show);
        void SetRowDisabledRowInfo(int rowIndex, string info, bool disabled);
+        void DrawViewAsReadOnly(bool isReadOnly);
    }
 }
--- a/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs
+++ b/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs
@ -37,6 +37,7 @@ using System.Windows.Forms;
 using XenAdmin.Controls;
 using XenAdmin.Controls.CheckableDataGridView;
 using XenAdmin.Controls.SummaryPanel;
+using XenAdmin.Core;
 using XenAdmin.Properties;
 using XenAPI;

@ -57,6 +58,7 @@ namespace XenAdmin.Dialogs
            checkableDataGridView.LoadView();
            Controller = lmcontroller;
            Controller.View = this;
+            downloadLicenseServerLink.Visible = checkBoxColumn.Visible = !Controller.ReadOnlyView;
        }

        private void LoadView(List<IXenObject> itemsToShow, List<IXenObject> selectedItems)
@ -167,7 +169,7 @@ namespace XenAdmin.Dialogs
            Program.Invoke(this, Controller.Repopulate);
        }

-        #region ISummaryPanelView Members
+        #region ILicenseManagerView Members
        [EditorBrowsable(EditorBrowsableState.Never)]
        public LicenseManagerController Controller { set; private get; } 

@ -206,7 +208,7 @@ namespace XenAdmin.Dialogs

                                         summaryPanel.Title = lRow.XenObject.Name;
                                         summaryPanel.HelperUrl = Messages.LICENSE_MANAGER_BUY_LICENSE_LINK_TEXT;
-                                         summaryPanel.HelperUrlVisible = lRow.HelperUrlRequired;
+                                         summaryPanel.HelperUrlVisible = lRow.HelperUrlRequired && !Controller.ReadOnlyView;
                                         summaryPanel.WarningVisible = lRow.WarningRequired;
                                         summaryPanel.WarningText = lRow.WarningText;
                                         summaryPanel.SummaryText = summaryComponent;
@ -295,6 +297,23 @@ namespace XenAdmin.Dialogs
            checkableDataGridView.SetRowInformation(rowIndex, info, disabled);
        }

+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DrawViewAsReadOnly(bool isReadOnly)
+        {
+            if (isReadOnly)
+            {
+                activateFreeXenServerButton.Hide();
+                assignLicenceButton.Hide();
+                releaseLicenseButton.Hide();
+            }
+            else
+            {
+                activateFreeXenServerButton.Show();
+                assignLicenceButton.Show();
+                releaseLicenseButton.Show();
+            }
+        }
+
        #endregion
    }
 }
--- a/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs
+++ b/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs
@ -53,6 +53,7 @@ namespace XenAdmin.Dialogs
        {
            ActivationRequest = new LicenseActivationRequest();
            VerifierFactory = new LicenseSelectionVerifierFactory();
+            ReadOnlyView = Registry.LicenseOperationsHidden; 
        }

        public LicenseManagerController(ILicenseManagerView view)
@ -64,6 +65,8 @@ namespace XenAdmin.Dialogs

        public SelectionVerifierFactory VerifierFactory { private get; set; }

+        public bool ReadOnlyView { get; private set; }
+
        private void AddToGrid(List<IXenObject> dataToDraw)
        {
            View.DrawRowsInGrid(ConvertXenObjects(dataToDraw));
@ -107,7 +110,7 @@ namespace XenAdmin.Dialogs

        private void CheckPreSelectedRows(List<IXenObject> dataToCheck)
        {
-            if(dataToCheck.Count < 1)
+            if (dataToCheck.Count < 1 || ReadOnlyView)
            {
                DisableAllButtons();
                return;
@ -297,13 +300,15 @@ namespace XenAdmin.Dialogs
        public void UpdateButtonEnablement(List<LicenseDataGridViewRow> lRows)
        {
            //All buttons disabled?
-            if(lRows.Count < 1)
+            if(lRows.Count < 1 || ReadOnlyView)
            {
                DisableAllButtons();
-                
+                View.DrawViewAsReadOnly(ReadOnlyView);
                return;
            }

+            View.DrawViewAsReadOnly(ReadOnlyView);
+
            LicenseSelectionVerifier verifier;
            verifier = VerifierFactory.Verifier(SelectionVerifierFactory.Option.NotLive, lRows);
            if (verifier.Status  == LicenseSelectionVerifier.VerificationStatus.Error)
@ -351,7 +356,7 @@ namespace XenAdmin.Dialogs
            View.DrawAssignButtonAsDisabled(true);
            View.DrawReleaseButtonAsDisabled(true);
            View.DrawActivateButtonAsDisabled(true);
-            View.DrawActivateButtonAsHidden(false);
+            View.DrawActivateButtonAsHidden(ReadOnlyView);
        }

        private void ResetButtonEnablement()
--- a/XenModel/XenAPI-Extensions/Pool.cs
+++ b/XenModel/XenAPI-Extensions/Pool.cs
@ -117,7 +117,7 @@ namespace XenAPI
                foreach (Host.Edition edition in Enum.GetValues(typeof(Host.Edition)))
                {
                    Host.Edition edition1 = edition;
-                    Host host = hosts.Find(h => h.edition == Host.GetEditionText(edition1));
+                    Host host = hosts.Find(h => Host.GetEdition(h.edition) == edition1);

                    if (host != null)
                    {
--- a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs
+++ b/XenModel/XenAPI/FriendlyErrorNames.Designer.cs
@ -5268,7 +5268,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server rejected our configured authentication details..
+        ///   Looks up a localized string similar to WLB rejected our configured authentication details..
        /// </summary>
        public static string WLB_AUTHENTICATION_FAILED {
            get {
@ -5277,7 +5277,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server refused a connection to XenServer..
+        ///   Looks up a localized string similar to WLB refused a connection to the server..
        /// </summary>
        public static string WLB_CONNECTION_REFUSED {
            get {
@ -5304,7 +5304,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server reported an internal error..
+        ///   Looks up a localized string similar to WLB reported an internal error..
        /// </summary>
        public static string WLB_INTERNAL_ERROR {
            get {
@ -5313,7 +5313,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server rejected XenServer&apos;s request as malformed..
+        ///   Looks up a localized string similar to WLB rejected the server&apos;s request as malformed..
        /// </summary>
        public static string WLB_MALFORMED_REQUEST {
            get {
@ -5367,7 +5367,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server reported that XenServer rejected its configured authentication details..
+        ///   Looks up a localized string similar to WLB reported that the server rejected its configured authentication details..
        /// </summary>
        public static string WLB_XENSERVER_AUTHENTICATION_FAILED {
            get {
@ -5376,7 +5376,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server reported that XenServer refused it a connection (even though we&apos;re connecting perfectly fine in the other direction)..
+        ///   Looks up a localized string similar to WLB reported that the server refused it a connection (even though we&apos;re connecting perfectly fine in the other direction)..
        /// </summary>
        public static string WLB_XENSERVER_CONNECTION_REFUSED {
            get {
@ -5385,7 +5385,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server reported that XenServer said something to it that WLB wasn&apos;t expecting or didn&apos;t understand..
+        ///   Looks up a localized string similar to WLB reported that the server said something to it that WLB wasn&apos;t expecting or didn&apos;t understand..
        /// </summary>
        public static string WLB_XENSERVER_MALFORMED_RESPONSE {
            get {
@ -5394,7 +5394,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server reported that communication with XenServer timed out..
+        ///   Looks up a localized string similar to WLB reported that communication with the server timed out..
        /// </summary>
        public static string WLB_XENSERVER_TIMEOUT {
            get {
@ -5403,7 +5403,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The WLB server reported that its configured server name for this XenServer instance failed to resolve in DNS..
+        ///   Looks up a localized string similar to WLB reported that its configured server name for this server instance failed to resolve in DNS..
        /// </summary>
        public static string WLB_XENSERVER_UNKNOWN_HOST {
            get {
@ -5457,7 +5457,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Could not find any volumes supported by the Citrix XenServer Vss Provider.
+        ///   Looks up a localized string similar to Could not find any volumes supported by the Vss Provider.
        /// </summary>
        public static string XEN_VSS_REQ_ERROR_NO_VOLUMES_SUPPORTED {
            get {
@ -5475,7 +5475,7 @@ namespace XenAPI {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The Citrix XenServer Vss Provider is not loaded.
+        ///   Looks up a localized string similar to The Vss Provider is not loaded.
        /// </summary>
        public static string XEN_VSS_REQ_ERROR_PROV_NOT_LOADED {
            get {
--- a/XenModel/XenAPI/FriendlyErrorNames.resx
+++ b/XenModel/XenAPI/FriendlyErrorNames.resx
@ -1857,10 +1857,10 @@ Authorized Roles: {1}</value>
    <value>You attempted an operation on VM {0} that was judged to be unsafe by the server. This can happen if the VM would run on a CPU that has a potentially incompatible set of feature flags to those the VM requires. If you want to override this warning then use the 'force' option.</value>
  </data>
  <data name="WLB_AUTHENTICATION_FAILED" xml:space="preserve">
-    <value>The WLB server rejected our configured authentication details.</value>
+    <value>WLB rejected our configured authentication details.</value>
  </data>
  <data name="WLB_CONNECTION_REFUSED" xml:space="preserve">
-    <value>The WLB server refused a connection to XenServer.</value>
+    <value>WLB refused a connection to the server.</value>
  </data>
  <data name="WLB_CONNECTION_RESET" xml:space="preserve">
    <value>The connection to the WLB server was reset.</value>
@ -1869,10 +1869,10 @@ Authorized Roles: {1}</value>
    <value>This pool has wlb-enabled set to false.</value>
  </data>
  <data name="WLB_INTERNAL_ERROR" xml:space="preserve">
-    <value>The WLB server reported an internal error.</value>
+    <value>WLB reported an internal error.</value>
  </data>
  <data name="WLB_MALFORMED_REQUEST" xml:space="preserve">
-    <value>The WLB server rejected XenServer's request as malformed.</value>
+    <value>WLB rejected the server's request as malformed.</value>
  </data>
  <data name="WLB_MALFORMED_RESPONSE" xml:space="preserve">
    <value>The WLB server said something that XenServer wasn't expecting or didn't understand.</value>
@ -1890,19 +1890,19 @@ Authorized Roles: {1}</value>
    <value>The WLB URL is invalid. Ensure it is in format: &lt;ipaddress&gt;:&lt;port&gt;.  The configured/given URL is returned.</value>
  </data>
  <data name="WLB_XENSERVER_AUTHENTICATION_FAILED" xml:space="preserve">
-    <value>The WLB server reported that XenServer rejected its configured authentication details.</value>
+    <value>WLB reported that the server rejected its configured authentication details.</value>
  </data>
  <data name="WLB_XENSERVER_CONNECTION_REFUSED" xml:space="preserve">
-    <value>The WLB server reported that XenServer refused it a connection (even though we're connecting perfectly fine in the other direction).</value>
+    <value>WLB reported that the server refused it a connection (even though we're connecting perfectly fine in the other direction).</value>
  </data>
  <data name="WLB_XENSERVER_MALFORMED_RESPONSE" xml:space="preserve">
-    <value>The WLB server reported that XenServer said something to it that WLB wasn't expecting or didn't understand.</value>
+    <value>WLB reported that the server said something to it that WLB wasn't expecting or didn't understand.</value>
  </data>
  <data name="WLB_XENSERVER_TIMEOUT" xml:space="preserve">
-    <value>The WLB server reported that communication with XenServer timed out.</value>
+    <value>WLB reported that communication with the server timed out.</value>
  </data>
  <data name="WLB_XENSERVER_UNKNOWN_HOST" xml:space="preserve">
-    <value>The WLB server reported that its configured server name for this XenServer instance failed to resolve in DNS.</value>
+    <value>WLB reported that its configured server name for this server instance failed to resolve in DNS.</value>
  </data>
  <data name="XAPI_HOOK_FAILED" xml:space="preserve">
    <value>3rd party xapi hook failed</value>
@ -1926,13 +1926,13 @@ Authorized Roles: {1}</value>
    <value>Initialization of the VSS requester failed</value>
  </data>
  <data name="XEN_VSS_REQ_ERROR_NO_VOLUMES_SUPPORTED" xml:space="preserve">
-    <value>Could not find any volumes supported by the Citrix XenServer Vss Provider</value>
+    <value>Could not find any volumes supported by the Vss Provider</value>
  </data>
  <data name="XEN_VSS_REQ_ERROR_PREPARING_WRITERS" xml:space="preserve">
    <value>An attempt to prepare VSS writers for the snapshot failed</value>
  </data>
  <data name="XEN_VSS_REQ_ERROR_PROV_NOT_LOADED" xml:space="preserve">
-    <value>The Citrix XenServer Vss Provider is not loaded</value>
+    <value>The Vss Provider is not loaded</value>
  </data>
  <data name="XEN_VSS_REQ_ERROR_START_SNAPSHOT_SET_FAILED" xml:space="preserve">
    <value>An attempt to start a new VSS snapshot failed</value>
--- a/mk/re-branding.sh
+++ b/mk/re-branding.sh
@ -75,10 +75,32 @@ rebranding_global()
        -e "s#@BRANDING_XC_PRODUCT_6_2_VERSION@#${BRANDING_XC_PRODUCT_6_2_VERSION}#g" \
        -e "s#@BRANDING_XC_PRODUCT_6_5_VERSION@#${BRANDING_XC_PRODUCT_6_5_VERSION}#g" \
        -e "s#@BRANDING_XENSERVER_UPDATE_URL@#${BRANDING_XENSERVER_UPDATE_URL}#g" \
+        -e "s#@BRANDING_HIDDEN_FEATURE@#${BRANDING_HIDDEN_FEATURE}#g" \
        $1 > $1.tmp
    mv -f $1.tmp $1    
 }

+rebranding_GUID()
+{
+  sed -e "s#@BRANDING_VNC_CONTROL_UPGRADE_CODE_GUID@#${BRANDING_VNC_CONTROL_UPGRADE_CODE_GUID}#g" \
+      -e "s#@BRANDING_VNC_MAIN_CONTROL_GUID@#${BRANDING_VNC_MAIN_CONTROL_GUID}#g" \
+      -e "s#@BRANDING_XENCENTER_UPGRADE_CODE_GUID@#${BRANDING_XENCENTER_UPGRADE_CODE_GUID}#g" \
+      -e "s#@BRANDING_JA_RESOURCES_GUID@#${BRANDING_JA_RESOURCES_GUID}#g" \
+      -e "s#@BRANDING_SC_RESOURCES_GUID@#${BRANDING_SC_RESOURCES_GUID}#g" \
+      -e "s#@BRANDING_REPORT_VIEWER_GUID@#${BRANDING_REPORT_VIEWER_GUID}#g" \
+      -e "s#@BRANDING_MAIN_EXECUTABLE_GUID@#${BRANDING_MAIN_EXECUTABLE_GUID}#g" \
+      -e "s#@BRANDING_TEST_RESOURCES_GUID@#${BRANDING_TEST_RESOURCES_GUID}#g" \
+      -e "s#@BRANDING_EXTERNAL_TOOLS_GUID@#${BRANDING_EXTERNAL_TOOLS_GUID}#g" \
+      -e "s#@BRANDING_SCHEMAS_FILES_GUID@#${BRANDING_SCHEMAS_FILES_GUID}#g" \
+      -e "s#@BRANDING_REGISTRY_ENTRIES_GUID@#${BRANDING_REGISTRY_ENTRIES_GUID}#g" \
+      -e "s#@BRANDING_APPLICAION_SHOTCUT_GUID@#${BRANDING_APPLICAION_SHOTCUT_GUID}#g" \
+      -e "s#@BRANDING_README_FILE_GUID@#${BRANDING_README_FILE_GUID}#g" \
+      -e "s#@BRANDING_XSUPDATE_FILE_GUID@#${BRANDING_XSUPDATE_FILE_GUID}#g" \
+      -e "s#@BRANDING_HEALTH_CHECK_GUID@#${BRANDING_HEALTH_CHECK_GUID}#g" \
+      $1 > $1.tmp
+  mv -f $1.tmp $1   
+}
+
 version_brand_cpp()
 {
  for file in $1
@ -87,6 +109,14 @@ version_brand_cpp()
  done
 }

+branding_wxs()
+{
+  for file in $1
+  do
+    rebranding_global ${file} && rebranding_GUID ${file}
+  done
+}
+
 version_brand_csharp()
 {
  for projectName in $1
@ -150,9 +180,7 @@ rebranding_global ${REPO}/mk/ISO_files/AUTORUN.INF
 rebranding_global ${REPO}/WixInstaller/en-us.wxl
 rebranding_global ${REPO}/WixInstaller/ja-jp.wxl
 rebranding_global ${REPO}/WixInstaller/zh-cn.wxl
-rebranding_global ${REPO}/WixInstaller/XenCenter.l10n.diff
-rebranding_global ${REPO}/WixInstaller/XenCenter.wxs
-rebranding_global ${REPO}/WixInstaller/vnccontrol.wxs
+branding_wxs "${REPO}/WixInstaller/XenCenter.l10n.diff ${REPO}/WixInstaller/XenCenter.wxs ${REPO}/WixInstaller/vnccontrol.wxs"

 #XenAdminTests
 rebranding_global ${REPO}/XenAdminTests/TestResources/ContextMenuBuilderTestResults.xml