nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marka...@apache.org
Subject [13/14] nifi git commit: Merge branch 'master' into NIFI-259
Date Tue, 19 Jan 2016 16:03:52 GMT
Merge branch 'master' into NIFI-259


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

Branch: refs/heads/NIFI-259
Commit: 16dcf4595c03426505f411f587fb61c1a47485a7
Parents: 95a3115 ecb81ec
Author: Mark Payne <markap14@hotmail.com>
Authored: Mon Jan 18 08:48:30 2016 -0500
Committer: Mark Payne <markap14@hotmail.com>
Committed: Mon Jan 18 08:48:30 2016 -0500

----------------------------------------------------------------------
 .../controller/AbstractConfiguredComponent.java |   3 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |   2 +-
 .../nifi/controller/StandardProcessorNode.java  |   9 +-
 .../nifi-web/nifi-web-security/pom.xml          |   6 +-
 .../x509/ocsp/OcspCertificateValidator.java     | 125 +++++---
 .../web/security/x509/ocsp/OcspRequest.java     |   9 +
 .../x509/ocsp/OcspCertificateValidatorTest.java | 311 +++++++++++++++++++
 .../nifi-kafka-processors/pom.xml               |   6 +-
 .../nifi/processors/kafka/KafkaUtils.java       |   4 +-
 .../apache/nifi/processors/kafka/PutKafka.java  |   5 +-
 .../nifi/processors/kafka/TestPutKafka.java     |  11 +
 .../nifi-standard-processors/pom.xml            |   4 +-
 .../processors/standard/DetectDuplicate.java    |  33 +-
 .../processors/standard/EncryptContent.java     |  20 +-
 .../nifi/processors/standard/InvokeHTTP.java    |   8 +-
 .../standard/util/OpenPGPKeyBasedEncryptor.java | 279 +++++++++++------
 .../util/OpenPGPPasswordBasedEncryptor.java     | 103 +++---
 .../nifi/processors/standard/util/PGPUtil.java  |  91 ++++++
 .../standard/TestDetectDuplicate.java           |  78 ++++-
 .../processors/standard/TestEncryptContent.java | 147 ++++++++-
 .../util/OpenPGPKeyBasedEncryptorTest.java      | 132 ++++++++
 .../util/OpenPGPPasswordBasedEncryptorTest.java | 123 ++++++++
 .../standard/util/TestInvokeHttpCommon.java     |  41 +++
 .../resources/TestEncryptContent/pubring.gpg    | Bin 0 -> 1250 bytes
 .../resources/TestEncryptContent/secring.gpg    | Bin 0 -> 2628 bytes
 .../resources/TestEncryptContent/text.txt.gpg   | Bin 0 -> 1481 bytes
 .../TestEncryptContent/text.txt.unsigned.gpg    | Bin 0 -> 824 bytes
 .../ControllerStatusReportingTask.java          |   4 +-
 pom.xml                                         |  13 +-
 29 files changed, 1308 insertions(+), 259 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/16dcf459/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/nifi/blob/16dcf459/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/nifi/blob/16dcf459/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/nifi/blob/16dcf459/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
----------------------------------------------------------------------
diff --cc nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
index 8bec03e,54e6a29..0d7394e
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
@@@ -174,6 -251,37 +244,8 @@@ public class TestDetectDuplicate 
  
          @Override
          public <K, V> void put(final K key, final V value, final Serializer<K>
keySerializer, final Serializer<V> valueSerializer) throws IOException {
+             cacheValue = value;
+             exists = true;
          }
      }
 -
 -    private static class StringSerializer implements Serializer<String> {
 -
 -        @Override
 -        public void serialize(final String value, final OutputStream output) throws SerializationException,
IOException {
 -            output.write(value.getBytes(StandardCharsets.UTF_8));
 -        }
 -    }
 -
 -    private static void deleteRecursively(final File dataFile) throws IOException {
 -        if (dataFile == null || !dataFile.exists()) {
 -            return;
 -        }
 -
 -        final File[] children = dataFile.listFiles();
 -        for (final File child : children) {
 -            if (child.isDirectory()) {
 -                deleteRecursively(child);
 -            } else {
 -                for (int i = 0; i < 100 && child.exists(); i++) {
 -                    child.delete();
 -                }
 -
 -                if (child.exists()) {
 -                    throw new IOException("Could not delete " + dataFile.getAbsolutePath());
 -                }
 -            }
 -        }
 -    }
  }

http://git-wip-us.apache.org/repos/asf/nifi/blob/16dcf459/pom.xml
----------------------------------------------------------------------


Mime
View raw message