From 9911b76f3256f1f9151b0cc29bfc2cdf462c43c8 Mon Sep 17 00:00:00 2001 From: denger Date: Sun, 27 Apr 2014 11:49:12 +0800 Subject: [PATCH] rename package --- README.md | 8 +- build.gradle | 2 +- samples/HelloSpringRSF/build.gradle | 2 +- .../rsf/example/dto/Product.java | 2 +- .../rsf/example/rpc/ProductService.java | 4 +- .../example/service/ProductServiceImpl.java | 6 +- .../src/main/resources/applicationContext.xml | 2 +- .../rsf/example/rpc/ProductServiceTest.java | 34 ------- .../rsf/example/rpc/ProductServiceTest.java | 94 +++++++++++++++++++ .../resources/applicationContext-rpc-test.xml | 4 +- .../rsf/BaseRSFServersProvider.java | 38 ++++++-- .../rsf/LocalRSFServersProvider.java | 2 +- .../rsf/RSFServer.java | 2 +- .../rsf/RSFServersProvider.java | 2 +- .../rsf/http/HttpClientBuilder.java | 2 +- .../AbstractLoadBalancerRule.java | 6 +- .../rsf/loadbalancer/HttpPing.java | 4 +- .../rsf/loadbalancer/LoadBalancerFactory.java | 2 +- .../rsf/loadbalancer/RandomRule.java | 10 +- .../rsf/loadbalancer/RoundRobinRule.java | 16 ++-- .../rsf/proxy/RSFClientFactoryBean.java | 14 +-- .../rsf/proxy/RouteProxy.java | 6 +- .../serialization/JacksonContextResolver.java | 2 +- .../rsf/util/ShutdownEnabledTimer.java | 2 +- 24 files changed, 173 insertions(+), 93 deletions(-) rename samples/HelloSpringRSF/src/main/java/org/{springcn => springstack}/rsf/example/dto/Product.java (91%) rename samples/HelloSpringRSF/src/main/java/org/{springcn => springstack}/rsf/example/rpc/ProductService.java (89%) rename samples/HelloSpringRSF/src/main/java/org/{springcn => springstack}/rsf/example/service/ProductServiceImpl.java (82%) delete mode 100644 samples/HelloSpringRSF/src/test/java/org/springcn/rsf/example/rpc/ProductServiceTest.java create mode 100644 samples/HelloSpringRSF/src/test/java/org/springstack/rsf/example/rpc/ProductServiceTest.java rename src/main/java/org/{springcn => springstack}/rsf/BaseRSFServersProvider.java (72%) rename src/main/java/org/{springcn => springstack}/rsf/LocalRSFServersProvider.java (95%) rename src/main/java/org/{springcn => springstack}/rsf/RSFServer.java (96%) rename src/main/java/org/{springcn => springstack}/rsf/RSFServersProvider.java (96%) rename src/main/java/org/{springcn => springstack}/rsf/http/HttpClientBuilder.java (98%) rename src/main/java/org/{springcn => springstack}/rsf/loadbalancer/AbstractLoadBalancerRule.java (84%) rename src/main/java/org/{springcn => springstack}/rsf/loadbalancer/HttpPing.java (92%) rename src/main/java/org/{springcn => springstack}/rsf/loadbalancer/LoadBalancerFactory.java (97%) rename src/main/java/org/{springcn => springstack}/rsf/loadbalancer/RandomRule.java (83%) rename src/main/java/org/{springcn => springstack}/rsf/loadbalancer/RoundRobinRule.java (83%) rename src/main/java/org/{springcn => springstack}/rsf/proxy/RSFClientFactoryBean.java (89%) rename src/main/java/org/{springcn => springstack}/rsf/proxy/RouteProxy.java (95%) rename src/main/java/org/{springcn => springstack}/rsf/serialization/JacksonContextResolver.java (94%) rename src/main/java/org/{springcn => springstack}/rsf/util/ShutdownEnabledTimer.java (96%) diff --git a/README.md b/README.md index 24f77de..31ff2c2 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ __1. 加入工程依赖__ ```xml - org.springcn.rsf + org.springstack.rsf spring-rsf 1.0.1 @@ -106,7 +106,7 @@ public class ProductServiceImpl implements ProductService{ 添加实现至 Spring 配置 `applicationContext.xml`，当然也可以注解(@Service)的方式声明该服务实现。 ```xml - + ``` @@ -124,9 +124,9 @@ __2. 将服务接口注入__ 将如下配置添加至 Spring 配置文件 `applicationContext-rpc-test.xml`，将 `PorudctService` 通过 Spring 以 Bean 方式注入。 ```xml - + - + diff --git a/build.gradle b/build.gradle index a155dc3..6992d94 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'maven' apply plugin: 'eclipse' -group = "org.springcn" +group = "org.springstack" version = "1.0.1" jar { manifest { diff --git a/samples/HelloSpringRSF/build.gradle b/samples/HelloSpringRSF/build.gradle index 68278e1..ec831e4 100644 --- a/samples/HelloSpringRSF/build.gradle +++ b/samples/HelloSpringRSF/build.gradle @@ -11,7 +11,7 @@ repositories { } dependencies { - compile "org.springcn:spring-rsf:1.0.1" + compile "org.springstack:spring-rsf:1.0.1" compile "junit:junit:4.11" compile "net.sf.scannotation:scannotation:1.0.2" compile "org.springframework:spring-core:3.0.5.RELEASE" diff --git a/samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/dto/Product.java b/samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/dto/Product.java similarity index 91% rename from samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/dto/Product.java rename to samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/dto/Product.java index e040a47..0843b37 100644 --- a/samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/dto/Product.java +++ b/samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/dto/Product.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.example.dto; +package org.springstack.rsf.example.dto; /** * Prodct Info. diff --git a/samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/rpc/ProductService.java b/samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/rpc/ProductService.java similarity index 89% rename from samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/rpc/ProductService.java rename to samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/rpc/ProductService.java index 061645b..3eab13e 100644 --- a/samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/rpc/ProductService.java +++ b/samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/rpc/ProductService.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.example.rpc; +package org.springstack.rsf.example.rpc; import java.util.List; @@ -12,7 +12,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import org.springcn.rsf.example.dto.Product; +import org.springstack.rsf.example.dto.Product; /** * 产品服务接口对外提供 . diff --git a/samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/service/ProductServiceImpl.java b/samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/service/ProductServiceImpl.java similarity index 82% rename from samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/service/ProductServiceImpl.java rename to samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/service/ProductServiceImpl.java index dd7a251..7e7c249 100644 --- a/samples/HelloSpringRSF/src/main/java/org/springcn/rsf/example/service/ProductServiceImpl.java +++ b/samples/HelloSpringRSF/src/main/java/org/springstack/rsf/example/service/ProductServiceImpl.java @@ -1,10 +1,10 @@ -package org.springcn.rsf.example.service; +package org.springstack.rsf.example.service; import java.util.ArrayList; import java.util.List; -import org.springcn.rsf.example.dto.Product; -import org.springcn.rsf.example.rpc.ProductService; +import org.springstack.rsf.example.dto.Product; +import org.springstack.rsf.example.rpc.ProductService; /** * 产品业务实现 diff --git a/samples/HelloSpringRSF/src/main/resources/applicationContext.xml b/samples/HelloSpringRSF/src/main/resources/applicationContext.xml index b43a4f5..ea5e1bf 100644 --- a/samples/HelloSpringRSF/src/main/resources/applicationContext.xml +++ b/samples/HelloSpringRSF/src/main/resources/applicationContext.xml @@ -4,5 +4,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd "> - + \ No newline at end of file diff --git a/samples/HelloSpringRSF/src/test/java/org/springcn/rsf/example/rpc/ProductServiceTest.java b/samples/HelloSpringRSF/src/test/java/org/springcn/rsf/example/rpc/ProductServiceTest.java deleted file mode 100644 index eb2b403..0000000 --- a/samples/HelloSpringRSF/src/test/java/org/springcn/rsf/example/rpc/ProductServiceTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.springcn.rsf.example.rpc; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.List; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springcn.rsf.example.dto.Product; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@ContextConfiguration(locations = "classpath:applicationContext-rpc-test.xml") -@RunWith(SpringJUnit4ClassRunner.class) -public class ProductServiceTest { - - @Autowired - private ProductService productService; - - @Test - public void testInvokeRpcMethod() { - Product product = productService.get(1L); - assertNotNull(product); - assertEquals(product.getId(), new Long(1L)); - - assertTrue(productService.delete(1L)); - - List products = productService.findByCategory("all"); - assertTrue(products.size() > 0); - } -} diff --git a/samples/HelloSpringRSF/src/test/java/org/springstack/rsf/example/rpc/ProductServiceTest.java b/samples/HelloSpringRSF/src/test/java/org/springstack/rsf/example/rpc/ProductServiceTest.java new file mode 100644 index 0000000..0386606 --- /dev/null +++ b/samples/HelloSpringRSF/src/test/java/org/springstack/rsf/example/rpc/ProductServiceTest.java @@ -0,0 +1,94 @@ +package org.springstack.rsf.example.rpc; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.URL; +import java.net.UnknownHostException; +import java.nio.channels.SocketChannel; +import java.util.List; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springstack.rsf.example.dto.Product; +import org.springstack.rsf.example.rpc.ProductService; + +@ContextConfiguration(locations = "classpath:applicationContext-rpc-test.xml") +@RunWith(SpringJUnit4ClassRunner.class) +public class ProductServiceTest { + + @Autowired + private ProductService productService; + + @Test + public void testInvokeRpcMethod() { + Product product = productService.get(1L); + assertNotNull(product); + assertEquals(product.getId(), new Long(1L)); + + assertTrue(productService.delete(1L)); + + List products = productService.findByCategory("all"); + assertTrue(products.size() > 0); + } + + @Test + public void testHttpPing() throws UnknownHostException, IOException { + for(int i = 0; i < 200; i++){ +// long s1 = System.currentTimeMillis(); +// boolean s2 = pingByURL("http://191.2.3.2:81"); +// long s3 = System.currentTimeMillis(); +// + long f1 = System.currentTimeMillis(); + boolean f2 = InetAddress.getByName("127.0.0.1").isReachable(10); + long f3 = System.currentTimeMillis(); + + + System.out.println(" Socket:" + (f3-f1) + " " + f2); + } + } + + public static boolean pingByURL(String URLName){ + try { + HttpURLConnection.setFollowRedirects(false); + // note : you may also need + // HttpURLConnection.setInstanceFollowRedirects(false) + HttpURLConnection con = + (HttpURLConnection) new URL(URLName).openConnection(); + con.setRequestMethod("HEAD"); + return (con.getResponseCode() == HttpURLConnection.HTTP_OK); + } + catch (Exception e) { + //e.printStackTrace(); + return false; + } + } + + public static boolean pingBySocket(String hostnameOrIP, int port) { + Socket socket = null; + boolean reachable = false; + try { + socket = new Socket(hostnameOrIP, port); + reachable = true; + }catch(Exception e){ + e.printStackTrace(); + } + finally { + if (socket != null) try { socket.close(); } catch(IOException e) {} + } + return reachable; + } + + + + +} diff --git a/samples/HelloSpringRSF/src/test/resources/applicationContext-rpc-test.xml b/samples/HelloSpringRSF/src/test/resources/applicationContext-rpc-test.xml index ae1c32f..71c01eb 100644 --- a/samples/HelloSpringRSF/src/test/resources/applicationContext-rpc-test.xml +++ b/samples/HelloSpringRSF/src/test/resources/applicationContext-rpc-test.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd "> - + - + diff --git a/src/main/java/org/springcn/rsf/BaseRSFServersProvider.java b/src/main/java/org/springstack/rsf/BaseRSFServersProvider.java similarity index 72% rename from src/main/java/org/springcn/rsf/BaseRSFServersProvider.java rename to src/main/java/org/springstack/rsf/BaseRSFServersProvider.java index 7fa6a5d..c4fee1c 100644 --- a/src/main/java/org/springcn/rsf/BaseRSFServersProvider.java +++ b/src/main/java/org/springstack/rsf/BaseRSFServersProvider.java @@ -1,4 +1,4 @@ -package org.springcn.rsf; +package org.springstack.rsf; import java.util.List; import java.util.Timer; @@ -7,10 +7,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springcn.rsf.loadbalancer.AbstractLoadBalancerRule; -import org.springcn.rsf.loadbalancer.HttpPing; -import org.springcn.rsf.loadbalancer.RoundRobinRule; -import org.springcn.rsf.util.ShutdownEnabledTimer; +import org.springstack.rsf.loadbalancer.AbstractLoadBalancerRule; +import org.springstack.rsf.loadbalancer.HttpPing; +import org.springstack.rsf.loadbalancer.RoundRobinRule; +import org.springstack.rsf.util.ShutdownEnabledTimer; /** * RSF Servers Provider.
@@ -79,19 +79,41 @@ public void markServerDown(RSFServer server) { // do something... } + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{RSFProviderClass:name=").append(getClass().getName()) + .append(",current list of Servers=").append(getServerList()) + .append("}"); + return sb.toString(); + } + public abstract List getServerList(); class PingTask extends TimerTask{ @Override public void run() { - //Pinger ping = new Pinger(); + Pinger ping = new Pinger(); try { - //ping.runPinger(); + ping.runPinger(); } catch (Throwable t) { logger.error("Throwable caught while running extends for ", t); } } - + } + + class Pinger { + + public void runPinger(){ + List servers = getServerList(); + for(RSFServer server : servers){ + if(server == null){ + continue; + } + server.setAlive(ping.isAlive(server)); + + markServerDown(server); + } + } } } diff --git a/src/main/java/org/springcn/rsf/LocalRSFServersProvider.java b/src/main/java/org/springstack/rsf/LocalRSFServersProvider.java similarity index 95% rename from src/main/java/org/springcn/rsf/LocalRSFServersProvider.java rename to src/main/java/org/springstack/rsf/LocalRSFServersProvider.java index e377e0c..8ebc32e 100644 --- a/src/main/java/org/springcn/rsf/LocalRSFServersProvider.java +++ b/src/main/java/org/springstack/rsf/LocalRSFServersProvider.java @@ -1,4 +1,4 @@ -package org.springcn.rsf; +package org.springstack.rsf; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/springcn/rsf/RSFServer.java b/src/main/java/org/springstack/rsf/RSFServer.java similarity index 96% rename from src/main/java/org/springcn/rsf/RSFServer.java rename to src/main/java/org/springstack/rsf/RSFServer.java index 6e1973b..135651f 100644 --- a/src/main/java/org/springcn/rsf/RSFServer.java +++ b/src/main/java/org/springstack/rsf/RSFServer.java @@ -1,4 +1,4 @@ -package org.springcn.rsf; +package org.springstack.rsf; import java.net.URI; diff --git a/src/main/java/org/springcn/rsf/RSFServersProvider.java b/src/main/java/org/springstack/rsf/RSFServersProvider.java similarity index 96% rename from src/main/java/org/springcn/rsf/RSFServersProvider.java rename to src/main/java/org/springstack/rsf/RSFServersProvider.java index 81d754d..b65c90b 100644 --- a/src/main/java/org/springcn/rsf/RSFServersProvider.java +++ b/src/main/java/org/springstack/rsf/RSFServersProvider.java @@ -1,4 +1,4 @@ -package org.springcn.rsf; +package org.springstack.rsf; import java.util.List; diff --git a/src/main/java/org/springcn/rsf/http/HttpClientBuilder.java b/src/main/java/org/springstack/rsf/http/HttpClientBuilder.java similarity index 98% rename from src/main/java/org/springcn/rsf/http/HttpClientBuilder.java rename to src/main/java/org/springstack/rsf/http/HttpClientBuilder.java index c0cb897..86235eb 100644 --- a/src/main/java/org/springcn/rsf/http/HttpClientBuilder.java +++ b/src/main/java/org/springstack/rsf/http/HttpClientBuilder.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.http; +package org.springstack.rsf.http; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.DefaultHttpClient; diff --git a/src/main/java/org/springcn/rsf/loadbalancer/AbstractLoadBalancerRule.java b/src/main/java/org/springstack/rsf/loadbalancer/AbstractLoadBalancerRule.java similarity index 84% rename from src/main/java/org/springcn/rsf/loadbalancer/AbstractLoadBalancerRule.java rename to src/main/java/org/springstack/rsf/loadbalancer/AbstractLoadBalancerRule.java index 5f66b4b..3d85bea 100644 --- a/src/main/java/org/springcn/rsf/loadbalancer/AbstractLoadBalancerRule.java +++ b/src/main/java/org/springstack/rsf/loadbalancer/AbstractLoadBalancerRule.java @@ -1,7 +1,7 @@ -package org.springcn.rsf.loadbalancer; +package org.springstack.rsf.loadbalancer; -import org.springcn.rsf.RSFServer; -import org.springcn.rsf.RSFServersProvider; +import org.springstack.rsf.RSFServer; +import org.springstack.rsf.RSFServersProvider; /** * LB 规则实现定义，其规则实现则为一个负载均衡的策略; 如一般常见的包括有轮询或基于响应时间的策略实现。 diff --git a/src/main/java/org/springcn/rsf/loadbalancer/HttpPing.java b/src/main/java/org/springstack/rsf/loadbalancer/HttpPing.java similarity index 92% rename from src/main/java/org/springcn/rsf/loadbalancer/HttpPing.java rename to src/main/java/org/springstack/rsf/loadbalancer/HttpPing.java index 3daac39..eb94470 100644 --- a/src/main/java/org/springcn/rsf/loadbalancer/HttpPing.java +++ b/src/main/java/org/springstack/rsf/loadbalancer/HttpPing.java @@ -1,9 +1,9 @@ -package org.springcn.rsf.loadbalancer; +package org.springstack.rsf.loadbalancer; import java.net.HttpURLConnection; import java.net.URL; -import org.springcn.rsf.RSFServer; +import org.springstack.rsf.RSFServer; /** diff --git a/src/main/java/org/springcn/rsf/loadbalancer/LoadBalancerFactory.java b/src/main/java/org/springstack/rsf/loadbalancer/LoadBalancerFactory.java similarity index 97% rename from src/main/java/org/springcn/rsf/loadbalancer/LoadBalancerFactory.java rename to src/main/java/org/springstack/rsf/loadbalancer/LoadBalancerFactory.java index 317dacf..c58d12d 100644 --- a/src/main/java/org/springcn/rsf/loadbalancer/LoadBalancerFactory.java +++ b/src/main/java/org/springstack/rsf/loadbalancer/LoadBalancerFactory.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.loadbalancer; +package org.springstack.rsf.loadbalancer; /** diff --git a/src/main/java/org/springcn/rsf/loadbalancer/RandomRule.java b/src/main/java/org/springstack/rsf/loadbalancer/RandomRule.java similarity index 83% rename from src/main/java/org/springcn/rsf/loadbalancer/RandomRule.java rename to src/main/java/org/springstack/rsf/loadbalancer/RandomRule.java index bd768e0..1f98f1f 100644 --- a/src/main/java/org/springcn/rsf/loadbalancer/RandomRule.java +++ b/src/main/java/org/springstack/rsf/loadbalancer/RandomRule.java @@ -1,10 +1,10 @@ -package org.springcn.rsf.loadbalancer; +package org.springstack.rsf.loadbalancer; import java.util.List; import java.util.Random; -import org.springcn.rsf.RSFServer; -import org.springcn.rsf.RSFServersProvider; +import org.springstack.rsf.RSFServer; +import org.springstack.rsf.RSFServersProvider; /** * 随机负载均衡策略实现. Non Thread-Safe. @@ -41,8 +41,8 @@ public RSFServer choose(RSFServersProvider provider){ } int index = random.nextInt(serverList.size()); server = serverList.get(index); - if(server != null){ - return server; + if(server == null || !server.isAlive()){ + continue; } } return server; diff --git a/src/main/java/org/springcn/rsf/loadbalancer/RoundRobinRule.java b/src/main/java/org/springstack/rsf/loadbalancer/RoundRobinRule.java similarity index 83% rename from src/main/java/org/springcn/rsf/loadbalancer/RoundRobinRule.java rename to src/main/java/org/springstack/rsf/loadbalancer/RoundRobinRule.java index b6f9bcc..4ef1837 100644 --- a/src/main/java/org/springcn/rsf/loadbalancer/RoundRobinRule.java +++ b/src/main/java/org/springstack/rsf/loadbalancer/RoundRobinRule.java @@ -1,12 +1,12 @@ -package org.springcn.rsf.loadbalancer; +package org.springstack.rsf.loadbalancer; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springcn.rsf.RSFServer; -import org.springcn.rsf.RSFServersProvider; +import org.springstack.rsf.RSFServer; +import org.springstack.rsf.RSFServersProvider; /** * 轮询策略实现。Non Thread-Safe. @@ -39,12 +39,10 @@ public RSFServer choose(RSFServersProvider provider){ } index = nextIndex.incrementAndGet() % servers.size(); server = servers.get(index); - if(server != null){ - return server; - } - - // Next retry. - server = null; + if(server == null || !server.isAlive()){ + // Next retry. + server = null; + } } if(count >= tries){ log.warn("No available alive servers after {} tries from server list: {} ", diff --git a/src/main/java/org/springcn/rsf/proxy/RSFClientFactoryBean.java b/src/main/java/org/springstack/rsf/proxy/RSFClientFactoryBean.java similarity index 89% rename from src/main/java/org/springcn/rsf/proxy/RSFClientFactoryBean.java rename to src/main/java/org/springstack/rsf/proxy/RSFClientFactoryBean.java index 017a144..45debdc 100644 --- a/src/main/java/org/springcn/rsf/proxy/RSFClientFactoryBean.java +++ b/src/main/java/org/springstack/rsf/proxy/RSFClientFactoryBean.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.proxy; +package org.springstack.rsf.proxy; import java.util.List; @@ -6,14 +6,14 @@ import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; import org.jboss.resteasy.plugins.providers.RegisterBuiltin; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.springcn.rsf.BaseRSFServersProvider; -import org.springcn.rsf.LocalRSFServersProvider; -import org.springcn.rsf.RSFServersProvider; -import org.springcn.rsf.http.HttpClientBuilder; -import org.springcn.rsf.loadbalancer.LoadBalancerFactory; -import org.springcn.rsf.serialization.JacksonContextResolver; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; +import org.springstack.rsf.BaseRSFServersProvider; +import org.springstack.rsf.LocalRSFServersProvider; +import org.springstack.rsf.RSFServersProvider; +import org.springstack.rsf.http.HttpClientBuilder; +import org.springstack.rsf.loadbalancer.LoadBalancerFactory; +import org.springstack.rsf.serialization.JacksonContextResolver; /** diff --git a/src/main/java/org/springcn/rsf/proxy/RouteProxy.java b/src/main/java/org/springstack/rsf/proxy/RouteProxy.java similarity index 95% rename from src/main/java/org/springcn/rsf/proxy/RouteProxy.java rename to src/main/java/org/springstack/rsf/proxy/RouteProxy.java index e204a81..ba1469f 100644 --- a/src/main/java/org/springcn/rsf/proxy/RouteProxy.java +++ b/src/main/java/org/springstack/rsf/proxy/RouteProxy.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.proxy; +package org.springstack.rsf.proxy; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -11,8 +11,8 @@ import org.jboss.resteasy.client.ClientExecutor; import org.jboss.resteasy.client.ProxyFactory; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.springcn.rsf.RSFServer; -import org.springcn.rsf.RSFServersProvider; +import org.springstack.rsf.RSFServer; +import org.springstack.rsf.RSFServersProvider; /** diff --git a/src/main/java/org/springcn/rsf/serialization/JacksonContextResolver.java b/src/main/java/org/springstack/rsf/serialization/JacksonContextResolver.java similarity index 94% rename from src/main/java/org/springcn/rsf/serialization/JacksonContextResolver.java rename to src/main/java/org/springstack/rsf/serialization/JacksonContextResolver.java index 5c9043b..f0cde3a 100644 --- a/src/main/java/org/springcn/rsf/serialization/JacksonContextResolver.java +++ b/src/main/java/org/springstack/rsf/serialization/JacksonContextResolver.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.serialization; +package org.springstack.rsf.serialization; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; diff --git a/src/main/java/org/springcn/rsf/util/ShutdownEnabledTimer.java b/src/main/java/org/springstack/rsf/util/ShutdownEnabledTimer.java similarity index 96% rename from src/main/java/org/springcn/rsf/util/ShutdownEnabledTimer.java rename to src/main/java/org/springstack/rsf/util/ShutdownEnabledTimer.java index d699e9c..3757569 100644 --- a/src/main/java/org/springcn/rsf/util/ShutdownEnabledTimer.java +++ b/src/main/java/org/springstack/rsf/util/ShutdownEnabledTimer.java @@ -1,4 +1,4 @@ -package org.springcn.rsf.util; +package org.springstack.rsf.util; import java.util.Timer;