Return-Path: X-Original-To: apmail-tamaya-commits-archive@minotaur.apache.org Delivered-To: apmail-tamaya-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 EED8E102A0 for ; Sun, 22 Mar 2015 14:20:12 +0000 (UTC) Received: (qmail 8478 invoked by uid 500); 22 Mar 2015 14:20:12 -0000 Delivered-To: apmail-tamaya-commits-archive@tamaya.apache.org Received: (qmail 8450 invoked by uid 500); 22 Mar 2015 14:20:12 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 8437 invoked by uid 99); 22 Mar 2015 14:20:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Mar 2015 14:20:12 +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; Sun, 22 Mar 2015 14:20:11 +0000 Received: (qmail 7182 invoked by uid 99); 22 Mar 2015 14:19:51 -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; Sun, 22 Mar 2015 14:19:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6FAF2E08DB; Sun, 22 Mar 2015 14:19:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plexus@apache.org To: commits@tamaya.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-tamaya git commit: Fixed compile error. Date: Sun, 22 Mar 2015 14:19:51 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-tamaya Updated Branches: refs/heads/master a5c1b995e -> 6a68b50f4 Fixed compile error. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/6a68b50f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/6a68b50f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/6a68b50f Branch: refs/heads/master Commit: 6a68b50f4aca1d334860707f5c7c2b6212a52049 Parents: a5c1b99 Author: Oliver B. Fischer Authored: Sun Mar 22 15:19:33 2015 +0100 Committer: Oliver B. Fischer Committed: Sun Mar 22 15:19:33 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/tamaya/json/JSONConfigurationFormat.java | 5 +++++ .../json/src/main/java/org/apache/tamaya/json/JSONFormat.java | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6a68b50f/modules/json/src/main/java/org/apache/tamaya/json/JSONConfigurationFormat.java ---------------------------------------------------------------------- diff --git a/modules/json/src/main/java/org/apache/tamaya/json/JSONConfigurationFormat.java b/modules/json/src/main/java/org/apache/tamaya/json/JSONConfigurationFormat.java index 47950a7..367bd11 100644 --- a/modules/json/src/main/java/org/apache/tamaya/json/JSONConfigurationFormat.java +++ b/modules/json/src/main/java/org/apache/tamaya/json/JSONConfigurationFormat.java @@ -31,6 +31,11 @@ import java.net.URL; public class JSONConfigurationFormat implements ConfigurationFormat { @Override + public String getName() { + return "json"; + } + + @Override public boolean accepts(URL url) { throw new java.lang.RuntimeException("Not implemented yet!"); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6a68b50f/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java ---------------------------------------------------------------------- diff --git a/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java b/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java index 70613df..80d5196 100644 --- a/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java +++ b/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java @@ -42,6 +42,11 @@ import java.util.Objects; public class JSONFormat implements ConfigurationFormat { @Override + public String getName() { + return "json"; + } + + @Override public boolean accepts(URL url) { Objects.requireNonNull(url);