#393 move the elector and scheduler to new package

springside · Sep 13, 2014 · 3848557 · 3848557
1 parent 897aff8
commit 3848557
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/...src/main/java/org/springside/examples/showcase/demos/redis/elector/MasterElectorDemo.java b/...src/main/java/org/springside/examples/showcase/demos/redis/elector/MasterElectorDemo.java
@@ -5,9 +5,9 @@
  *******************************************************************************/
 package org.springside.examples.showcase.demos.redis.elector;
 
-import org.springside.modules.nosql.redis.elector.MasterElector;
 import org.springside.modules.nosql.redis.pool.JedisPool;
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
+import org.springside.modules.nosql.redis.service.elector.MasterElector;
 
 public class MasterElectorDemo {
 

diff --git a/...pringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerBatchPopDemo.java b/...pringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerBatchPopDemo.java
@@ -11,8 +11,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
-import org.springside.modules.nosql.redis.scheduler.AdvancedJobConsumer;
-import org.springside.modules.nosql.redis.scheduler.SimpleJobConsumer;
+import org.springside.modules.nosql.redis.service.scheduler.AdvancedJobConsumer;
+import org.springside.modules.nosql.redis.service.scheduler.SimpleJobConsumer;
 import org.springside.modules.test.benchmark.ConcurrentBenchmark;
 import org.springside.modules.utils.Threads;
 

diff --git a/...ringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerSinglePopDemo.java b/...ringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerSinglePopDemo.java
@@ -10,8 +10,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
-import org.springside.modules.nosql.redis.scheduler.AdvancedJobConsumer;
-import org.springside.modules.nosql.redis.scheduler.SimpleJobConsumer;
+import org.springside.modules.nosql.redis.service.scheduler.AdvancedJobConsumer;
+import org.springside.modules.nosql.redis.service.scheduler.SimpleJobConsumer;
 import org.springside.modules.test.benchmark.ConcurrentBenchmark;
 import org.springside.modules.utils.Threads;
 

diff --git a/...java/org/springside/examples/showcase/demos/redis/job/consumer/SimpleJobConsumerDemo.java b/...java/org/springside/examples/showcase/demos/redis/job/consumer/SimpleJobConsumerDemo.java
@@ -12,7 +12,7 @@
 
 import org.springside.modules.nosql.redis.pool.JedisPool;
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
-import org.springside.modules.nosql.redis.scheduler.SimpleJobConsumer;
+import org.springside.modules.nosql.redis.service.scheduler.SimpleJobConsumer;
 import org.springside.modules.test.benchmark.ConcurrentBenchmark;
 
 import com.google.common.util.concurrent.RateLimiter;

diff --git a/...rg/springside/examples/showcase/demos/redis/job/dispatcher/ReliableJobDispatcherDemo.java b/...rg/springside/examples/showcase/demos/redis/job/dispatcher/ReliableJobDispatcherDemo.java
@@ -12,8 +12,8 @@
 
 import org.springside.modules.nosql.redis.pool.JedisPool;
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
-import org.springside.modules.nosql.redis.scheduler.JobDispatcher;
-import org.springside.modules.nosql.redis.scheduler.JobStatistics;
+import org.springside.modules.nosql.redis.service.scheduler.JobDispatcher;
+import org.springside.modules.nosql.redis.service.scheduler.JobStatistics;
 
 /**
  * 运行JobDispatcher，每秒将Job从"job:ss:scheduled" sorted set 发布到"job:ss:ready" list.

diff --git a/.../org/springside/examples/showcase/demos/redis/job/dispatcher/SimpleJobDispatcherDemo.java b/.../org/springside/examples/showcase/demos/redis/job/dispatcher/SimpleJobDispatcherDemo.java
@@ -12,8 +12,8 @@
 
 import org.springside.modules.nosql.redis.pool.JedisPool;
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
-import org.springside.modules.nosql.redis.scheduler.JobDispatcher;
-import org.springside.modules.nosql.redis.scheduler.JobStatistics;
+import org.springside.modules.nosql.redis.service.scheduler.JobDispatcher;
+import org.springside.modules.nosql.redis.service.scheduler.JobStatistics;
 
 /**
  * 运行JobDispatcher，每秒将Job从"job:ss:scheduled" sorted set 发布到"job:ss:ready" list.

diff --git a/.../main/java/org/springside/examples/showcase/demos/redis/job/producer/JobProducerDemo.java b/.../main/java/org/springside/examples/showcase/demos/redis/job/producer/JobProducerDemo.java
@@ -11,7 +11,7 @@
 import org.springside.examples.showcase.demos.redis.job.dispatcher.SimpleJobDispatcherDemo;
 import org.springside.modules.nosql.redis.pool.JedisPool;
 import org.springside.modules.nosql.redis.pool.JedisPoolBuilder;
-import org.springside.modules.nosql.redis.scheduler.JobProducer;
+import org.springside.modules.nosql.redis.service.scheduler.JobProducer;
 import org.springside.modules.test.benchmark.BenchmarkTask;
 import org.springside.modules.test.benchmark.ConcurrentBenchmark;
 

diff --git a/...es/nosql/redis/elector/MasterElector.java → .../redis/service/elector/MasterElector.java b/...es/nosql/redis/elector/MasterElector.java → .../redis/service/elector/MasterElector.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.elector;
+package org.springside.modules.nosql.redis.service.elector;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

diff --git a/.../redis/scheduler/AdvancedJobConsumer.java → ...ervice/scheduler/AdvancedJobConsumer.java b/.../redis/scheduler/AdvancedJobConsumer.java → ...ervice/scheduler/AdvancedJobConsumer.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.scheduler;
+package org.springside.modules.nosql.redis.service.scheduler;
 
 import java.util.List;
 

diff --git a/.../nosql/redis/scheduler/JobDispatcher.java → ...edis/service/scheduler/JobDispatcher.java b/.../nosql/redis/scheduler/JobDispatcher.java → ...edis/service/scheduler/JobDispatcher.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.scheduler;
+package org.springside.modules.nosql.redis.service.scheduler;
 
 import java.util.List;
 import java.util.concurrent.Executors;

diff --git a/...es/nosql/redis/scheduler/JobProducer.java → .../redis/service/scheduler/JobProducer.java b/...es/nosql/redis/scheduler/JobProducer.java → .../redis/service/scheduler/JobProducer.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.scheduler;
+package org.springside.modules.nosql.redis.service.scheduler;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/.../nosql/redis/scheduler/JobStatistics.java → ...edis/service/scheduler/JobStatistics.java b/.../nosql/redis/scheduler/JobStatistics.java → ...edis/service/scheduler/JobStatistics.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.scheduler;
+package org.springside.modules.nosql.redis.service.scheduler;
 
 import org.springside.modules.nosql.redis.JedisTemplate;
 

diff --git a/...e/modules/nosql/redis/scheduler/Keys.java → ...s/nosql/redis/service/scheduler/Keys.java b/...e/modules/nosql/redis/scheduler/Keys.java → ...s/nosql/redis/service/scheduler/Keys.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.scheduler;
+package org.springside.modules.nosql.redis.service.scheduler;
 
 public class Keys {
 

diff --git a/...ql/redis/scheduler/SimpleJobConsumer.java → .../service/scheduler/SimpleJobConsumer.java b/...ql/redis/scheduler/SimpleJobConsumer.java → .../service/scheduler/SimpleJobConsumer.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  *******************************************************************************/
-package org.springside.modules.nosql.redis.scheduler;
+package org.springside.modules.nosql.redis.service.scheduler;
 
 import java.util.List;