You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/02/04 14:02:41 UTC
[1/2] incubator-nifi git commit: Updating
nifi-processor-bundle-archetype to use new annotation package names
Repository: incubator-nifi
Updated Branches:
refs/heads/develop b0b14ed10 -> 629ec371c
Updating nifi-processor-bundle-archetype to use new annotation package names
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/bbb7f8d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/bbb7f8d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/bbb7f8d4
Branch: refs/heads/develop
Commit: bbb7f8d46c9b5df61747a1dfd28248b99ec00e9a
Parents: 7724dad
Author: bbende <bb...@gmail.com>
Authored: Tue Feb 3 22:24:32 2015 -0500
Committer: bbende <bb...@gmail.com>
Committed: Tue Feb 3 22:24:32 2015 -0500
----------------------------------------------------------------------
.../src/main/java/MyProcessor.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bbb7f8d4/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
index 4f2ecff..7d29b5e 100644
--- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
+++ b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
@@ -20,9 +20,9 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.*;
-import org.apache.nifi.processor.annotation.CapabilityDescription;
-import org.apache.nifi.processor.annotation.OnScheduled;
-import org.apache.nifi.processor.annotation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
@@ -80,9 +80,9 @@ public class MyProcessor extends AbstractProcessor {
if ( flowFile == null ) {
return;
}
-
+
// TODO implement
-
+
}
}
[2/2] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of http://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/629ec371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/629ec371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/629ec371
Branch: refs/heads/develop
Commit: 629ec371cdca232c7f40991c35dc628590c11c6f
Parents: bbb7f8d b0b14ed
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Feb 4 08:02:41 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Feb 4 08:02:41 2015 -0500
----------------------------------------------------------------------
.gitignore | 7 +
nifi-site/src/includes/topbar.hbs | 7 +-
nifi-site/src/layouts/markdown.hbs | 1 +
nifi-site/src/pages/html/download.hbs | 46 +++++
nifi-site/src/pages/markdown/quickstart.md | 14 +-
nifi-site/src/pages/markdown/release-guide.md | 208 +++++++++++----------
nifi-site/src/scss/_settings.scss | 11 +-
nifi-site/src/scss/app.scss | 8 +
8 files changed, 197 insertions(+), 105 deletions(-)
----------------------------------------------------------------------