You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/05/14 01:28:21 UTC
[1/3] incubator-nifi git commit: NIFI-592: - Automating deployment of
website changes.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop c4d1666a2 -> 1f139e219
NIFI-592:
- Automating deployment of website changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/951cff9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/951cff9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/951cff9b
Branch: refs/heads/develop
Commit: 951cff9bda0e1efafd6dd7b5a13592cab668778b
Parents: c12778f
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed May 13 18:57:51 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 13 18:57:51 2015 -0400
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 100 +++++++++++++++++++++++++++++++++++++++++++-
nifi-site/package.json | 3 +-
2 files changed, 100 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/951cff9b/nifi-site/Gruntfile.js
----------------------------------------------------------------------
diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js
index 2a3a5ba..782f5e4 100644
--- a/nifi-site/Gruntfile.js
+++ b/nifi-site/Gruntfile.js
@@ -1,6 +1,13 @@
+/* global module */
+
module.exports = function (grunt) {
// Project configuration.
grunt.initConfig({
+ config: {
+ svn: {
+ url: 'https://svn.apache.org/repos/asf/incubator/nifi/site/trunk'
+ }
+ },
pkg: grunt.file.readJSON('package.json'),
clean: {
options: {
@@ -9,7 +16,8 @@ module.exports = function (grunt) {
js: ['dist/js/'],
css: ['dist/css/'],
assets: ['dist/assets/*'],
- generated: ['dist/docs']
+ generated: ['dist/docs'],
+ all: ['dist']
},
assemble: {
options: {
@@ -115,6 +123,51 @@ module.exports = function (grunt) {
}]
}
},
+ prompt: {
+ username: {
+ options: {
+ questions: [{
+ config: 'config.svn.username',
+ type: 'input',
+ message: 'Enter SVN username if different from current user:'
+ }]
+ }
+ },
+ commit: {
+ options: {
+ questions: [{
+ config: 'config.svn.commit.confirmation',
+ type: 'list',
+ choices: ['Show diff', 'Commit', 'Abort'],
+ message: 'Commit the changes listed above?'
+ }],
+ then: function (results) {
+ if (results['config.svn.commit.confirmation'] === 'Commit') {
+ grunt.task.run('prompt:message');
+ } else if (results['config.svn.commit.confirmation'] === 'Show diff') {
+ grunt.task.run('exec:diff');
+ grunt.task.run('prompt:commit');
+ }
+ }
+ }
+ },
+ message: {
+ options: {
+ questions: [{
+ config: 'config.svn.commit.message',
+ type: 'input',
+ message: 'Commit message:'
+ }, {
+ config: 'config.svn.password',
+ type: 'password',
+ message: 'SVN password:'
+ }],
+ then: function () {
+ grunt.task.run('exec:commit');
+ }
+ }
+ }
+ },
exec: {
generateDocs: {
command: 'mvn clean package',
@@ -127,6 +180,44 @@ module.exports = function (grunt) {
cwd: '../nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api',
stdout: true,
stderr: true
+ },
+ checkout: {
+ command: function() {
+ var url = grunt.config('config.svn.url');
+ var username = grunt.config('config.svn.username');
+ if (username === '') {
+ return 'svn checkout ' + url + ' --trust-server-cert --non-interactive dist';
+ } else {
+ return 'svn checkout --username ' + username + ' ' + url + ' --trust-server-cert --non-interactive dist';
+ }
+ },
+ stdout: true,
+ stderr: true
+ },
+ status: {
+ cwd: 'dist',
+ command: 'svn status',
+ stdout: true,
+ stderr: true
+ },
+ diff: {
+ cwd: 'dist',
+ command: 'svn diff',
+ stdout: true,
+ stderr: true
+ },
+ commit: {
+ cwd: 'dist',
+ command: function() {
+ var username = grunt.config('config.svn.username');
+ var password = grunt.config('config.svn.password');
+ var message = grunt.config('config.svn.commit.message');
+ if (username === '') {
+ return 'svn commit --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .';
+ } else {
+ return 'svn commit --username ' + username + ' --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .';
+ }
+ }
}
},
replace: {
@@ -196,11 +287,16 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-text-replace');
+ grunt.loadNpmTasks('grunt-prompt');
grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']);
grunt.registerTask('js', ['clean:js', 'concat']);
grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics', 'replace:moveTearDrop', 'replace:removeVersion']);
- grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
+
+ grunt.registerTask('build', ['assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
+ grunt.registerTask('deploy', ['clean:all', 'prompt:username', 'exec:checkout', 'build', 'exec:status', 'prompt:commit']);
grunt.registerTask('dev', ['default', 'watch']);
+
+ grunt.registerTask('default', ['clean:all', 'build']);
};
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/951cff9b/nifi-site/package.json
----------------------------------------------------------------------
diff --git a/nifi-site/package.json b/nifi-site/package.json
index f2ad8ca..dbd8ab5 100644
--- a/nifi-site/package.json
+++ b/nifi-site/package.json
@@ -1,6 +1,6 @@
{
"name": "apache-nifi-site",
- "version": "0.0.2-incubating",
+ "version": "0.1.0-incubating",
"description": "The artifacts for the Apache NiFi site.",
"private": "true",
"repository": {
@@ -17,6 +17,7 @@
"grunt-contrib-watch": "^0.6.1",
"grunt-exec": "^0.4.6",
"grunt-newer": "^1.1.0",
+ "grunt-prompt": "^1.3.0",
"grunt-text-replace": "^0.4.0"
},
"licenses": [
[2/3] incubator-nifi git commit: NIFI-592: - Updating readme.
Posted by mc...@apache.org.
NIFI-592:
- Updating readme.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3f3fe3c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3f3fe3c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3f3fe3c3
Branch: refs/heads/develop
Commit: 3f3fe3c359c2bfdff55a08b46087974d5ad49c23
Parents: 951cff9
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed May 13 19:27:06 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 13 19:27:06 2015 -0400
----------------------------------------------------------------------
nifi-site/README.md | 42 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3f3fe3c3/nifi-site/README.md
----------------------------------------------------------------------
diff --git a/nifi-site/README.md b/nifi-site/README.md
index 05cabd0..d3e2e48 100644
--- a/nifi-site/README.md
+++ b/nifi-site/README.md
@@ -62,7 +62,13 @@ gem install compass
## Grunt Tasks
To build the site run the default grunt task. This will assemble the site and
-place the resulting site in the dist folder.
+place the resulting site in the dist folder. Part of this assembly is actually
+building the various guides and Rest Api documentation bundled in the application.
+Because of this, Maven must be installed and available on the PATH. Additionally Java
+must be installed in order for the Maven build to succeed. Refer to the [NiFi][]
+documentation for minimum requirements for Maven and Java.
+
+[NiFi]: https://nifi.incubator.apache.org/quickstart.html
```bash
grunt
@@ -76,6 +82,36 @@ files for changes. Any changes will cause the site to be rebuilt.
grunt dev
```
+To deploy new changes to the live site, run the deploy task
+
+```bash
+grunt deploy
+```
+
+This will go through each step required to deploy changes to the site. Updates
+are performed by committing to a SVN repository. This means that svn must be installed
+and available on the PATH. Additionally, it requires SVN 1.6+. The deployment
+process will show the files being committed and provide an option to view a diff,
+proceed with the commit, or abort.
+
+## Source overview
+
+### src/includes
+
+Contains fragments that will be included on all pages of the site. Most notably
+here is the topbar.hbs that defines the Menus on the top of the site. If a new
+page is being added or removed it is done here.
+
+### src/pages/html
+
+Contains pages that are written in HTML. If page being added/edited is written is
+HTML it resides here.
+
+### src/pages/markdown
+
+Contains pages that are written in Markdown. If the page being added/edited is written
+in Markdown it resides here.
+
## Application Style Properties
### Font
@@ -114,6 +150,4 @@ 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.
-
-
+limitations under the License.
\ No newline at end of file
[3/3] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1f139e21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1f139e21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1f139e21
Branch: refs/heads/develop
Commit: 1f139e21988c822114a6bed8adda197d1414722c
Parents: 3f3fe3c c4d1666
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed May 13 19:27:46 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 13 19:27:46 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/pom.xml | 18 ++----
.../impl/FileBasedClusterNodeFirewallTest.java | 28 ++++-----
.../expiration/FileRemovalAction.java | 28 +++++++--
.../nifi/provenance/lucene/DocsReader.java | 25 +++++---
.../nifi/provenance/lucene/IndexManager.java | 61 +++++++++++++++++---
5 files changed, 113 insertions(+), 47 deletions(-)
----------------------------------------------------------------------