You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/11/20 11:06:16 UTC
[1/2] ambari git commit: AMBARI-8201 - Ambari Agent and Server MSI
Installer changes for branch-windows-dev (Eugene Chekanskiy via abaranchuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 7a4e75796 -> 648a2d8f1
AMBARI-8201 - Ambari Agent and Server MSI Installer changes for branch-windows-dev (Eugene Chekanskiy via abaranchuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54f8ea58
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54f8ea58
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54f8ea58
Branch: refs/heads/trunk
Commit: 54f8ea58a8cbb11941ef0418088492846863118a
Parents: 7a4e757
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Thu Nov 20 12:03:21 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Thu Nov 20 12:03:21 2014 +0200
----------------------------------------------------------------------
ambari-agent/pom.xml | 4 +-
.../src/main/package/msi/ambari-agent.wxs | 32 +++++++++----
ambari-agent/src/packages/windows.xml | 5 ++
ambari-server/pom.xml | 4 +-
.../src/main/package/msi/ambari-server.wxs | 50 ++++++++------------
5 files changed, 52 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/54f8ea58/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index c7e0b9d..a613141 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -765,7 +765,7 @@
<argument>dir</argument>
<argument>"."</argument>
<argument>-dr</argument>
- <argument>"AMBARI_AGENT_1.3.0_SNAPSHOT"</argument>
+ <argument>"AGENT_INSTALL_DIRECTORY"</argument>
<argument>-platform</argument>
<argument>Win64</argument>
<argument>-cg</argument>
@@ -788,7 +788,7 @@
<extensions>true</extensions>
<configuration>
<sourceFiles>
- <sourceFile>src/main/package/msi/ambari-agent.wxs</sourceFile>
+ <sourceFile>target/ambari-agent.wxs</sourceFile>
<sourceFile>target/ambari-agent-files.wxs</sourceFile>
</sourceFiles>
<outputDirectory>target</outputDirectory>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54f8ea58/ambari-agent/src/main/package/msi/ambari-agent.wxs
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/package/msi/ambari-agent.wxs b/ambari-agent/src/main/package/msi/ambari-agent.wxs
index cc2b8d8..3f292f4 100644
--- a/ambari-agent/src/main/package/msi/ambari-agent.wxs
+++ b/ambari-agent/src/main/package/msi/ambari-agent.wxs
@@ -16,23 +16,37 @@
limitations under the License.
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="BA555A14-081D-4521-9B35-BC37C50CF5A9" Name="Ambari Agent 1.3.0-SNAPSHOT" Language="1033"
- Version="1.3.0.0" Manufacturer="Apache Software Foundation"
- UpgradeCode="6A5C01ED-C9B3-45C0-8A69-4512AC9F65F7">
+ <?define Version = "${ambariVersion}" ?>
+ <Product Id="efc59d96-ea09-4a0d-ba90-317dc53cb6da" Name="Ambari Agent ${ambariVersion}" Language="1033"
+ Version="$(var.Version)" Manufacturer="Apache Software Foundation">
<Package Description="Ambari Agent for Windows" Comments="Ambari Agent for Windows" InstallerVersion="200"
Compressed="yes" Platform="x64"/>
+
<Media Id="1" Cabinet="simple.cab" EmbedCab="yes"/>
+
<Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder">
- <Directory Id="AMBARI_AGENT_1.3.0_SNAPSHOT" Name="ambari-agent-1.3.0-SNAPSHOT">
+ <Directory Id="AmbariDirectory" Name="ambari">
+ <Directory Id="AGENT_INSTALL_DIRECTORY" Name="ambari-agent-$(var.Version)">
</Directory>
</Directory>
</Directory>
+
<Feature Id="DefaultFeature" Title="Main Feature" Level="1">
<ComponentGroupRef Id="AmbariAgentGroup"/>
</Feature>
- <Property Id="WIXUI_INSTALLDIR" Value="AMBARI_AGENT_1.3.0_SNAPSHOT"/>
- <UI/>
- <UIRef Id="WixUI_InstallDir"/>
+ <Property Id="WIXUI_INSTALLDIR" Value="AGENT_INSTALL_DIRECTORY"/>
+ <UI>
+ <UIRef Id="WixUI_InstallDir" />
+ <Publish Dialog="WelcomeDlg"
+ Control="Next"
+ Event="NewDialog"
+ Value="InstallDirDlg"
+ Order="2">1</Publish>
+ <Publish Dialog="InstallDirDlg"
+ Control="Back"
+ Event="NewDialog"
+ Value="WelcomeDlg"
+ Order="2">1</Publish>
+ </UI>
</Product>
-</Wix>
\ No newline at end of file
+</Wix>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54f8ea58/ambari-agent/src/packages/windows.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/src/packages/windows.xml b/ambari-agent/src/packages/windows.xml
index 1abca20..6b395fb 100644
--- a/ambari-agent/src/packages/windows.xml
+++ b/ambari-agent/src/packages/windows.xml
@@ -78,5 +78,10 @@
<outputDirectory>data</outputDirectory>
<filtered>true</filtered>
</file>
+ <file>
+ <source>${basedir}/src/main/package/msi/ambari-agent.wxs</source>
+ <outputDirectory>../../</outputDirectory>
+ <filtered>true</filtered>
+ </file>
</files>
</assembly>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54f8ea58/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 196e9e1..733ab3f 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1271,7 +1271,7 @@
<argument>dir</argument>
<argument>"."</argument>
<argument>-dr</argument>
- <argument>"AMBARI_SERVER_MSI"</argument>
+ <argument>"SERVER_INSTALL_DIRECTORY"</argument>
<argument>-platform</argument>
<argument>Win64</argument>
<argument>-cg</argument>
@@ -1302,7 +1302,7 @@
<objectFile>target/ambari-server.wixobj</objectFile>
<objectFile>target/ambari-server-files.wixobj</objectFile>
</objectFiles>
- <outputFile>target/ambari-server-${ambariVersion}.msi</outputFile>
+ <outputFile>target/ambari-server-${project.version}.msi</outputFile>
<extensions>
<extension>WixUIExtension</extension>
</extensions>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54f8ea58/ambari-server/src/main/package/msi/ambari-server.wxs
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/msi/ambari-server.wxs b/ambari-server/src/main/package/msi/ambari-server.wxs
index 4a1afe8..e9adbc6 100644
--- a/ambari-server/src/main/package/msi/ambari-server.wxs
+++ b/ambari-server/src/main/package/msi/ambari-server.wxs
@@ -16,45 +16,35 @@
limitations under the License.
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-<?define Version = "${ambariVersion}" ?>
-<?define UpgradeCode = "c8f5c145-c0aa-4d50-b1f5-ac9bc4055fb8" ?>
- <Product Id="*" Name="Ambari Server ${ambariVersion}-SNAPSHOT" Language="1033"
- Version="$(var.Version)" Manufacturer="Apache Software Foundation"
- UpgradeCode="$(var.UpgradeCode)">
+ <?define Version = "${ambariVersion}" ?>
+ <Product Id="c8f5c145-c0aa-4d50-b1f5-ac9bc4055fb8" Name="Ambari Server ${ambariVersion}" Language="1033"
+ Version="$(var.Version)" Manufacturer="Apache Software Foundation">
<Package Description="Ambari Server for Windows" Comments="Ambari Server for Windows" InstallerVersion="200"
Compressed="yes" Platform="x64"/>
- <!-- upgrade rules -->
- <Upgrade Id="$(var.UpgradeCode)">
- <UpgradeVersion Minimum="$(var.Version)" IncludeMinimum="no" OnlyDetect="yes" Property="NEWERVERSIONDETECTED" />
- <UpgradeVersion Minimum="0.0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="yes" Property="OLDERVERSIONBEINGUPGRADED" />
- </Upgrade>
-
- <InstallExecuteSequence>
- <RemoveExistingProducts After="InstallInitialize" />
- <Custom Action="NewerVersion" After="FindRelatedProducts">NEWERVERSIONDETECTED</Custom>
- <Custom Action="BackupConfiguration" After='InstallInitialize'>OLDERVERSIONBEINGUPGRADED</Custom>
- </InstallExecuteSequence>
-
- <CustomAction Id="NewerVersion" Error="A later version of Ambari Server is already installed." />
- <!-- backup ambari.properties before installing new bits-->
- <CustomAction Id="BackupConfiguration"
- Directory="AMBARI_SERVER_MSI"
- ExeCommand='cmd.exe /c copy conf\ambari.properties conf\ambari.properties.backup'
- Return="check" />
-
<Media Id="1" Cabinet="simple.cab" EmbedCab="yes"/>
<Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder">
- <Directory Id="AMBARI_SERVER_MSI" Name="ambari-server">
+ <Directory Id="AmbariDirectory" Name="ambari">
+ <Directory Id="SERVER_INSTALL_DIRECTORY" Name="ambari-server-$(var.Version)">
</Directory>
</Directory>
</Directory>
<Feature Id="DefaultFeature" Title="Main Feature" Level="1">
<ComponentGroupRef Id="AmbariServerGroup"/>
</Feature>
- <UI/>
- <Property Id="WIXUI_INSTALLDIR" Value="AMBARI_SERVER_MSI"/>
- <UIRef Id="WixUI_InstallDir"/>
+ <Property Id="WIXUI_INSTALLDIR" Value="SERVER_INSTALL_DIRECTORY"/>
+ <UI>
+ <UIRef Id="WixUI_InstallDir" />
+ <Publish Dialog="WelcomeDlg"
+ Control="Next"
+ Event="NewDialog"
+ Value="InstallDirDlg"
+ Order="2">1</Publish>
+ <Publish Dialog="InstallDirDlg"
+ Control="Back"
+ Event="NewDialog"
+ Value="WelcomeDlg"
+ Order="2">1</Publish>
+ </UI>
</Product>
-</Wix>
\ No newline at end of file
+</Wix>
[2/2] ambari git commit: AMBARI-8367 - Sqoop User config setting
should be hidden for Windows (Eugene Chekanskiy via abaranchuk)
Posted by ab...@apache.org.
AMBARI-8367 - Sqoop User config setting should be hidden for Windows (Eugene Chekanskiy via abaranchuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/648a2d8f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/648a2d8f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/648a2d8f
Branch: refs/heads/trunk
Commit: 648a2d8f15c0e8bb9c324ce1700a417cae08a760
Parents: 54f8ea5
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Thu Nov 20 12:04:59 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Thu Nov 20 12:04:59 2014 +0200
----------------------------------------------------------------------
ambari-web/app/data/HDP2/site_properties.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/648a2d8f/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 36fc855..2510408 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4498,7 +4498,7 @@ module.exports =
"isReconfigurable": false,
"displayType": "user",
"isOverridable": false,
- "isVisible": true,
+ "isVisible": !App.get('isHadoopWindowsStack'),
"serviceName": "MISC",
"filename": "flume-env.xml",
"category": "Users and Groups",
@@ -4621,7 +4621,7 @@ module.exports =
"isReconfigurable": false,
"displayType": "user",
"isOverridable": false,
- "isVisible": true,
+ "isVisible": !App.get('isHadoopWindowsStack'),
"serviceName": "MISC",
"filename": "sqoop-env.xml",
"category": "Users and Groups",
@@ -4635,7 +4635,7 @@ module.exports =
"isReconfigurable": false,
"displayType": "user",
"isOverridable": false,
- "isVisible": true,
+ "isVisible": !App.get('isHadoopWindowsStack'),
"serviceName": "MISC",
"filename": "knox-env.xml",
"category": "Users and Groups",
@@ -4651,7 +4651,7 @@ module.exports =
"isReconfigurable": false,
"displayType": "user",
"isOverridable": false,
- "isVisible": true,
+ "isVisible": !App.get('isHadoopWindowsStack'),
"serviceName": "MISC",
"filename": "knox-env.xml",
"category": "Users and Groups",
@@ -4665,7 +4665,7 @@ module.exports =
"isReconfigurable": false,
"displayType": "user",
"isOverridable": false,
- "isVisible": true,
+ "isVisible": !App.get('isHadoopWindowsStack'),
"serviceName": "MISC",
"filename": "kafka-env.xml",
"category": "Users and Groups",