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 2014/12/12 16:32:11 UTC
[1/5] incubator-nifi git commit: updating to skip nb configuration
files
Repository: incubator-nifi
Updated Branches:
refs/heads/bootstrap 2a2f0f036 -> d1271a281
updating to skip nb configuration files
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f1baec6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f1baec6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f1baec6b
Branch: refs/heads/bootstrap
Commit: f1baec6b66d0bf6e02db7e538b54d92d88a551d2
Parents: 2bcd1e6
Author: joewitt <jo...@apache.org>
Authored: Thu Dec 11 13:52:49 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Thu Dec 11 13:52:49 2014 -0500
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f1baec6b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6d4eca9..73b32b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target
.settings
.classpath
nbactions.xml
+nb-configuration.xml
.DS_Store
# Intellij
[5/5] incubator-nifi git commit: Merge branch 'develop' into bootstrap
Posted by ma...@apache.org.
Merge branch 'develop' into bootstrap
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d1271a28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d1271a28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d1271a28
Branch: refs/heads/bootstrap
Commit: d1271a281e79a714a1c098465e29ef2925675e2b
Parents: 2a2f0f0 67354bd
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 12 10:31:50 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 12 10:31:50 2014 -0500
----------------------------------------------------------------------
.gitignore | 1 +
.../repository/TestStandardProcessSession.java | 4 ++++
.../web/nifi-web-api/nb-configuration.xml | 18 ------------------
.../provenance/VolatileProvenanceRepository.java | 2 ++
4 files changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-nifi git commit: another change for goofy netbeans
configs
Posted by ma...@apache.org.
another change for goofy netbeans configs
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/52eadeba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/52eadeba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/52eadeba
Branch: refs/heads/bootstrap
Commit: 52eadeba1827e462f34bd6b6df79f88859091ef2
Parents: f1baec6
Author: joewitt <jo...@apache.org>
Authored: Thu Dec 11 13:54:25 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Thu Dec 11 13:54:25 2014 -0500
----------------------------------------------------------------------
.../web/nifi-web-api/nb-configuration.xml | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/52eadeba/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml
deleted file mode 100644
index d290d45..0000000
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
- <!--
- This file contains additional configuration written by modules in the NetBeans IDE.
- The configuration is intended to be shared among all the users of project and
- therefore it is assumed to be part of version control checkout.
- Without this configuration present, some functionality in the IDE may be limited or fail altogether.
- -->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
- <!--
- Properties that influence various parts of the IDE, especially code formatting and the like.
- You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
- That way multiple projects can share the same settings (useful for formatting rules for example).
- Any value defined here will override the pom.xml file value but is only applicable to the current project.
- -->
- <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
- </properties>
-</project-shared-configuration>
[4/5] incubator-nifi git commit: Merge branch 'NIFI164' into develop
Posted by ma...@apache.org.
Merge branch 'NIFI164' 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/67354bd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67354bd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67354bd3
Branch: refs/heads/bootstrap
Commit: 67354bd31cafe1b646e9a4102c251c0772ef39af
Parents: 52eadeb d57861d
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 12 10:25:39 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 12 10:25:39 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/controller/FlowController.java | 4 ++++
.../nifi/controller/repository/FileSystemRepository.java | 6 ++++++
.../nifi/controller/repository/VolatileContentRepository.java | 5 +++++
.../nifi/controller/repository/TestStandardProcessSession.java | 4 ++++
.../apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
.../apache/nifi/controller/repository/ContentRepository.java | 6 ++++++
6 files changed, 27 insertions(+)
----------------------------------------------------------------------
[3/5] incubator-nifi git commit: NIFI-164: Fixed
MockContentRepository that existed in a unit test
Posted by ma...@apache.org.
NIFI-164: Fixed MockContentRepository that existed in a unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d57861d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d57861d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d57861d8
Branch: refs/heads/bootstrap
Commit: d57861d8b5283483b5721f5c4be3ce285ea6bcf4
Parents: 55d4b1c
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 12 10:19:20 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 12 10:19:20 2014 -0500
----------------------------------------------------------------------
.../nifi/controller/repository/TestStandardProcessSession.java | 4 ++++
.../org/apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 060bbd9..1ff63c5 100644
--- a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++ b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
@@ -977,6 +977,10 @@ public class TestStandardProcessSession {
private ConcurrentMap<ContentClaim, AtomicInteger> claimantCounts = new ConcurrentHashMap<>();
+ @Override
+ public void shutdown() {
+ }
+
public Set<ContentClaim> getExistingClaims() {
final Set<ContentClaim> claims = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
index 9de2661..f4f9d12 100644
--- a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
+++ b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
@@ -169,6 +169,8 @@ public class VolatileProvenanceRepository implements ProvenanceEventRepository {
@Override
public void close() throws IOException {
+ queryExecService.shutdownNow();
+ scheduledExecService.shutdown();
}
@Override