You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/04/17 18:08:21 UTC
[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 <pa...@nosphere.org>
Authored: Thu Jun 12 14:54:25 2014 +0200
Committer: Paul Merlin <pa...@nosphere.org>
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'