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/01/09 14:20:11 UTC

[1/2] incubator-nifi git commit: NIFI-239: Updated deprecated method calls to use newer versions

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop b98819e5a -> 3b16d010c


NIFI-239: Updated deprecated method calls to use newer versions


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b6d5a68f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b6d5a68f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b6d5a68f

Branch: refs/heads/develop
Commit: b6d5a68f75f8ca1b3bf484c3f42b83fdb05dfedd
Parents: 9ba8def
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jan 9 08:15:29 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Jan 9 08:15:29 2015 -0500

----------------------------------------------------------------------
 .../persistent-provenance-repository/pom.xml    |  1 -
 .../provenance/lucene/DeleteIndexAction.java    |  2 +-
 .../nifi/provenance/lucene/LuceneUtil.java      |  2 +-
 .../TestPersistentProvenanceRepository.java     | 35 +++++++-------------
 4 files changed, 14 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b6d5a68f/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
index ad5cee3..122a977 100644
--- a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
+++ b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
@@ -22,7 +22,6 @@
     </parent>
 
     <artifactId>persistent-provenance-repository</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>Persistent Provenance Repository</name>
     <packaging>jar</packaging>
 

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b6d5a68f/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
----------------------------------------------------------------------
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
index 6d922bd..4608419 100644
--- a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
+++ b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
@@ -76,7 +76,7 @@ public class DeleteIndexAction implements ExpirationAction {
         final List<File> indexDirs = indexConfiguration.getIndexDirectories(expiredFile);
         for (final File indexingDirectory : indexDirs) {
             try (final Directory directory = FSDirectory.open(indexingDirectory);
-                    final Analyzer analyzer = new StandardAnalyzer(LuceneUtil.LUCENE_VERSION)) {
+                    final Analyzer analyzer = new StandardAnalyzer()) {
                 IndexWriterConfig config = new IndexWriterConfig(LuceneUtil.LUCENE_VERSION, analyzer);
                 config.setWriteLockTimeout(300000L);
 

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b6d5a68f/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
----------------------------------------------------------------------
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
index 0f460fe..a7076d5 100644
--- a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
+++ b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
@@ -41,7 +41,7 @@ import org.apache.lucene.util.Version;
 
 public class LuceneUtil {
 
-    public static final Version LUCENE_VERSION = Version.LUCENE_43;
+    public static final Version LUCENE_VERSION = Version.LATEST;
 
     public static String substringBefore(final String value, final String searchValue) {
         final int index = value.indexOf(searchValue);

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b6d5a68f/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
index 7950483..7305872 100644
--- a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
+++ b/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
@@ -16,15 +16,6 @@
  */
 package org.apache.nifi.provenance;
 
-import org.apache.nifi.provenance.PersistentProvenanceRepository;
-import org.apache.nifi.provenance.RepositoryConfiguration;
-import org.apache.nifi.provenance.IndexConfiguration;
-import org.apache.nifi.provenance.AsyncLineageSubmission;
-import org.apache.nifi.provenance.SearchableFields;
-import org.apache.nifi.provenance.StandardProvenanceEventRecord;
-import org.apache.nifi.provenance.ProvenanceEventType;
-import org.apache.nifi.provenance.ProvenanceEventRecord;
-import org.apache.nifi.provenance.ProvenanceEventBuilder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -43,6 +34,16 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.SimpleAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.FSDirectory;
 import org.apache.nifi.events.EventReporter;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.provenance.lineage.EventNode;
@@ -58,18 +59,6 @@ import org.apache.nifi.provenance.search.SearchableField;
 import org.apache.nifi.provenance.serialization.RecordReader;
 import org.apache.nifi.provenance.serialization.RecordReaders;
 import org.apache.nifi.reporting.Severity;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.core.SimpleAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.Version;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -1058,8 +1047,8 @@ public class TestPersistentProvenanceRepository {
         try (final DirectoryReader directoryReader = DirectoryReader.open(FSDirectory.open(indexDirectory))) {
             final IndexSearcher searcher = new IndexSearcher(directoryReader);
 
-            final Analyzer analyzer = new SimpleAnalyzer(Version.LUCENE_43);
-            final org.apache.lucene.search.Query luceneQuery = new QueryParser(Version.LUCENE_43, "uuid", analyzer).parse(query);
+            final Analyzer analyzer = new SimpleAnalyzer();
+            final org.apache.lucene.search.Query luceneQuery = new QueryParser("uuid", analyzer).parse(query);
 
             final Query q = new Query("");
             q.setMaxResults(1000);


[2/2] incubator-nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

Posted by ma...@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/3b16d010
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3b16d010
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3b16d010

Branch: refs/heads/develop
Commit: 3b16d010c0dd2129732db4cf856ff875db65e4bf
Parents: b6d5a68 b98819e
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jan 9 08:20:07 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Jan 9 08:20:07 2015 -0500

----------------------------------------------------------------------
 .../util/RemoteProcessGroupUtils.java           |   4 +-
 .../framework/web/nifi-web-api/pom.xml          |   3 +-
 .../nifi/web/controller/ControllerFacade.java   |  23 ++
 .../apache/nifi/integration/NiFiWebApiTest.java |  16 +-
 .../accesscontrol/AdminAccessControlTest.java   |   2 +-
 .../ReadOnlyAccessControlTest.java              |   2 +-
 .../org/apache/nifi/web/servlet/ConvertSvg.java |   2 +
 .../canvas/connection-configuration.jsp         |   2 +-
 .../WEB-INF/partials/connection-details.jsp     |   2 +-
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   | 275 +++++++++++--------
 .../main/webapp/js/nf/canvas/nf-connection.js   | 107 ++++++--
 .../src/main/webapp/js/nf/canvas/nf-go-to.js    |   2 +-
 .../web/security/UntrustedProxyException.java   |   4 -
 .../x509/ocsp/OcspCertificateValidator.java     |   2 +-
 .../nifi/processors/hadoop/GetHDFSTest.java     |   4 +-
 .../prioritizer/NewestFirstPrioritizerTest.java |   3 +-
 .../prioritizer/OldestFirstPrioritizerTest.java |   3 +-
 .../main/asciidoc/images/iconFlowHistory.png    | Bin 0 -> 2463 bytes
 .../src/main/asciidoc/images/iconSettings.png   | Bin 0 -> 2638 bytes
 .../src/main/asciidoc/images/iconUsers.png      | Bin 0 -> 2272 bytes
 .../src/main/asciidoc/images/simple-flow.png    | Bin 0 -> 196808 bytes
 nifi-docs/src/main/asciidoc/user-guide.adoc     |  80 ++++--
 22 files changed, 352 insertions(+), 184 deletions(-)
----------------------------------------------------------------------