Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit dd50843, reversing changes made to 7c396ef.
hazelcast · Dec 31, 2015 · 9d72f83 · 9d72f83
1 parent 3ae0354
commit 9d72f83
Show file tree

Hide file tree

Showing 190 changed files with 728 additions and 2,378 deletions.
diff --git a/cluster-quorum/pom.xml b/cluster-quorum/pom.xml
@@ -4,6 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+
     <artifactId>cluster-quorum</artifactId>
     <name>Cluster Quorum</name>
     <version>0.1-SNAPSHOT</version>
@@ -18,8 +19,10 @@
     <dependencies>
         <dependency>
             <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast</artifactId>
+            <artifactId>hazelcast-all</artifactId>
             <version>${hazelcast.version}</version>
         </dependency>
     </dependencies>
-</project>
+
+
+</project>
diff --git a/cluster/pom.xml b/cluster/pom.xml
diff --git a/cluster/src/main/java/ClusterFrozenState.java b/cluster/src/main/java/ClusterFrozenState.java
diff --git a/cluster/src/main/java/ClusterPassiveState.java b/cluster/src/main/java/ClusterPassiveState.java
diff --git a/cluster/src/main/java/ClusterShutdown.java b/cluster/src/main/java/ClusterShutdown.java
diff --git a/distributed-collections/boundedblockingqueue/src/main/resources/hazelcast.xml b/distributed-collections/boundedblockingqueue/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.6.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.2.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
@@ -13,4 +13,4 @@
         <max-size>10</max-size>
     </queue>
 
-</hazelcast>
+</hazelcast>
diff --git a/distributed-collections/queuestore/src/main/resources/hazelcast.xml b/distributed-collections/queuestore/src/main/resources/hazelcast.xml
@@ -1,9 +1,11 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.6.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.2.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <!-- we need to configure the queue store here -->
     <queue name="queue">
+
     </queue>
-</hazelcast>
+
+</hazelcast>
diff --git a/distributed-collections/ringbuffer/src/main/resources/hazelcast.xml b/distributed-collections/ringbuffer/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.6.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.5.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
@@ -14,4 +14,4 @@
         <time-to-live-seconds>5</time-to-live-seconds>
     </ringbuffer>
 
