Repository: ambari Updated Branches: refs/heads/trunk 3247aa461 -> aa90346ec
AMBARI-8824 Create AMS msi packages for windows server (echekanskyi via fbarca) Msi with all sinks, collector and monitor was created. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aa90346e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aa90346e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aa90346e Branch: refs/heads/trunk Commit: aa90346ec0937348639fe70ce87ce385f8c9ac87 Parents: 3247aa4 Author: Florian Barca <fba...@hortonworks.com> Authored: Mon Jan 5 08:57:24 2015 -0800 Committer: Florian Barca <fba...@hortonworks.com> Committed: Mon Jan 5 08:57:24 2015 -0800 ---------------------------------------------------------------------- ambari-metrics/ambari-metrics-assembly/pom.xml | 212 +++++++++++++++++++ .../src/main/assembly/collector-windows.xml | 7 + .../src/main/assembly/monitor-windows.xml | 7 + .../src/main/assembly/sink-windows.xml | 7 +- .../src/main/package/msi/collector.wxs | 70 ++++++ .../src/main/package/msi/monitor.wxs | 70 ++++++ .../src/main/package/msi/sink.wxs | 63 ++++++ 7 files changed, 435 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index 69ed536..c85e5c5 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -803,6 +803,218 @@ <packagingFormat>jar</packagingFormat> </properties> </profile> + <profile> + <id>msi</id> + <activation> + <os> + <family>Windows</family> + </os> + </activation> + <build> + <plugins> + <!-- msi creation --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>run-heat-collector</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>heat.exe</executable> + <arguments> + <argument>dir</argument> + <argument>"."</argument> + <argument>-dr</argument> + <argument>"COLLECTOR_INSTALL_DIRECTORY"</argument> + <argument>-platform</argument> + <argument>Win64</argument> + <argument>-cg</argument> + <argument>"AmbariMetricsCollectorGroup"</argument> + <argument>-gg</argument> + <argument>-ke</argument> + <argument>-srd</argument> + <argument>-o</argument> + <argument>".\..\collector-files.wxs"</argument> + </arguments> + <workingDirectory>${basedir}/target/ambari-metrics-collector-${project.version}</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-candle-collector</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>candle.exe</executable> + <arguments> + <argument>-arch</argument> + <argument>x64</argument> + <argument>collector.wxs</argument> + <argument>collector-files.wxs</argument> + </arguments> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-light-collector</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>light.exe</executable> + <arguments> + <argument>-ext</argument> + <argument>WixUIExtension</argument> + <argument>-b</argument> + <argument>${basedir}/target/ambari-metrics-collector-${project.version}</argument> + <argument>-o</argument> + <argument>ambari-metrics-collector-${project.version}.msi</argument> + <argument>collector.wixobj</argument> + <argument>collector-files.wixobj</argument> + </arguments> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-heat-monitor</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>heat.exe</executable> + <arguments> + <argument>dir</argument> + <argument>"."</argument> + <argument>-dr</argument> + <argument>"MONITOR_INSTALL_DIRECTORY"</argument> + <argument>-platform</argument> + <argument>Win64</argument> + <argument>-cg</argument> + <argument>"AmbariMetricsMonitorGroup"</argument> + <argument>-gg</argument> + <argument>-ke</argument> + <argument>-srd</argument> + <argument>-o</argument> + <argument>".\..\monitor-files.wxs"</argument> + </arguments> + <workingDirectory>${basedir}/target/ambari-metrics-monitor-${project.version}</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-candle-monitor</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>candle.exe</executable> + <arguments> + <argument>-arch</argument> + <argument>x64</argument> + <argument>monitor.wxs</argument> + <argument>monitor-files.wxs</argument> + </arguments> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-light-monitor</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>light.exe</executable> + <arguments> + <argument>-ext</argument> + <argument>WixUIExtension</argument> + <argument>-b</argument> + <argument>${basedir}/target/ambari-metrics-monitor-${project.version}</argument> + <argument>-o</argument> + <argument>ambari-metrics-monitor-${project.version}.msi</argument> + <argument>monitor.wixobj</argument> + <argument>monitor-files.wixobj</argument> + </arguments> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-heat-sink</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>heat.exe</executable> + <arguments> + <argument>dir</argument> + <argument>"."</argument> + <argument>-dr</argument> + <argument>"SINK_INSTALL_DIRECTORY"</argument> + <argument>-platform</argument> + <argument>Win64</argument> + <argument>-cg</argument> + <argument>"AmbariMetricsSinkGroup"</argument> + <argument>-gg</argument> + <argument>-ke</argument> + <argument>-srd</argument> + <argument>-o</argument> + <argument>".\..\sink-files.wxs"</argument> + </arguments> + <workingDirectory>${basedir}/target/ambari-metrics-hadoop-sink-${project.version}</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-candle-sink</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>candle.exe</executable> + <arguments> + <argument>-arch</argument> + <argument>x64</argument> + <argument>sink.wxs</argument> + <argument>sink-files.wxs</argument> + </arguments> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </execution> + <execution> + <id>run-light-sink</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>light.exe</executable> + <arguments> + <argument>-ext</argument> + <argument>WixUIExtension</argument> + <argument>-b</argument> + <argument>${basedir}/target/ambari-metrics-hadoop-sink-${project.version}</argument> + <argument>-o</argument> + <argument>ambari-metrics-hadoop-sink-${project.version}.msi</argument> + <argument>sink.wixobj</argument> + <argument>sink-files.wixobj</argument> + </arguments> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml index 3faa085..ebeec32 100644 --- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml +++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml @@ -79,6 +79,13 @@ </includes> </fileSet> </fileSets> + <files> + <file> + <source>${basedir}/src/main/package/msi/collector.wxs</source> + <outputDirectory>../../</outputDirectory> + <filtered>true</filtered> + </file> + </files> <dependencySets> <dependencySet> <unpack>false</unpack> http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml index 7372e13..2306a7a 100644 --- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml +++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml @@ -70,6 +70,13 @@ </includes> </fileSet> </fileSets> + <files> + <file> + <source>${basedir}/src/main/package/msi/monitor.wxs</source> + <outputDirectory>../../</outputDirectory> + <filtered>true</filtered> + </file> + </files> <dependencySets> <dependencySet> <useProjectArtifact>false</useProjectArtifact> http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml index a65d6f2..0a36fac 100644 --- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml +++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml @@ -52,9 +52,14 @@ <source>${storm-sink.dir}/target/ambari-metrics-storm-sink-with-common-${project.version}.jar</source> <outputDirectory>hadoop-sink</outputDirectory> </file> + <file> + <source>${basedir}/src/main/package/msi/sink.wxs</source> + <outputDirectory>../../</outputDirectory> + <filtered>true</filtered> + </file> </files> -</assembly> \ No newline at end of file +</assembly> http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/collector.wxs ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/collector.wxs b/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/collector.wxs new file mode 100644 index 0000000..89fbd9c --- /dev/null +++ b/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/collector.wxs @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?define Version = "${package-version}" ?> + <Product Id="0b8d60bc-e702-42ea-8321-a6d627aba444" Name="Ambari Metrics Collector $(var.Version)" Language="1033" + Version="$(var.Version)" Manufacturer="Apache Software Foundation"> + <Package Description="Ambari Metrics Collector for Windows" Comments="Ambari Metrics Collector" InstallerVersion="200" + Compressed="yes" Platform="x64"/> + + <Media Id="1" Cabinet="simple.cab" EmbedCab="yes"/> + <Directory Id="TARGETDIR" Name="SourceDir" > + <Directory Id="AmbariDirectory" Name="ambari"> + <Directory Id="COLLECTOR_INSTALL_DIRECTORY" Name="ambari-metrics-collector-$(var.Version)"> + <Component Id="ENV_VARS" Guid="{eb0843bd-2bdc-4aa0-99f1-23b54c7840a7}"> + <!--we need this to allow reference on SINK_INSTALL_DIRECTORY--> + <CreateFolder/> + <Environment Id="COLLECTOR_HOME_ENV_VAR" + Action="set" + Part="all" + Name="COLLECTOR_HOME" + Permanent="no" + System="yes" + Value="[COLLECTOR_INSTALL_DIRECTORY]" /> + <Environment Id="COLLECTOR_CONF_DIR_ENV_VAR" + Action="set" + Part="all" + Name="COLLECTOR_CONF_DIR" + Permanent="no" + System="yes" + Value="[COLLECTOR_INSTALL_DIRECTORY]conf" /> + </Component> + </Directory> + </Directory> + </Directory> + + <Feature Id="DefaultFeature" Title="Main Feature" Level="1"> + <ComponentGroupRef Id="AmbariMetricsCollectorGroup"/> + <ComponentRef Id="ENV_VARS" /> + </Feature> + <Property Id="WIXUI_INSTALLDIR" Value="COLLECTOR_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> http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/monitor.wxs ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/monitor.wxs b/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/monitor.wxs new file mode 100644 index 0000000..e005ae7 --- /dev/null +++ b/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/monitor.wxs @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?define Version = "${package-version}" ?> + <Product Id="8f6f5126-2bca-4f62-9940-fb7934477d01" Name="Ambari Metrics Monitor $(var.Version)" Language="1033" + Version="$(var.Version)" Manufacturer="Apache Software Foundation"> + <Package Description="Ambari Metrics Monitor for Windows" Comments="Ambari Metrics Monitor" InstallerVersion="200" + Compressed="yes" Platform="x64"/> + + <Media Id="1" Cabinet="simple.cab" EmbedCab="yes"/> + <Directory Id="TARGETDIR" Name="SourceDir" > + <Directory Id="AmbariDirectory" Name="ambari"> + <Directory Id="MONITOR_INSTALL_DIRECTORY" Name="ambari-metrics-monitor-$(var.Version)"> + <Component Id="ENV_VARS" Guid="{a13efdb1-8afb-4c7d-a424-c44d4e7f36ad}"> + <!--we need this to allow reference on SINK_INSTALL_DIRECTORY--> + <CreateFolder/> + <Environment Id="MONITOR_HOME_ENV_VAR" + Action="set" + Part="all" + Name="MONITOR_HOME" + Permanent="no" + System="yes" + Value="[MONITOR_INSTALL_DIRECTORY]" /> + <Environment Id="MONITOR_CONF_DIR_ENV_VAR" + Action="set" + Part="all" + Name="MONITOR_CONF_DIR" + Permanent="no" + System="yes" + Value="[MONITOR_INSTALL_DIRECTORY]conf" /> + </Component> + </Directory> + </Directory> + </Directory> + + <Feature Id="DefaultFeature" Title="Main Feature" Level="1"> + <ComponentGroupRef Id="AmbariMetricsMonitorGroup"/> + <ComponentRef Id="ENV_VARS" /> + </Feature> + <Property Id="WIXUI_INSTALLDIR" Value="MONITOR_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> http://git-wip-us.apache.org/repos/asf/ambari/blob/aa90346e/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/sink.wxs ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/sink.wxs b/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/sink.wxs new file mode 100644 index 0000000..d398c8d --- /dev/null +++ b/ambari-metrics/ambari-metrics-assembly/src/main/package/msi/sink.wxs @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?define Version = "${package-version}" ?> + <Product Id="be90762d-4036-45ab-8b40-e73601eb898b" Name="Ambari Metrics Hadoop Sink $(var.Version)" Language="1033" + Version="$(var.Version)" Manufacturer="Apache Software Foundation"> + <Package Description="Ambari Metrics Hadoop Sink for Windows" Comments="Ambari Metrics Hadoop Sink" InstallerVersion="200" + Compressed="yes" Platform="x64"/> + + <Media Id="1" Cabinet="simple.cab" EmbedCab="yes"/> + <Directory Id="TARGETDIR" Name="SourceDir" > + <Directory Id="AmbariDirectory" Name="ambari"> + <Directory Id="SINK_INSTALL_DIRECTORY" Name="ambari-metrics-hadoop-sink-$(var.Version)"> + <Component Id="ENV_VARS" Guid="{2a531dad-2d1f-4d1d-a344-63b6d2e57684}"> + <!--we need this to allow reference on SINK_INSTALL_DIRECTORY--> + <CreateFolder/> + <Environment Id="SINK_HOME_ENV_VAR" + Action="set" + Part="all" + Name="SINK_HOME" + Permanent="no" + System="yes" + Value="[SINK_INSTALL_DIRECTORY]" /> + </Component> + </Directory> + </Directory> + </Directory> + + <Feature Id="DefaultFeature" Title="Main Feature" Level="1"> + <ComponentGroupRef Id="AmbariMetricsSinkGroup"/> + <ComponentRef Id="ENV_VARS" /> + </Feature> + <Property Id="WIXUI_INSTALLDIR" Value="SINK_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>