diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/ehcache/EhcacheDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/ehcache/EhcacheDemo.java similarity index 94% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/ehcache/EhcacheDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/ehcache/EhcacheDemo.java index addbff16..59be088b 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/ehcache/EhcacheDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/ehcache/EhcacheDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.cache.ehcache; +package org.springside.examples.showcase.demos.cache.ehcache; import static org.junit.Assert.*; import net.sf.ehcache.Cache; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/guava/GuavaCacheDemo.java similarity index 97% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/guava/GuavaCacheDemo.java index 79874a5e..c97e0936 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/guava/GuavaCacheDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.cache.guava; +package org.springside.examples.showcase.demos.cache.guava; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/memcached/MemcachedDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/memcached/MemcachedDemo.java similarity index 97% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/memcached/MemcachedDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/memcached/MemcachedDemo.java index cdb8f245..00406432 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/memcached/MemcachedDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/memcached/MemcachedDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.cache.memcached; +package org.springside.examples.showcase.demos.cache.memcached; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/memcached/MemcachedObjectType.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/memcached/MemcachedObjectType.java similarity index 89% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/memcached/MemcachedObjectType.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/memcached/MemcachedObjectType.java index 7ae2bdcb..0bec2c29 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/memcached/MemcachedObjectType.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/cache/memcached/MemcachedObjectType.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.cache.memcached; +package org.springside.examples.showcase.demos.cache.memcached; /** * 统一定义Memcached中存储的各种对象的Key前缀和超时时间. diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/advanced/AdvancedNotifyMessageListener.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/advanced/AdvancedNotifyMessageListener.java similarity index 93% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/advanced/AdvancedNotifyMessageListener.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/advanced/AdvancedNotifyMessageListener.java index 3186c577..8c5563eb 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/advanced/AdvancedNotifyMessageListener.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/advanced/AdvancedNotifyMessageListener.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jms.advanced; +package org.springside.examples.showcase.demos.jms.advanced; import javax.jms.MapMessage; import javax.jms.Message; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/advanced/AdvancedNotifyMessageProducer.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/advanced/AdvancedNotifyMessageProducer.java similarity index 96% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/advanced/AdvancedNotifyMessageProducer.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/advanced/AdvancedNotifyMessageProducer.java index 071599be..8ee0a46c 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/advanced/AdvancedNotifyMessageProducer.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/advanced/AdvancedNotifyMessageProducer.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jms.advanced; +package org.springside.examples.showcase.demos.jms.advanced; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/simple/NotifyMessageListener.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/simple/NotifyMessageListener.java similarity index 88% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/simple/NotifyMessageListener.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/simple/NotifyMessageListener.java index b6eaa793..181f2971 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/simple/NotifyMessageListener.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/simple/NotifyMessageListener.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jms.simple; +package org.springside.examples.showcase.demos.jms.simple; import javax.jms.MapMessage; import javax.jms.Message; @@ -7,7 +7,7 @@ import javax.jms.MessageListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springside.examples.showcase.modules.utilities.email.SimpleMailService; +import org.springside.examples.showcase.demos.utilities.email.SimpleMailService; /** * 消息的异步被动接收者. diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/simple/NotifyMessageProducer.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/simple/NotifyMessageProducer.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/simple/NotifyMessageProducer.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/simple/NotifyMessageProducer.java index ae333243..ac6172d0 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jms/simple/NotifyMessageProducer.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jms/simple/NotifyMessageProducer.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jms.simple; +package org.springside.examples.showcase.demos.jms.simple; import java.util.HashMap; import java.util.Map; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jmx/ApplicationStatistics.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jmx/ApplicationStatistics.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/jmx/ApplicationStatistics.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/jmx/ApplicationStatistics.java index b05968fe..5f39f817 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/jmx/ApplicationStatistics.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/jmx/ApplicationStatistics.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jmx; +package org.springside.examples.showcase.demos.jmx; import java.util.concurrent.atomic.AtomicInteger; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/log/LogController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/log/LogController.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/log/LogController.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/log/LogController.java index 4d9b7875..ca92cba6 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/log/LogController.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/log/LogController.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.log; +package org.springside.examples.showcase.demos.log; import java.util.List; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/JdkTimerJob.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/JdkTimerJob.java similarity index 97% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/JdkTimerJob.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/JdkTimerJob.java index 4346ace5..4fde61f5 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/JdkTimerJob.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/JdkTimerJob.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/QuartzClusterableJob.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java similarity index 96% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/QuartzClusterableJob.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java index 6f8af742..f9f81c97 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/QuartzClusterableJob.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import java.util.Map; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/SpringCronJob.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/SpringCronJob.java similarity index 96% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/SpringCronJob.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/SpringCronJob.java index f6e3219b..b8315cab 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/SpringCronJob.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/SpringCronJob.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/UserCountScanner.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/UserCountScanner.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java index 555a061d..57c9ea33 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/schedule/UserCountScanner.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/collection/AdvancedMapDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/collection/AdvancedMapDemo.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/collection/AdvancedMapDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/collection/AdvancedMapDemo.java index 3c27bd0f..a5cf5500 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/collection/AdvancedMapDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/collection/AdvancedMapDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.collection; +package org.springside.examples.showcase.demos.utilities.collection; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/collection/CollectionsDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/collection/CollectionsDemo.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/collection/CollectionsDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/collection/CollectionsDemo.java index 9328d4d1..2eefde26 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/collection/CollectionsDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/collection/CollectionsDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.collection; +package org.springside.examples.showcase.demos.utilities.collection; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/dozer/DozerDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/dozer/DozerDemo.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/dozer/DozerDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/dozer/DozerDemo.java index b19ec1c3..766166b1 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/dozer/DozerDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/dozer/DozerDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.dozer; +package org.springside.examples.showcase.demos.utilities.dozer; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/email/MimeMailService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/email/MimeMailService.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/email/MimeMailService.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/email/MimeMailService.java index 58042094..642a30d8 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/email/MimeMailService.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/email/MimeMailService.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.email; +package org.springside.examples.showcase.demos.utilities.email; import java.io.File; import java.io.IOException; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/email/SimpleMailService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/email/SimpleMailService.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/email/SimpleMailService.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/email/SimpleMailService.java index ea605ee9..ed962cc7 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/email/SimpleMailService.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/email/SimpleMailService.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.email; +package org.springside.examples.showcase.demos.utilities.email; import java.util.Date; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/io/IODemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/io/IODemo.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/io/IODemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/io/IODemo.java index 16d4f18a..b1307af9 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/io/IODemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/io/IODemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.io; +package org.springside.examples.showcase.demos.utilities.io; import java.io.File; import java.io.IOException; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/json/JsonDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/json/JsonDemo.java similarity index 99% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/json/JsonDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/json/JsonDemo.java index 3a983cf7..302e9371 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/json/JsonDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/json/JsonDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.json; +package org.springside.examples.showcase.demos.utilities.json; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/string/StringDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/string/StringDemo.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/string/StringDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/string/StringDemo.java index 211c3bd6..6ee43027 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/string/StringDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/string/StringDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.string; +package org.springside.examples.showcase.demos.utilities.string; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/time/JodaDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/time/JodaDemo.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/time/JodaDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/time/JodaDemo.java index 1d457a1c..d3cff0f6 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/time/JodaDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/time/JodaDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.time; +package org.springside.examples.showcase.demos.utilities.time; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/validate/ValidateDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/validate/ValidateDemo.java similarity index 95% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/validate/ValidateDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/validate/ValidateDemo.java index 71a9106c..a8c915df 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/validate/ValidateDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/validate/ValidateDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.validate; +package org.springside.examples.showcase.demos.utilities.validate; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/HouseMapAdapter.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/HouseMapAdapter.java similarity index 91% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/HouseMapAdapter.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/HouseMapAdapter.java index e68f5d14..29993305 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/HouseMapAdapter.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/HouseMapAdapter.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.xml; +package org.springside.examples.showcase.demos.utilities.xml; import java.util.ArrayList; import java.util.List; @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.springside.examples.showcase.modules.utilities.xml.HouseMapAdapter.HouseMap.HouseEntry; +import org.springside.examples.showcase.demos.utilities.xml.HouseMapAdapter.HouseMap.HouseEntry; import com.google.common.collect.Maps; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/JaxbDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/JaxbDemo.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/JaxbDemo.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/JaxbDemo.java index b46342d5..1da2455d 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/JaxbDemo.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/JaxbDemo.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.xml; +package org.springside.examples.showcase.demos.utilities.xml; import static org.junit.Assert.*; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/Role.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/Role.java similarity index 90% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/Role.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/Role.java index 6b510bef..9209ae2f 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/Role.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/Role.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.xml; +package org.springside.examples.showcase.demos.utilities.xml; import javax.xml.bind.annotation.XmlAttribute; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/User.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/User.java similarity index 97% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/User.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/User.java index 1d25ea0a..2bc4260a 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/utilities/xml/User.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/utilities/xml/User.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.utilities.xml; +package org.springside.examples.showcase.demos.utilities.xml; import java.util.List; import java.util.Map; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/CacheControlHeaderFilter.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/CacheControlHeaderFilter.java similarity index 96% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/CacheControlHeaderFilter.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/CacheControlHeaderFilter.java index faaabc71..d977fdd6 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/CacheControlHeaderFilter.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/CacheControlHeaderFilter.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.web; +package org.springside.examples.showcase.demos.web; import java.io.IOException; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/MashupServerController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/MashupServerController.java similarity index 94% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/MashupServerController.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/MashupServerController.java index 9d61aa86..d3d9b930 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/MashupServerController.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/MashupServerController.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.web; +package org.springside.examples.showcase.demos.web; import java.util.Collections; import java.util.Map; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/RemoteContentServlet.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/RemoteContentServlet.java similarity index 98% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/RemoteContentServlet.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/RemoteContentServlet.java index 2d8d664c..adde3a1d 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/RemoteContentServlet.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/RemoteContentServlet.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.web; +package org.springside.examples.showcase.demos.web; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/StaticContentServlet.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/StaticContentServlet.java similarity index 99% rename from examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/StaticContentServlet.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/StaticContentServlet.java index f7aac1b7..e6735f3f 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/web/StaticContentServlet.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/web/StaticContentServlet.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.web; +package org.springside.examples.showcase.demos.web; import java.io.File; import java.io.IOException; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java index 24068e98..7e7b7368 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java @@ -6,9 +6,9 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springside.examples.showcase.demos.cache.memcached.MemcachedObjectType; import org.springside.examples.showcase.entity.Team; import org.springside.examples.showcase.entity.User; -import org.springside.examples.showcase.modules.cache.memcached.MemcachedObjectType; import org.springside.examples.showcase.repository.mybatis.TeamMybatisDao; import org.springside.examples.showcase.repository.mybatis.UserMybatisDao; import org.springside.modules.cache.memcached.SpyMemcachedClient; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java index 4541c561..4532e616 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java @@ -9,9 +9,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springside.examples.showcase.demos.jms.simple.NotifyMessageProducer; +import org.springside.examples.showcase.demos.jmx.ApplicationStatistics; import org.springside.examples.showcase.entity.User; -import org.springside.examples.showcase.modules.jms.simple.NotifyMessageProducer; -import org.springside.examples.showcase.modules.jmx.ApplicationStatistics; import org.springside.examples.showcase.repository.jpa.UserDao; import org.springside.modules.persistence.Hibernates; import org.springside.modules.security.utils.Digests; diff --git a/examples/showcase/src/main/resources/email/applicationContext-email.xml b/examples/showcase/src/main/resources/email/applicationContext-email.xml index b5b4136a..185ba476 100644 --- a/examples/showcase/src/main/resources/email/applicationContext-email.xml +++ b/examples/showcase/src/main/resources/email/applicationContext-email.xml @@ -6,7 +6,7 @@ Email配置 - + - + diff --git a/examples/showcase/src/main/resources/jms/applicationContext-jms-advanced.xml b/examples/showcase/src/main/resources/jms/applicationContext-jms-advanced.xml index c5cc0a84..cd9aab51 100644 --- a/examples/showcase/src/main/resources/jms/applicationContext-jms-advanced.xml +++ b/examples/showcase/src/main/resources/jms/applicationContext-jms-advanced.xml @@ -46,7 +46,7 @@ - + @@ -76,5 +76,5 @@ - + \ No newline at end of file diff --git a/examples/showcase/src/main/resources/jms/applicationContext-jms-simple.xml b/examples/showcase/src/main/resources/jms/applicationContext-jms-simple.xml index 62cfcf60..1a9be569 100644 --- a/examples/showcase/src/main/resources/jms/applicationContext-jms-simple.xml +++ b/examples/showcase/src/main/resources/jms/applicationContext-jms-simple.xml @@ -31,7 +31,7 @@ - + @@ -53,5 +53,5 @@ - + \ No newline at end of file diff --git a/examples/showcase/src/main/resources/jmx/applicationContext-jmx.xml b/examples/showcase/src/main/resources/jmx/applicationContext-jmx.xml index c7d04fa6..d72e4b86 100644 --- a/examples/showcase/src/main/resources/jmx/applicationContext-jmx.xml +++ b/examples/showcase/src/main/resources/jmx/applicationContext-jmx.xml @@ -15,7 +15,7 @@ - + diff --git a/examples/showcase/src/main/resources/schedule/applicationContext-jdk-timer.xml b/examples/showcase/src/main/resources/schedule/applicationContext-jdk-timer.xml index b81c838f..c17139fc 100644 --- a/examples/showcase/src/main/resources/schedule/applicationContext-jdk-timer.xml +++ b/examples/showcase/src/main/resources/schedule/applicationContext-jdk-timer.xml @@ -6,7 +6,7 @@ 使用JDK ScheduledExecutorService的定时任务配置 - + diff --git a/examples/showcase/src/main/resources/schedule/applicationContext-quartz-timer-cluster.xml b/examples/showcase/src/main/resources/schedule/applicationContext-quartz-timer-cluster.xml index ea94ad0e..ab6bdd4a 100644 --- a/examples/showcase/src/main/resources/schedule/applicationContext-quartz-timer-cluster.xml +++ b/examples/showcase/src/main/resources/schedule/applicationContext-quartz-timer-cluster.xml @@ -34,7 +34,7 @@ - + diff --git a/examples/showcase/src/main/resources/schedule/applicationContext-spring-scheduler.xml b/examples/showcase/src/main/resources/schedule/applicationContext-spring-scheduler.xml index e4fa7e40..268ab3c4 100644 --- a/examples/showcase/src/main/resources/schedule/applicationContext-spring-scheduler.xml +++ b/examples/showcase/src/main/resources/schedule/applicationContext-spring-scheduler.xml @@ -18,7 +18,7 @@ - + diff --git a/examples/showcase/src/main/webapp/WEB-INF/web.xml b/examples/showcase/src/main/webapp/WEB-INF/web.xml index ffaeff0b..8223647c 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/web.xml +++ b/examples/showcase/src/main/webapp/WEB-INF/web.xml @@ -64,7 +64,7 @@ StaticContentServlet - org.springside.examples.showcase.modules.web.StaticContentServlet + org.springside.examples.showcase.demos.web.StaticContentServlet StaticContentServlet @@ -73,7 +73,7 @@ RemoteContentServlet - org.springside.examples.showcase.modules.web.RemoteContentServlet + org.springside.examples.showcase.demos.web.RemoteContentServlet RemoteContentServlet @@ -126,7 +126,7 @@ cacheControlHeaderFilter - org.springside.examples.showcase.modules.web.CacheControlHeaderFilter + org.springside.examples.showcase.demos.web.CacheControlHeaderFilter cacheControlHeaderFilter diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/jms/JmsAdvancedTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/jms/JmsAdvancedTest.java similarity index 91% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/jms/JmsAdvancedTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/jms/JmsAdvancedTest.java index aeacc2e3..aa9683c3 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/jms/JmsAdvancedTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/jms/JmsAdvancedTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jms; +package org.springside.examples.showcase.demos.jms; import static org.junit.Assert.*; @@ -16,9 +16,9 @@ import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessageCreator; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springside.examples.showcase.demos.jms.advanced.AdvancedNotifyMessageListener; +import org.springside.examples.showcase.demos.jms.advanced.AdvancedNotifyMessageProducer; import org.springside.examples.showcase.entity.User; -import org.springside.examples.showcase.modules.jms.advanced.AdvancedNotifyMessageListener; -import org.springside.examples.showcase.modules.jms.advanced.AdvancedNotifyMessageProducer; import org.springside.modules.test.category.UnStable; import org.springside.modules.test.log.Log4jMockAppender; import org.springside.modules.test.spring.SpringContextTestCase; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/jms/JmsSimpleTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/jms/JmsSimpleTest.java similarity index 89% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/jms/JmsSimpleTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/jms/JmsSimpleTest.java index c5fb02cc..b70cdfbc 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/jms/JmsSimpleTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/jms/JmsSimpleTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.jms; +package org.springside.examples.showcase.demos.jms; import static org.junit.Assert.*; @@ -7,9 +7,9 @@ import org.junit.experimental.categories.Category; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springside.examples.showcase.demos.jms.simple.NotifyMessageListener; +import org.springside.examples.showcase.demos.jms.simple.NotifyMessageProducer; import org.springside.examples.showcase.entity.User; -import org.springside.examples.showcase.modules.jms.simple.NotifyMessageListener; -import org.springside.examples.showcase.modules.jms.simple.NotifyMessageProducer; import org.springside.modules.test.category.UnStable; import org.springside.modules.test.log.Log4jMockAppender; import org.springside.modules.test.spring.SpringContextTestCase; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/mail/MailServiceTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/mail/MailServiceTest.java similarity index 92% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/mail/MailServiceTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/mail/MailServiceTest.java index 8d701af5..4ebb60ee 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/mail/MailServiceTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/mail/MailServiceTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.mail; +package org.springside.examples.showcase.demos.mail; import static org.junit.Assert.*; @@ -14,8 +14,8 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.springside.examples.showcase.modules.utilities.email.MimeMailService; -import org.springside.examples.showcase.modules.utilities.email.SimpleMailService; +import org.springside.examples.showcase.demos.utilities.email.MimeMailService; +import org.springside.examples.showcase.demos.utilities.email.SimpleMailService; import org.springside.modules.test.spring.SpringContextTestCase; import com.icegreen.greenmail.util.GreenMail; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java similarity index 89% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java index 2f432bb5..67dbe830 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import static org.junit.Assert.*; @@ -6,6 +6,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springside.examples.showcase.demos.schedule.UserCountScanner; import org.springside.modules.test.category.UnStable; import org.springside.modules.test.log.Log4jMockAppender; import org.springside.modules.test.spring.SpringTransactionalTestCase; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java similarity index 90% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java index d8cc0b98..1c9b31e8 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import static org.junit.Assert.*; @@ -6,6 +6,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springside.examples.showcase.demos.schedule.QuartzClusterableJob; import org.springside.modules.test.category.UnStable; import org.springside.modules.test.log.Log4jMockAppender; import org.springside.modules.test.spring.SpringTransactionalTestCase; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java similarity index 90% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java index d0cbd113..62e8dbd8 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.schedule; +package org.springside.examples.showcase.demos.schedule; import static org.junit.Assert.*; @@ -6,6 +6,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springside.examples.showcase.demos.schedule.UserCountScanner; import org.springside.modules.test.category.UnStable; import org.springside.modules.test.log.Log4jMockAppender; import org.springside.modules.test.spring.SpringTransactionalTestCase; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/web/CacheControlHeaderFilterTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/web/CacheControlHeaderFilterTest.java similarity index 88% rename from examples/showcase/src/test/java/org/springside/examples/showcase/modules/web/CacheControlHeaderFilterTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/demos/web/CacheControlHeaderFilterTest.java index 9ad63200..401b8b4b 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/web/CacheControlHeaderFilterTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/web/CacheControlHeaderFilterTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.modules.web; +package org.springside.examples.showcase.demos.web; import static org.junit.Assert.*; @@ -11,7 +11,7 @@ import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import org.springside.examples.showcase.modules.web.CacheControlHeaderFilter; +import org.springside.examples.showcase.demos.web.CacheControlHeaderFilter; public class CacheControlHeaderFilterTest { @Test