-</hazelcast>
+</hazelcast>
diff --git a/distributed-executor/basic-executor/src/main/java/EchoTask.java b/distributed-executor/basic-executor/src/main/java/EchoTask.java
@@ -1,7 +1,6 @@
 import java.io.Serializable;
 
 public class EchoTask implements Runnable, Serializable {
-
     private final String msg;
 
     public EchoTask(String msg) {
@@ -12,9 +11,7 @@ public void run() {
         try {
             Thread.sleep(5000);
         } catch (InterruptedException e) {
-            e.printStackTrace();
         }
-
-        System.out.println("Echo: " + msg);
+        System.out.println("Echo:" + msg);
     }
 }
diff --git a/distributed-executor/basic-executor/src/main/java/MasterMember.java b/distributed-executor/basic-executor/src/main/java/MasterMember.java
@@ -3,15 +3,13 @@
 import com.hazelcast.core.IExecutorService;
 
 public class MasterMember {
-
     public static void main(String[] args) throws Exception {
         HazelcastInstance hz = Hazelcast.newHazelcastInstance();
         IExecutorService executor = hz.getExecutorService("executor");
-
-        for (int i = 1; i <= 1; i++) {
+        for (int k = 1; k <= 1; k++) {
             Thread.sleep(1000);
-            System.out.println("Producing echo task: " + i);
-            executor.execute(new EchoTask("" + i));
+            System.out.println("Producing echo task: " + k);
+            executor.execute(new EchoTask("" + k));
         }
         System.out.println("MasterMember finished!");
 

diff --git a/distributed-executor/executing-on-all-members/src/main/java/MasterMember.java b/distributed-executor/executing-on-all-members/src/main/java/MasterMember.java
@@ -8,20 +8,16 @@
 import java.util.concurrent.Future;
 
 public class MasterMember {
-
     public static void main(String[] args) throws Exception {
         HazelcastInstance hz = Hazelcast.newHazelcastInstance();
         Map<String, Integer> map = hz.getMap("map");
-        for (int i = 0; i < 5; i++) {
+        for (int k = 0; k < 5; k++)
             map.put(UUID.randomUUID().toString(), 1);
-        }
         IExecutorService executor = hz.getExecutorService("executor");
-
         Map<Member, Future<Integer>> result = executor.submitToAllMembers(new SumTask());
         int sum = 0;
-        for (Future<Integer> future : result.values()) {
+        for (Future<Integer> future : result.values())
             sum += future.get();
-        }
 
         System.out.println("Result: " + sum);
     }

diff --git a/distributed-executor/executing-on-all-members/src/main/java/SlaveMember.java b/distributed-executor/executing-on-all-members/src/main/java/SlaveMember.java
@@ -1,7 +1,6 @@
 import com.hazelcast.core.Hazelcast;
 
 public class SlaveMember {
-
     public static void main(String[] args) {
         Hazelcast.newHazelcastInstance();
     }

diff --git a/distributed-executor/executing-on-all-members/src/main/java/SumTask.java b/distributed-executor/executing-on-all-members/src/main/java/SumTask.java
@@ -5,8 +5,8 @@
 import java.io.Serializable;
 import java.util.concurrent.Callable;
 
-public class SumTask implements Callable<Integer>, Serializable, HazelcastInstanceAware {
-
+public class SumTask implements
+        Callable<Integer>, Serializable, HazelcastInstanceAware {
     private transient HazelcastInstance hz;
 
     public void setHazelcastInstance(HazelcastInstance hz) {
@@ -20,7 +20,7 @@ public Integer call() throws Exception {
             System.out.println("Calculating for key: " + key);
             result += map.get(key);
         }
-        System.out.println("Local result: " + result);
+        System.out.println("Local Result: " + result);
         return result;
     }
 }
diff --git a/distributed-executor/executing-on-key-owner/src/main/java/MasterMember.java b/distributed-executor/executing-on-key-owner/src/main/java/MasterMember.java
@@ -6,17 +6,13 @@
 import java.util.UUID;
 
 public class MasterMember {
-
     public static void main(String[] args) throws Exception {
         HazelcastInstance hz = Hazelcast.newHazelcastInstance();
         Map<String, String> map = hz.getMap("map");
-        for (int i = 0; i < 10; i++) {
+        for (int k = 0; k < 10; k++)
             map.put(UUID.randomUUID().toString(), "");
-        }
-
         IExecutorService executor = hz.getExecutorService("executor");
-        for (String key : map.keySet()) {
+        for (String key : map.keySet())
             executor.executeOnKeyOwner(new VerifyTask(key), key);
-        }
     }
 }
diff --git a/distributed-executor/executing-on-key-owner/src/main/java/SlaveMember.java b/distributed-executor/executing-on-key-owner/src/main/java/SlaveMember.java
@@ -1,7 +1,6 @@
 import com.hazelcast.core.Hazelcast;
 
 public class SlaveMember {
-
     public static void main(String[] args) {
         Hazelcast.newHazelcastInstance();
     }

diff --git a/distributed-executor/executing-on-key-owner/src/main/java/VerifyTask.java b/distributed-executor/executing-on-key-owner/src/main/java/VerifyTask.java
@@ -5,7 +5,6 @@
 import java.io.Serializable;
 
 public class VerifyTask implements Runnable, Serializable, HazelcastInstanceAware {
-
     private final String key;
     private transient HazelcastInstance hz;
 
@@ -20,6 +19,6 @@ public void setHazelcastInstance(HazelcastInstance hz) {
     public void run() {
         IMap map = hz.getMap("map");
         boolean localKey = map.localKeySet().contains(key);
-        System.out.println("Key " + key + " is local: " + localKey);
+        System.out.println("Key is local:" + localKey);
     }
 }
diff --git a/distributed-executor/executing-on-lite-members/src/main/java/ComputationHeavyTask.java b/distributed-executor/executing-on-lite-members/src/main/java/ComputationHeavyTask.java
@@ -4,8 +4,8 @@
 import java.io.Serializable;
 import java.util.concurrent.Callable;
 
-public class ComputationHeavyTask implements Callable<Integer>, Serializable, HazelcastInstanceAware {
-
+public class ComputationHeavyTask implements
+        Callable<Integer>, Serializable, HazelcastInstanceAware {
     private transient HazelcastInstance hz;
 
     public void setHazelcastInstance(HazelcastInstance hz) {

diff --git a/distributed-executor/executing-on-lite-members/src/main/java/StartDataMember.java b/distributed-executor/executing-on-lite-members/src/main/java/StartDataMember.java
@@ -6,13 +6,10 @@
 import java.util.concurrent.Future;
 
 public class StartDataMember {
-
     public static void main(String[] args) throws Exception {
-        HazelcastInstance hz = Hazelcast.newHazelcastInstance();
-        IExecutorService executor = hz.getExecutorService("executor");
-
-        Future<Integer> future = executor.submit(new ComputationHeavyTask(), MemberSelectors.LITE_MEMBER_SELECTOR);
-
+        final HazelcastInstance hz = Hazelcast.newHazelcastInstance();
+        final IExecutorService executor = hz.getExecutorService("executor");
+        final Future<Integer> future = executor.submit(new ComputationHeavyTask(), MemberSelectors.LITE_MEMBER_SELECTOR);
         System.out.println("Result: " + future.get());
     }
 }
diff --git a/distributed-executor/executing-on-lite-members/src/main/java/StartLiteMember.java b/distributed-executor/executing-on-lite-members/src/main/java/StartLiteMember.java
@@ -2,11 +2,9 @@
 import com.hazelcast.core.Hazelcast;
 
 public class StartLiteMember {
-
     public static void main(String[] args) {
-        Config config = new Config();
+        final Config config = new Config();
         config.setLiteMember(true);
-
         Hazelcast.newHazelcastInstance(config);
     }
 }
diff --git a/distributed-executor/executing-on-specific-member/src/main/java/EchoTask.java b/distributed-executor/executing-on-specific-member/src/main/java/EchoTask.java
@@ -8,6 +8,6 @@ public EchoTask(String msg) {
     }
 
     public void run() {
-        System.out.println("Echo: " + msg);
+        System.out.println(msg);
     }
 }
diff --git a/distributed-executor/executing-on-specific-member/src/main/java/MasterMember.java b/distributed-executor/executing-on-specific-member/src/main/java/MasterMember.java
@@ -4,13 +4,11 @@
 import com.hazelcast.core.Member;
 
 public class MasterMember {
-
     public static void main(String[] args) {
         HazelcastInstance hz = Hazelcast.newHazelcastInstance();
         IExecutorService executorService = hz.getExecutorService("executor");
-
         for (Member member : hz.getCluster().getMembers()) {
-            EchoTask task = new EchoTask(member.getSocketAddress().toString());
+            EchoTask task = new EchoTask("echo" + member.getSocketAddress());
             executorService.executeOnMember(task, member);
         }
     }