Skip to content

A
atlas
Commit fd4ff8ec by Venkatesh Seetharam
Options

ATLAS-90 Support offline builds. Contributed by Vishal Kadam

parent e4c5648b
Showing with 165 additions and 67 deletions
dashboard/v2/.bowerrc
{ {
"directory": "dist/lib", "directory": "../../webapp/target/dist/lib/",
"storage": { "storage": {
"packages": ".bower-cache", "packages": ".bower-cache",
"registry": ".bower-registry" "registry": ".bower-registry"
......
dashboard/v2/gruntfile.js
...@@ -23,7 +23,8 @@ var git = require('git-rev'); ...@@ -23,7 +23,8 @@ var git = require('git-rev');
module.exports = function(grunt) { module.exports = function(grunt) {
var classPathSep = (process.platform === "win32") ? ';' : ':', var classPathSep = (process.platform === "win32") ? ';' : ':',
gitHash = '', gitHash = '',
pkg = grunt.file.readJSON('package.json'); pkg = grunt.file.readJSON('package.json'),
distPath = '../../webapp/target/dist';
grunt.initConfig({ grunt.initConfig({
watch: { watch: {
...@@ -82,11 +83,12 @@ module.exports = function(grunt) { ...@@ -82,11 +83,12 @@ module.exports = function(grunt) {
bower: { bower: {
install: { install: {
options: { options: {
verbose: true verbose: true,
targetDir: '.bower-components'
} }
} }
}, },
dist: 'dist/js/app.min.js', dist: distPath + '/js/app.min.js',
modules: grunt.file.expand( modules: grunt.file.expand(
'public/js/app.js', 'public/js/app.js',
'public/js/routes.js', 'public/js/routes.js',
...@@ -97,8 +99,8 @@ module.exports = function(grunt) { ...@@ -97,8 +99,8 @@ module.exports = function(grunt) {
shell: { shell: {
min: { min: {
command: 'java ' + command: 'java ' +
'-cp dist/lib/closure-compiler/compiler.jar' + classPathSep + '-cp ' + distPath + '/lib/closure-compiler/compiler.jar' + classPathSep +
'dist/lib/ng-closure-runner/ngcompiler.jar ' + '' + distPath + '/lib/ng-closure-runner/ngcompiler.jar ' +
'org.angularjs.closurerunner.NgClosureRunner ' + 'org.angularjs.closurerunner.NgClosureRunner ' +
'--compilation_level SIMPLE_OPTIMIZATIONS ' + '--compilation_level SIMPLE_OPTIMIZATIONS ' +
//'--formatting PRETTY_PRINT ' + //'--formatting PRETTY_PRINT ' +
...@@ -131,10 +133,15 @@ module.exports = function(grunt) { ...@@ -131,10 +133,15 @@ module.exports = function(grunt) {
expand: true, expand: true,
cwd: 'public/', cwd: 'public/',
src: ['**', '!js/**/*.js', '!modules/**/*.js'], src: ['**', '!js/**/*.js', '!modules/**/*.js'],
dest: 'dist' dest: distPath
}
},
clean: {
build :[distPath],
options: {
force: true
} }
}, },
clean: ['public/lib', 'dist'],
proxit: { proxit: {
dev: { dev: {
options: { options: {
...@@ -143,7 +150,7 @@ module.exports = function(grunt) { ...@@ -143,7 +150,7 @@ module.exports = function(grunt) {
'hosts': [{ 'hosts': [{
'hostnames': ['*'], 'hostnames': ['*'],
'routes': { 'routes': {
'/': 'dist', '/': distPath,
'/api': 'http://162.249.6.50:21000/api' '/api': 'http://162.249.6.50:21000/api'
} }
}] }]
...@@ -155,8 +162,8 @@ module.exports = function(grunt) { ...@@ -155,8 +162,8 @@ module.exports = function(grunt) {
require('load-grunt-tasks')(grunt); require('load-grunt-tasks')(grunt);
grunt.registerTask('default', ['devUpdate', 'bower', 'jshint', 'jsbeautifier:default']); grunt.registerTask('default', ['devUpdate', 'bower', 'jshint', 'jsbeautifier:default']);
grunt.registerTask('server', ['jshint', 'build', 'concurrent']); grunt.registerTask('server', ['jshint', 'clean', 'bower', 'copy:dist', 'minify', 'concurrent']);
grunt.registerTask('build', ['clean', 'bower', 'copy:dist', 'minify']); grunt.registerTask('build', ['copy:dist', 'minify']);
grunt.registerTask('minify', 'Minify the all js', function() { grunt.registerTask('minify', 'Minify the all js', function() {
var done = this.async(); var done = this.async();
......
dashboard/v2/package.json
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
"Atlas", "Atlas",
"HortonWorks" "HortonWorks"
], ],
"scripts": {
"postinstall": "node node_modules/bower/bin/bower install"
},
"dependencies": { "dependencies": {
"body-parser": "^1.2.0", "body-parser": "^1.2.0",
"bower": "~1.3.1", "bower": "~1.3.1",
......
pom.xml
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<developer> <developer>
<id>ssuresh</id> <id>ssuresh</id>
<name>Suresh Srinivas</name> <name>Suresh Srinivas</name>
<email> ssuresh@apache.org</email> <email>ssuresh@apache.org</email>
<timezone>-8</timezone> <timezone>-8</timezone>
<roles> <roles>
<role>committer</role> <role>committer</role>
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<developer> <developer>
<id>vranganathan</id> <id>vranganathan</id>
<name>Venkat Ranganathan</name> <name>Venkat Ranganathan</name>
<email> vranganathan@apache.org</email> <email>vranganathan@apache.org</email>
<timezone>-8</timezone> <timezone>-8</timezone>
<roles> <roles>
<role>committer</role> <role>committer</role>
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
<!-- platform encoding override --> <!-- platform encoding override -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<node.version>v0.10.30</node.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<jetty.version>9.2.12.v20150709</jetty.version> <jetty.version>9.2.12.v20150709</jetty.version>
<jersey.version>1.10</jersey.version> <jersey.version>1.10</jersey.version>
...@@ -1251,6 +1251,15 @@ ...@@ -1251,6 +1251,15 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.23</version>
<configuration>
<workingDirectory>../dashboard/v2/</workingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version> <version>2.16</version>
...@@ -1297,7 +1306,7 @@ ...@@ -1297,7 +1306,7 @@
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
</plugin> </plugin>
<!-- Source code metrics: mvn javancss:report or mvn site --> <!-- Source code metrics: mvn javancss:report or mvn site -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
...@@ -1542,12 +1551,20 @@ ...@@ -1542,12 +1551,20 @@
<exclude>**/maven-eclipse.xml</exclude> <exclude>**/maven-eclipse.xml</exclude>
<exclude>**/.externalToolBuilders/**</exclude> <exclude>**/.externalToolBuilders/**</exclude>
<exclude>**/build.log</exclude> <exclude>**/build.log</exclude>
<exclude>dashboard/**/.bower-*/**</exclude> <!-- temp libs --> <!-- temp libs -->
<exclude>dashboard/v2/.bowerrc</exclude> <!-- json file --> <exclude>dashboard/**/.bower-*/**</exclude>
<exclude>dashboard/v2/lib/**</exclude> <!-- temp libs --> <!-- json file -->
<exclude>dashboard/v2/node*/**</exclude> <!-- temp libs --> <exclude>dashboard/v2/.bowerrc</exclude>
<exclude>dashboard/v2/dist/**</exclude> <!-- package --> <!-- temp libs -->
<exclude>dashboard/v2/**/*.min.js*</exclude> <!-- minified JS --> <exclude>dashboard/v2/lib/**</exclude>
<!-- temp libs -->
<exclude>dashboard/v2/node*/**</exclude>
<!-- package -->
<exclude>dashboard/v2/dist/**</exclude>
<!-- lib files -->
<exclude>dashboard/v2/public/lib/**</exclude>
<!-- minified JS -->
<exclude>dashboard/v2/**/*.min.js*</exclude>
</excludes> </excludes>
</configuration> </configuration>
<executions> <executions>
......
release-log.txt
...@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags) ...@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags) ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
ALL CHANGES: ALL CHANGES:
ATLAS-90 Support offline builds (Vishal Kadam via Venkatesh Seetharam)
ATLAS-154 Update website for 0.5-incubating release (Venkatesh Seetharam) ATLAS-154 Update website for 0.5-incubating release (Venkatesh Seetharam)
ATLAS-153 Build failure - org.glassfish:javax.el (shwethags) ATLAS-153 Build failure - org.glassfish:javax.el (shwethags)
ATLAS-117 Build fails on the latest commit (dossett@gmail.com via shwethags) ATLAS-117 Build fails on the latest commit (dossett@gmail.com via shwethags)
......
webapp/pom.xml
...@@ -65,6 +65,124 @@ ...@@ -65,6 +65,124 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>install-node</id>
<activation>
<file>
<missing>../dashboard/v2/node</missing>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>1.4.3</npmVersion>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>install-node_modules</id>
<activation>
<file>
<missing>../dashboard/v2/node_modules</missing>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>bower-install</id>
<activation>
<file>
<missing>target/dist/lib</missing>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install bower</id>
<goals>
<goal>grunt</goal>
</goals>
<configuration>
<arguments>bower</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>grunt-task</id>
<activation>
<property>
<name>!disableGrunt</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>npm remaining</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>install --ignore-scripts</arguments>
</configuration>
</execution>
<execution>
<id>grunt dist</id>
<goals>
<goal>grunt</goal>
</goals>
<configuration>
<arguments>build</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
<dependencies> <dependencies>
...@@ -219,51 +337,9 @@ ...@@ -219,51 +337,9 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.23</version>
<!-- optional -->
<configuration>
<workingDirectory>../dashboard/v2/</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v0.10.30</nodeVersion>
<npmVersion>1.4.3</npmVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>grunt dist</id>
<goals>
<goal>grunt</goal>
</goals>
<configuration>
<arguments>build</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<executions> <executions>
...@@ -291,7 +367,7 @@ ...@@ -291,7 +367,7 @@
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<webResources> <webResources>
<resource> <resource>
<directory>../dashboard/v2/dist</directory> <directory>target/dist</directory>
<targetPath>/</targetPath> <targetPath>/</targetPath>
</resource> </resource>
<resource> <resource>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment