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 2015/03/23 15:59:30 UTC
ambari git commit: AMBARI-10114 - [WinTP2] Automatic Bootstrap Ambari
Agent Create the bootstrap script dependencies archive at build time
Repository: ambari
Updated Branches:
refs/heads/trunk 360d4c814 -> a67afa945
AMBARI-10114 - [WinTP2] Automatic Bootstrap Ambari Agent Create the bootstrap script dependencies archive at build time
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a67afa94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a67afa94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a67afa94
Branch: refs/heads/trunk
Commit: a67afa9450306e4bc22e03d5a18ffcd8aae6abf6
Parents: 360d4c8
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Wed Mar 18 01:31:09 2015 +0200
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Mon Mar 23 16:56:06 2015 +0200
----------------------------------------------------------------------
ambari-server/pom.xml | 28 +++++++++++++--
.../src/main/assemblies/bootstrap-windows.xml | 36 ++++++++++++++++++++
.../src/main/assemblies/server-windows.xml | 8 ++---
3 files changed, 66 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67afa94/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index b855cc4..0ac21bf 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -134,17 +134,40 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>${assemblydescriptor}</descriptor>
+ <descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
</descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
<execution>
+ <id>bootstrap-zip</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>false</attach>
+ <finalName>bootstrap</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>${assemblybootstrap}</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
<id>build-tarball</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <attach>false</attach>
+ <appendAssemblyId>true</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>${assemblydescriptor}</descriptor>
+ </descriptors>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -1309,6 +1332,7 @@
<fileextension.dot.shell-default>.cmd</fileextension.dot.shell-default>
<path.python.1>${project.basedir}\..\ambari-common\src\main\python;${project.basedir}\..\ambari-agent\src\main\python;${project.basedir}\..\ambari-common\src\main\python\ambari_jinja2;${project.basedir}\..\ambari-common\src\main\python\ambari_commons;${project.basedir}\..\ambari-common\src\test\python;${project.basedir}\src\main\python;${project.basedir}\src\main\python\ambari-server-state;${project.basedir}\src\main\resources\custom_actions;${project.basedir}\src\main\resources\scripts;${project.basedir}\src\test\python</path.python.1>
<assemblydescriptor>src/main/assemblies/server-windows.xml</assemblydescriptor>
+ <assemblybootstrap>src/main/assemblies/bootstrap-windows.xml</assemblybootstrap>
<packagingFormat>jar</packagingFormat>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67afa94/ambari-server/src/main/assemblies/bootstrap-windows.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/bootstrap-windows.xml b/ambari-server/src/main/assemblies/bootstrap-windows.xml
new file mode 100644
index 0000000..8c38bc8
--- /dev/null
+++ b/ambari-server/src/main/assemblies/bootstrap-windows.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<assembly>
+ <id>bootstrap</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>${basedir}/src/main/python/setupAgent.py</source>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/../ambari-common/src/main/python/ambari_commons</directory>
+ <outputDirectory>ambari_commons</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67afa94/ambari-server/src/main/assemblies/server-windows.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/server-windows.xml b/ambari-server/src/main/assemblies/server-windows.xml
index d3fa7cb..8b5483a 100644
--- a/ambari-server/src/main/assemblies/server-windows.xml
+++ b/ambari-server/src/main/assemblies/server-windows.xml
@@ -32,6 +32,10 @@
<outputDirectory>ambari-server-${project.version}/resources</outputDirectory>
</file>
<file>
+ <source>${project.build.directory}/bootstrap.zip</source>
+ <outputDirectory>/ambari-server-${project.version}/bootstrap</outputDirectory>
+ </file>
+ <file>
<source>${basedir}/conf/windows/ambari.properties</source>
<outputDirectory>/ambari-server-${project.version}/conf</outputDirectory>
</file>
@@ -60,10 +64,6 @@
<outputDirectory>/ambari-server-${project.version}/bootstrap</outputDirectory>
</file>
<file>
- <source>${basedir}/src/main/python/setupAgent.py</source>
- <outputDirectory>/ambari-server-${project.version}/bootstrap</outputDirectory>
- </file>
- <file>
<source>${basedir}/src/main/windows/ambari-server.cmd</source>
<outputDirectory>/ambari-server-${project.version}</outputDirectory>
</file>