Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-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 F034117E11 for ; Fri, 17 Apr 2015 16:08:13 +0000 (UTC) Received: (qmail 47342 invoked by uid 500); 17 Apr 2015 16:08:13 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 47288 invoked by uid 500); 17 Apr 2015 16:08:13 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 47225 invoked by uid 99); 17 Apr 2015 16:08:13 -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; Fri, 17 Apr 2015 16:08:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E616E08BE; Fri, 17 Apr 2015 16:08:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@zest.apache.org Date: Fri, 17 Apr 2015 16:08:21 -0000 Message-Id: <213889434495487e9db88dcc7dd3b001@git.apache.org> In-Reply-To: <2da16a2ab3144bd6bd2beabd68134615@git.apache.org> References: <2da16a2ab3144bd6bd2beabd68134615@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] zest-qi4j git commit: Hazelcast EntityStore now use Hazelcast 3.2.2 Hazelcast EntityStore now use Hazelcast 3.2.2 Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/b430b0ad Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/b430b0ad Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/b430b0ad Branch: refs/heads/3.0 Commit: b430b0adabb81ef42f42f469ebf9e20c91bb4423 Parents: 8693abd Author: Paul Merlin Authored: Thu Jun 12 14:54:25 2014 +0200 Committer: Paul Merlin Committed: Thu Jun 12 14:54:25 2014 +0200 ---------------------------------------------------------------------- .../qi4j/entitystore/hazelcast/HazelcastEntityStoreMixin.java | 6 +++--- libraries.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/b430b0ad/extensions/entitystore-hazelcast/src/main/java/org/qi4j/entitystore/hazelcast/HazelcastEntityStoreMixin.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-hazelcast/src/main/java/org/qi4j/entitystore/hazelcast/HazelcastEntityStoreMixin.java b/extensions/entitystore-hazelcast/src/main/java/org/qi4j/entitystore/hazelcast/HazelcastEntityStoreMixin.java index 8b6b5ec..501b34b 100644 --- a/extensions/entitystore-hazelcast/src/main/java/org/qi4j/entitystore/hazelcast/HazelcastEntityStoreMixin.java +++ b/extensions/entitystore-hazelcast/src/main/java/org/qi4j/entitystore/hazelcast/HazelcastEntityStoreMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 Paul Merlin. + * Copyright 2009-2014 Paul Merlin. * Copyright 2011 Niclas Hedhman. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -174,9 +174,9 @@ public class HazelcastEntityStoreMixin throws IOException { String hzConfLocation = configuration.configXmlLocation().get(); - if( hzConfLocation == null ) + if( hzConfLocation == null || hzConfLocation.isEmpty() ) { - hzConfLocation = "org/qi4j/entitystore/hazelcast/defaultConfiguration.xml"; + hzConfLocation = "hazelcast-default.xml"; } Config conf; if( hzConfLocation.contains( ":" ) ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/b430b0ad/libraries.gradle ---------------------------------------------------------------------- diff --git a/libraries.gradle b/libraries.gradle index d78ef13..eb9da0c 100644 --- a/libraries.gradle +++ b/libraries.gradle @@ -15,10 +15,10 @@ def ehcacheVersion = '2.8.3' def elasticsearchVersion = '1.2.1' def freemarkerVersion = '2.3.20' def gaeVersion = '1.8.8' -def hazelcastVersion = '3.1.3' def groovyVersion = '2.3.2' def guavaVersion = '17.0' def h2Version = '1.4.178' +def hazelcastVersion = '3.2.2' def httpClientVersion = '4.2.2' // 4.3.4 exists def jacksonVersion = '2.4.0' def javascriptVersion = '1.7R4'