Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D86C417503 for ; Tue, 20 Jan 2015 18:04:01 +0000 (UTC) Received: (qmail 3158 invoked by uid 500); 20 Jan 2015 18:04:01 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 3118 invoked by uid 500); 20 Jan 2015 18:04:01 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 3109 invoked by uid 99); 20 Jan 2015 18:04:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2015 18:04:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 20 Jan 2015 18:04:00 +0000 Received: (qmail 2416 invoked by uid 99); 20 Jan 2015 18:03:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2015 18:03:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CADFE07FA; Tue, 20 Jan 2015 18:03:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markap14@apache.org To: commits@nifi.incubator.apache.org Date: Tue, 20 Jan 2015 18:03:44 -0000 Message-Id: In-Reply-To: <5e0348c84cab4037afc4c95e78897f9a@git.apache.org> References: <5e0348c84cab4037afc4c95e78897f9a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] incubator-nifi git commit: NIFI-4: Use @OnEnabled instead of @OnConfigured in ssl context service X-Virus-Checked: Checked by ClamAV on apache.org NIFI-4: Use @OnEnabled instead of @OnConfigured in ssl context service Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1a402d46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1a402d46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1a402d46 Branch: refs/heads/annotations Commit: 1a402d468a42286fef4276d61de999f0862dc6a3 Parents: 1b1f45f Author: Mark Payne Authored: Tue Jan 20 13:03:21 2015 -0500 Committer: Mark Payne Committed: Tue Jan 20 13:03:21 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/ssl/StandardSSLContextService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1a402d46/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java ---------------------------------------------------------------------- diff --git a/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java index d7aae16..68f83d4 100644 --- a/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java +++ b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java @@ -26,13 +26,13 @@ import java.util.Map; import javax.net.ssl.SSLContext; +import org.apache.nifi.annotation.lifecycle.OnEnabled; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.ValidationContext; import org.apache.nifi.components.ValidationResult; import org.apache.nifi.components.Validator; import org.apache.nifi.controller.AbstractControllerService; import org.apache.nifi.controller.ConfigurationContext; -import org.apache.nifi.controller.annotation.OnConfigured; import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.reporting.InitializationException; @@ -104,7 +104,7 @@ public class StandardSSLContextService extends AbstractControllerService impleme } private ConfigurationContext configContext; - @OnConfigured + @OnEnabled public void onConfigured(final ConfigurationContext context) throws InitializationException { configContext = context;