renamed packages from 'google' to 'apache' and updated necessary imports
diff --git a/src/main/java/com/google/code/gossip/GossipMember.java b/src/main/java/org/apache/gossip/GossipMember.java
similarity index 98%
rename from src/main/java/com/google/code/gossip/GossipMember.java
rename to src/main/java/org/apache/gossip/GossipMember.java
index 56029fa..fd44ddd 100644
--- a/src/main/java/com/google/code/gossip/GossipMember.java
+++ b/src/main/java/org/apache/gossip/GossipMember.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
import java.net.InetSocketAddress;
diff --git a/src/main/java/com/google/code/gossip/GossipRunner.java b/src/main/java/org/apache/gossip/GossipRunner.java
similarity index 98%
rename from src/main/java/com/google/code/gossip/GossipRunner.java
rename to src/main/java/org/apache/gossip/GossipRunner.java
index 7530fd9..d995cce 100644
--- a/src/main/java/com/google/code/gossip/GossipRunner.java
+++ b/src/main/java/org/apache/gossip/GossipRunner.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/src/main/java/com/google/code/gossip/GossipService.java b/src/main/java/org/apache/gossip/GossipService.java
similarity index 92%
rename from src/main/java/com/google/code/gossip/GossipService.java
rename to src/main/java/org/apache/gossip/GossipService.java
index 2226a48..9db740e 100644
--- a/src/main/java/com/google/code/gossip/GossipService.java
+++ b/src/main/java/org/apache/gossip/GossipService.java
@@ -15,18 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
+import org.apache.gossip.event.GossipListener;
+import org.apache.gossip.manager.GossipManager;
+import org.apache.gossip.manager.random.RandomGossipManager;
import org.apache.log4j.Logger;
-import com.google.code.gossip.event.GossipListener;
-import com.google.code.gossip.manager.GossipManager;
-import com.google.code.gossip.manager.random.RandomGossipManager;
-
/**
* This object represents the service which is responsible for gossiping with other gossip members.
*
diff --git a/src/main/java/com/google/code/gossip/GossipSettings.java b/src/main/java/org/apache/gossip/GossipSettings.java
similarity index 98%
rename from src/main/java/com/google/code/gossip/GossipSettings.java
rename to src/main/java/org/apache/gossip/GossipSettings.java
index ec9aae1..99b5807 100644
--- a/src/main/java/com/google/code/gossip/GossipSettings.java
+++ b/src/main/java/org/apache/gossip/GossipSettings.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
/**
* In this object the settings used by the GossipService are held.
diff --git a/src/main/java/com/google/code/gossip/GossipTimeoutTimer.java b/src/main/java/org/apache/gossip/GossipTimeoutTimer.java
similarity index 98%
rename from src/main/java/com/google/code/gossip/GossipTimeoutTimer.java
rename to src/main/java/org/apache/gossip/GossipTimeoutTimer.java
index a1bf130..2fa09c0 100644
--- a/src/main/java/com/google/code/gossip/GossipTimeoutTimer.java
+++ b/src/main/java/org/apache/gossip/GossipTimeoutTimer.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
import java.util.Date;
diff --git a/src/main/java/com/google/code/gossip/LocalGossipMember.java b/src/main/java/org/apache/gossip/LocalGossipMember.java
similarity index 98%
rename from src/main/java/com/google/code/gossip/LocalGossipMember.java
rename to src/main/java/org/apache/gossip/LocalGossipMember.java
index 216da96..55ce257 100644
--- a/src/main/java/com/google/code/gossip/LocalGossipMember.java
+++ b/src/main/java/org/apache/gossip/LocalGossipMember.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
import javax.management.NotificationListener;
diff --git a/src/main/java/com/google/code/gossip/RemoteGossipMember.java b/src/main/java/org/apache/gossip/RemoteGossipMember.java
similarity index 97%
rename from src/main/java/com/google/code/gossip/RemoteGossipMember.java
rename to src/main/java/org/apache/gossip/RemoteGossipMember.java
index a7c3a1f..899da93 100644
--- a/src/main/java/com/google/code/gossip/RemoteGossipMember.java
+++ b/src/main/java/org/apache/gossip/RemoteGossipMember.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
/**
* The object represents a gossip member with the properties as received from a remote gossip
diff --git a/src/main/java/com/google/code/gossip/StartupSettings.java b/src/main/java/org/apache/gossip/StartupSettings.java
similarity index 99%
rename from src/main/java/com/google/code/gossip/StartupSettings.java
rename to src/main/java/org/apache/gossip/StartupSettings.java
index 53ed725..176a79b 100644
--- a/src/main/java/com/google/code/gossip/StartupSettings.java
+++ b/src/main/java/org/apache/gossip/StartupSettings.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip;
+package org.apache.gossip;
import java.io.BufferedReader;
import java.io.File;
diff --git a/src/main/java/com/google/code/gossip/event/GossipListener.java b/src/main/java/org/apache/gossip/event/GossipListener.java
similarity index 91%
rename from src/main/java/com/google/code/gossip/event/GossipListener.java
rename to src/main/java/org/apache/gossip/event/GossipListener.java
index 424984c..2e882f6 100644
--- a/src/main/java/com/google/code/gossip/event/GossipListener.java
+++ b/src/main/java/org/apache/gossip/event/GossipListener.java
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.event;
+package org.apache.gossip.event;
-import com.google.code.gossip.GossipMember;
+import org.apache.gossip.GossipMember;
public interface GossipListener {
void gossipEvent(GossipMember member, GossipState state);
diff --git a/src/main/java/com/google/code/gossip/event/GossipState.java b/src/main/java/org/apache/gossip/event/GossipState.java
similarity index 95%
rename from src/main/java/com/google/code/gossip/event/GossipState.java
rename to src/main/java/org/apache/gossip/event/GossipState.java
index e303c89..3b76c9e 100644
--- a/src/main/java/com/google/code/gossip/event/GossipState.java
+++ b/src/main/java/org/apache/gossip/event/GossipState.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.event;
+package org.apache.gossip.event;
public enum GossipState {
UP("up"), DOWN("down");
diff --git a/src/main/java/com/google/code/gossip/examples/GossipExample.java b/src/main/java/org/apache/gossip/examples/GossipExample.java
similarity index 92%
rename from src/main/java/com/google/code/gossip/examples/GossipExample.java
rename to src/main/java/org/apache/gossip/examples/GossipExample.java
index b82bb40..e953c77 100644
--- a/src/main/java/com/google/code/gossip/examples/GossipExample.java
+++ b/src/main/java/org/apache/gossip/examples/GossipExample.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.examples;
+package org.apache.gossip.examples;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.GossipSettings;
-import com.google.code.gossip.RemoteGossipMember;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.RemoteGossipMember;
/**
* This class is an example of how one could use the gossip service. Here we start multiple gossip
diff --git a/src/main/java/com/google/code/gossip/manager/ActiveGossipThread.java b/src/main/java/org/apache/gossip/manager/ActiveGossipThread.java
similarity index 94%
rename from src/main/java/com/google/code/gossip/manager/ActiveGossipThread.java
rename to src/main/java/org/apache/gossip/manager/ActiveGossipThread.java
index 9b0bd5c..b966fcb 100644
--- a/src/main/java/com/google/code/gossip/manager/ActiveGossipThread.java
+++ b/src/main/java/org/apache/gossip/manager/ActiveGossipThread.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager;
+package org.apache.gossip.manager;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.LocalGossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.LocalGossipMember;
/**
* [The active thread: periodically send gossip request.] The class handles gossiping the membership
diff --git a/src/main/java/com/google/code/gossip/manager/GossipManager.java b/src/main/java/org/apache/gossip/manager/GossipManager.java
similarity index 95%
rename from src/main/java/com/google/code/gossip/manager/GossipManager.java
rename to src/main/java/org/apache/gossip/manager/GossipManager.java
index 42354b6..80cadf7 100644
--- a/src/main/java/com/google/code/gossip/manager/GossipManager.java
+++ b/src/main/java/org/apache/gossip/manager/GossipManager.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager;
+package org.apache.gossip.manager;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -33,12 +33,12 @@
import org.apache.log4j.Logger;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.GossipSettings;
-import com.google.code.gossip.LocalGossipMember;
-import com.google.code.gossip.event.GossipListener;
-import com.google.code.gossip.event.GossipState;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.LocalGossipMember;
+import org.apache.gossip.event.GossipListener;
+import org.apache.gossip.event.GossipState;
public abstract class GossipManager extends Thread implements NotificationListener {
diff --git a/src/main/java/com/google/code/gossip/manager/PassiveGossipThread.java b/src/main/java/org/apache/gossip/manager/PassiveGossipThread.java
similarity index 96%
rename from src/main/java/com/google/code/gossip/manager/PassiveGossipThread.java
rename to src/main/java/org/apache/gossip/manager/PassiveGossipThread.java
index 6bf1494..bd7354e 100644
--- a/src/main/java/com/google/code/gossip/manager/PassiveGossipThread.java
+++ b/src/main/java/org/apache/gossip/manager/PassiveGossipThread.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager;
+package org.apache.gossip.manager;
import java.io.IOException;
import java.net.DatagramPacket;
@@ -27,12 +27,12 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.model.ActiveGossipMessage;
import org.apache.log4j.Logger;
import org.codehaus.jackson.map.ObjectMapper;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.RemoteGossipMember;
-import com.google.code.gossip.model.ActiveGossipMessage;
+import org.apache.gossip.RemoteGossipMember;
/**
* [The passive thread: reply to incoming gossip request.] This class handles the passive cycle,
diff --git a/src/main/java/com/google/code/gossip/manager/impl/OnlyProcessReceivedPassiveGossipThread.java b/src/main/java/org/apache/gossip/manager/impl/OnlyProcessReceivedPassiveGossipThread.java
similarity index 94%
rename from src/main/java/com/google/code/gossip/manager/impl/OnlyProcessReceivedPassiveGossipThread.java
rename to src/main/java/org/apache/gossip/manager/impl/OnlyProcessReceivedPassiveGossipThread.java
index 08d573a..edf21f3 100644
--- a/src/main/java/com/google/code/gossip/manager/impl/OnlyProcessReceivedPassiveGossipThread.java
+++ b/src/main/java/org/apache/gossip/manager/impl/OnlyProcessReceivedPassiveGossipThread.java
@@ -15,16 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager.impl;
+package org.apache.gossip.manager.impl;
import java.util.List;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.LocalGossipMember;
-import com.google.code.gossip.RemoteGossipMember;
-import com.google.code.gossip.manager.GossipManager;
-import com.google.code.gossip.manager.PassiveGossipThread;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.LocalGossipMember;
+import org.apache.gossip.RemoteGossipMember;
+import org.apache.gossip.manager.GossipManager;
+import org.apache.gossip.manager.PassiveGossipThread;
public class OnlyProcessReceivedPassiveGossipThread extends PassiveGossipThread {
diff --git a/src/main/java/com/google/code/gossip/manager/impl/SendMembersActiveGossipThread.java b/src/main/java/org/apache/gossip/manager/impl/SendMembersActiveGossipThread.java
similarity index 90%
rename from src/main/java/com/google/code/gossip/manager/impl/SendMembersActiveGossipThread.java
rename to src/main/java/org/apache/gossip/manager/impl/SendMembersActiveGossipThread.java
index 2259781..16d0d32 100644
--- a/src/main/java/com/google/code/gossip/manager/impl/SendMembersActiveGossipThread.java
+++ b/src/main/java/org/apache/gossip/manager/impl/SendMembersActiveGossipThread.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager.impl;
+package org.apache.gossip.manager.impl;
import java.io.IOException;
import java.net.DatagramPacket;
@@ -24,15 +24,14 @@
import java.nio.ByteBuffer;
import java.util.List;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.LocalGossipMember;
+import org.apache.gossip.manager.ActiveGossipThread;
+import org.apache.gossip.manager.GossipManager;
+import org.apache.gossip.model.ActiveGossipMessage;
+import org.apache.gossip.model.GossipMember;
import org.codehaus.jackson.map.ObjectMapper;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.LocalGossipMember;
-import com.google.code.gossip.manager.ActiveGossipThread;
-import com.google.code.gossip.manager.GossipManager;
-import com.google.code.gossip.model.ActiveGossipMessage;
-import com.google.code.gossip.model.GossipMember;
-
abstract public class SendMembersActiveGossipThread extends ActiveGossipThread {
protected ObjectMapper om = new ObjectMapper();
diff --git a/src/main/java/com/google/code/gossip/manager/random/RandomActiveGossipThread.java b/src/main/java/org/apache/gossip/manager/random/RandomActiveGossipThread.java
similarity index 86%
rename from src/main/java/com/google/code/gossip/manager/random/RandomActiveGossipThread.java
rename to src/main/java/org/apache/gossip/manager/random/RandomActiveGossipThread.java
index 914f5ca..23a41f5 100644
--- a/src/main/java/com/google/code/gossip/manager/random/RandomActiveGossipThread.java
+++ b/src/main/java/org/apache/gossip/manager/random/RandomActiveGossipThread.java
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager.random;
+package org.apache.gossip.manager.random;
import java.util.List;
import java.util.Random;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.LocalGossipMember;
-import com.google.code.gossip.manager.GossipManager;
-import com.google.code.gossip.manager.impl.SendMembersActiveGossipThread;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.LocalGossipMember;
+import org.apache.gossip.manager.GossipManager;
+import org.apache.gossip.manager.impl.SendMembersActiveGossipThread;
public class RandomActiveGossipThread extends SendMembersActiveGossipThread {
diff --git a/src/main/java/com/google/code/gossip/manager/random/RandomGossipManager.java b/src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
similarity index 72%
rename from src/main/java/com/google/code/gossip/manager/random/RandomGossipManager.java
rename to src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
index c1e69d6..0122610 100644
--- a/src/main/java/com/google/code/gossip/manager/random/RandomGossipManager.java
+++ b/src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
@@ -15,19 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.google.code.gossip.manager.random;
+package org.apache.gossip.manager.random;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipSettings;
-import com.google.code.gossip.event.GossipListener;
-import com.google.code.gossip.manager.GossipManager;
-import com.google.code.gossip.manager.impl.OnlyProcessReceivedPassiveGossipThread;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.event.GossipListener;
+import org.apache.gossip.manager.GossipManager;
+import org.apache.gossip.manager.impl.OnlyProcessReceivedPassiveGossipThread;
import java.util.List;
public class RandomGossipManager extends GossipManager {
public RandomGossipManager(String cluster, String address, int port, String id,
- GossipSettings settings, List<GossipMember> gossipMembers, GossipListener listener) {
+ GossipSettings settings, List<GossipMember> gossipMembers, GossipListener listener) {
super(OnlyProcessReceivedPassiveGossipThread.class, RandomActiveGossipThread.class, cluster,
address, port, id, settings, gossipMembers, listener);
}
diff --git a/src/main/java/com/google/code/gossip/model/ActiveGossipMessage.java b/src/main/java/org/apache/gossip/model/ActiveGossipMessage.java
similarity index 90%
rename from src/main/java/com/google/code/gossip/model/ActiveGossipMessage.java
rename to src/main/java/org/apache/gossip/model/ActiveGossipMessage.java
index d3516f5..ac940d8 100644
--- a/src/main/java/com/google/code/gossip/model/ActiveGossipMessage.java
+++ b/src/main/java/org/apache/gossip/model/ActiveGossipMessage.java
@@ -1,4 +1,4 @@
-package com.google.code.gossip.model;
+package org.apache.gossip.model;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/com/google/code/gossip/model/GossipMember.java b/src/main/java/org/apache/gossip/model/GossipMember.java
similarity index 95%
rename from src/main/java/com/google/code/gossip/model/GossipMember.java
rename to src/main/java/org/apache/gossip/model/GossipMember.java
index 6c073b4..8dc6bf7 100644
--- a/src/main/java/com/google/code/gossip/model/GossipMember.java
+++ b/src/main/java/org/apache/gossip/model/GossipMember.java
@@ -1,4 +1,4 @@
-package com.google.code.gossip.model;
+package org.apache.gossip.model;
public class GossipMember {
diff --git a/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java b/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
index af30eb7..2d8190b 100644
--- a/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
+++ b/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
@@ -31,12 +31,12 @@
import org.apache.log4j.Logger;
import org.junit.Test;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.GossipSettings;
-import com.google.code.gossip.RemoteGossipMember;
-import com.google.code.gossip.event.GossipListener;
-import com.google.code.gossip.event.GossipState;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.RemoteGossipMember;
+import org.apache.gossip.event.GossipListener;
+import org.apache.gossip.event.GossipState;
public class ShutdownDeadtimeTest {
diff --git a/src/test/java/io/teknek/gossip/StartupSettingsTest.java b/src/test/java/io/teknek/gossip/StartupSettingsTest.java
index bf6710e..aa4e404 100644
--- a/src/test/java/io/teknek/gossip/StartupSettingsTest.java
+++ b/src/test/java/io/teknek/gossip/StartupSettingsTest.java
@@ -17,10 +17,10 @@
*/
package io.teknek.gossip;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.GossipSettings;
-import com.google.code.gossip.StartupSettings;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.StartupSettings;
import org.apache.log4j.Logger;
import org.json.JSONException;
import org.junit.Test;
diff --git a/src/test/java/io/teknek/gossip/TenNodeThreeSeedTest.java b/src/test/java/io/teknek/gossip/TenNodeThreeSeedTest.java
index 277d0fe..4e731ae 100644
--- a/src/test/java/io/teknek/gossip/TenNodeThreeSeedTest.java
+++ b/src/test/java/io/teknek/gossip/TenNodeThreeSeedTest.java
@@ -30,12 +30,12 @@
import org.apache.log4j.Logger;
import org.junit.Test;
-import com.google.code.gossip.GossipMember;
-import com.google.code.gossip.GossipService;
-import com.google.code.gossip.GossipSettings;
-import com.google.code.gossip.RemoteGossipMember;
-import com.google.code.gossip.event.GossipListener;
-import com.google.code.gossip.event.GossipState;
+import org.apache.gossip.GossipMember;
+import org.apache.gossip.GossipService;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.RemoteGossipMember;
+import org.apache.gossip.event.GossipListener;
+import org.apache.gossip.event.GossipState;
public class TenNodeThreeSeedTest {
private static final Logger log = Logger.getLogger( TenNodeThreeSeedTest.class );
