You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/11/05 01:34:31 UTC
git commit: AMBARI-8078. Enable jobs and slider view on Windows.
(Jayush Luniya via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-windows-dev 4919fd56e -> be54a4fcf
AMBARI-8078. Enable jobs and slider view on Windows. (Jayush Luniya via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be54a4fc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be54a4fc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be54a4fc
Branch: refs/heads/branch-windows-dev
Commit: be54a4fcfc5caad93010f7ac44a6915942f4a151
Parents: 4919fd5
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Tue Nov 4 16:34:46 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Tue Nov 4 16:34:46 2014 -0800
----------------------------------------------------------------------
.../src/main/assemblies/server-windows.xml | 11 ++-
contrib/views/jobs/pom.xml | 32 ++++++-
contrib/views/slider/pom.xml | 91 +++++++++++++++-----
pom.xml | 34 ++++++--
4 files changed, 135 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/be54a4fc/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 9c41428..84029dd 100644
--- a/ambari-server/src/main/assemblies/server-windows.xml
+++ b/ambari-server/src/main/assemblies/server-windows.xml
@@ -84,10 +84,6 @@
<outputDirectory>/ambari-server-${project.version}/resources</outputDirectory>
</file>
<file>
- <source>${basedir}/../ambari-admin/target/ambari-admin-${project.version}.jar</source>
- <outputDirectory>/ambari-server-${project.version}/resources/views</outputDirectory>
- </file>
- <file>
<source>${basedir}/src/main/package/msi/ambari-server.wxs</source>
<outputDirectory>../../</outputDirectory>
<filtered>true</filtered>
@@ -96,6 +92,13 @@
<fileSets>
<!-- Distro files, readme, licenses, etc -->
<fileSet>
+ <directory>${basedir}/../ambari-admin/target</directory>
+ <outputDirectory>/ambari-server-${project.version}/resources/views</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${basedir}/../</directory>
<outputDirectory>ambari-server-${project.version}/</outputDirectory>
<includes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/be54a4fc/contrib/views/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml
index 0df2804..59ebf52 100644
--- a/contrib/views/jobs/pom.xml
+++ b/contrib/views/jobs/pom.xml
@@ -98,7 +98,7 @@
</goals>
<configuration>
<workingDirectory>${basedir}/src/main/resources/ui</workingDirectory>
- <executable>node/node</executable>
+ <executable>${basedir}/src/main/resources/ui/node/${executable.node}</executable>
<arguments>
<argument>node_modules/bower/bin/bower</argument>
<argument>install</argument>
@@ -114,9 +114,9 @@
</goals>
<configuration>
<workingDirectory>${basedir}/src/main/resources/ui</workingDirectory>
- <executable>node/node</executable>
+ <executable>${basedir}/src/main/resources/ui/node/${executable.node}</executable>
<arguments>
- <argument>node_modules/.bin/grunt</argument>
+ <argument>node_modules/grunt-cli/bin/grunt</argument>
<argument>build</argument>
</arguments>
</configuration>
@@ -189,4 +189,30 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>win</family>
+ </os>
+ </activation>
+ <properties>
+ <envClassifier>win</envClassifier>
+ <executable.node>node.exe</executable.node>
+ </properties>
+ </profile>
+ <profile>
+ <id>linux</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <properties>
+ <envClassifier>linux</envClassifier>
+ <executable.node>node</executable.node>
+ </properties>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/be54a4fc/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index 3f311c8..265af9e 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -104,6 +104,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-views</artifactId>
+ <version>${ambari.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -434,13 +435,14 @@
</goals>
<configuration>
<target name="slider-ui-clean">
- <exec dir="${ui.directory}" executable="rm" failonerror="false">
- <arg value="-rf" />
- <arg value="public" />
- </exec>
- <exec dir="${ui.directory}" executable="mkdir" failonerror="false">
- <arg value="public" />
- </exec>
+ <exec dir="${ui.directory}" executable="${executable.rmdir}">
+ <arg value="${args.rm.clean}"/>
+ <arg value="public"/>
+ <arg value="node_modules"/>
+ </exec>
+ <exec dir="${ui.directory}" executable="${executable.mkdir}">
+ <arg value="${args.mkdir.clean}"/>
+ </exec>
</target>
</configuration>
</execution>
@@ -452,19 +454,18 @@
</goals>
<configuration>
<target name="slider-ui-compile">
- <exec dir="${ui.directory}" executable="npm" failonerror="false">
- <env key="PYTHON" value="${project.basedir}/../src/main/unix/ambari-python-wrap" />
- <arg value="install" />
- </exec>
- <exec dir="${ui.directory}" executable="brunch"
- failonerror="false">
- <arg value="build" />
- </exec>
- <exec dir="${ui.directory}" executable="gzip" failonerror="false">
- <arg value="public/javascripts/app.js" />
- <arg value="public/javascripts/vendor.js" />
- <arg value="public/stylesheets/app.css" />
- </exec>
+ <exec dir="${ui.directory}" executable="${executable.npm}" failonerror="true">
+ <arg value="${args.npm.install}"/>
+ </exec>
+ <exec dir="${ui.directory}" executable="${executable.brunch}" failonerror="true">
+ <arg value="${args.brunch.build}"/>
+ </exec>
+ <exec dir="${ui.directory}" executable="${executable.gzip}" failonerror="false">
+ <arg value="-f"/>
+ <arg value="public/javascripts/app.js"/>
+ <arg value="public/javascripts/vendor.js"/>
+ <arg value="public/stylesheets/app.css"/>
+ </exec>
</target>
</configuration>
</execution>
@@ -615,4 +616,54 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>win</family>
+ </os>
+ </activation>
+ <properties>
+ <envClassifier>win</envClassifier>
+ <dirsep>\</dirsep>
+ <executable.brunch>cmd</executable.brunch>
+ <args.brunch.build>/C brunch build</args.brunch.build>
+ <executable.gzip>gzip</executable.gzip>
+ <executable.mkdir>cmd</executable.mkdir>
+ <args.mkdir.clean>/C mkdir public</args.mkdir.clean>
+ <executable.npm>cmd</executable.npm>
+ <args.npm.install>/C npm install</args.npm.install>
+ <args.npm.test>/C npm install</args.npm.test>
+ <executable.rmdir>cmd</executable.rmdir>
+ <args.rm.clean>/C rmdir /S /Q</args.rm.clean>
+ <executable.shell>cmd</executable.shell>
+ <fileextension.shell>cmd</fileextension.shell>
+ </properties>
+ </profile>
+ <profile>
+ <id>linux</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <properties>
+ <envClassifier>linux</envClassifier>
+ <dirsep>/</dirsep>
+ <executable.brunch>brunch</executable.brunch>
+ <args.brunch.build>build</args.brunch.build>
+ <executable.gzip>gzip</executable.gzip>
+ <executable.mkdir>mkdir</executable.mkdir>
+ <args.mkdir.clean>public</args.mkdir.clean>
+ <executable.npm>npm</executable.npm>
+ <args.npm.install>install</args.npm.install>
+ <args.npm.test>test</args.npm.test>
+ <executable.rmdir>rm</executable.rmdir>
+ <args.rm.clean>-rf</args.rm.clean>
+ <executable.shell>sh</executable.shell>
+ <fileextension.shell>sh</fileextension.shell>
+ </properties>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/be54a4fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8d51d04..281b730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,17 +303,19 @@
</build>
<profiles>
<profile>
- <id>linux</id>
+ <id>default-views</id>
<activation>
- <os>
- <family>unix</family>
- </os>
+ <property>
+ <name>views</name>
+ <value>default</value>
+ </property>
</activation>
<modules>
<module>ambari-web</module>
<module>ambari-project</module>
<module>ambari-views</module>
<module>ambari-admin</module>
+ <module>contrib/views</module>
<module>ambari-server</module>
<module>ambari-agent</module>
<module>ambari-client</module>
@@ -321,10 +323,11 @@
</modules>
</profile>
<profile>
- <id>default-views</id>
+ <id>hdp-views</id>
<activation>
<property>
<name>views</name>
+ <value>hdp</value>
</property>
</activation>
<modules>
@@ -332,7 +335,8 @@
<module>ambari-project</module>
<module>ambari-views</module>
<module>ambari-admin</module>
- <module>contrib/views</module>
+ <module>contrib/views/jobs</module>
+ <module>contrib/views/slider</module>
<module>ambari-server</module>
<module>ambari-agent</module>
<module>ambari-client</module>
@@ -352,6 +356,24 @@
</modules>
</profile>
<profile>
+ <id>linux</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <modules>
+ <module>ambari-web</module>
+ <module>ambari-project</module>
+ <module>ambari-views</module>
+ <module>ambari-admin</module>
+ <module>ambari-server</module>
+ <module>ambari-agent</module>
+ <module>ambari-client</module>
+ <module>ambari-shell</module>
+ </modules>
+ </profile>
+ <profile>
<id>windows</id>
<activation>
<os>