去掉spring-support的引用,减少依赖

colin-lee · Oct 9, 2015 · 45c3365 · 45c3365
1 parent dbfc469
commit 45c3365
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 115 deletions.
diff --git a/config-web/pom.xml b/config-web/pom.xml
@@ -20,14 +20,20 @@
         <aspectj.version>1.8.7</aspectj.version>
         <jackson.version>2.2.0</jackson.version>
         <jetty.version>9.0.1.v20130408</jetty.version>
+        <joda-time.version>2.8.2</joda-time.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.github.colin-lee</groupId>
-            <artifactId>spring-support</artifactId>
+            <artifactId>config-core</artifactId>
             <version>${autoconf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda-time.version}</version>
+        </dependency>
         <!-- Spring core & mvc -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -104,42 +110,6 @@
             <artifactId>persistence-api</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>2.7.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <version>1.6.0.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context-support</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-tx</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-bean</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <!-- shiro -->
         <dependency>

diff --git a/config-web/src/main/java/com/github/autoconf/service/PublishService.java b/config-web/src/main/java/com/github/autoconf/service/PublishService.java
@@ -9,6 +9,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hashing;
+import com.google.common.io.BaseEncoding;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs;
@@ -19,7 +20,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import sun.misc.BASE64Encoder;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -47,7 +47,7 @@ public class PublishService {
   void init() {
     client = ConfigHelper.getDefaultClient();
     HashCode hash = Hashing.sha1().newHasher().putString(auth, Charsets.UTF_8).hash();
-    String encoded = new BASE64Encoder().encode(hash.asBytes());
+    String encoded = BaseEncoding.base64().encode(hash.asBytes());
     int pos = auth.indexOf(':');
     if (pos == -1) {
       return;

diff --git a/config-web/src/main/resources/spring/spring-cms.xml b/config-web/src/main/resources/spring/spring-cms.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <!--
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
           p:systemPropertiesModeName="SYSTEM_PROPERTIES_MODE_OVERRIDE"
           p:ignoreResourceNotFound="true"
           p:location="classpath:application.properties"/>
-    -->
-
-    <bean class="com.github.autoconf.spring.reloadable.ReloadablePropertyPostProcessor"
-          c:placeholderConfigurer-ref="autoConfig"/>
-
-    <bean id="autoConfig"
-          class="com.github.autoconf.spring.reloadable.ReloadablePropertySourcesPlaceholderConfigurer"
-          p:ignoreResourceNotFound="true"
-          p:ignoreUnresolvablePlaceholders="false"
-          p:location="classpath:application.properties"/>
 </beans>
diff --git a/config-web/src/main/resources/spring/spring-redis.xml b/config-web/src/main/resources/spring/spring-redis.xml
diff --git a/config-web/src/test/java/com/github/autoconf/web/ConfigTest.java b/config-web/src/test/java/com/github/autoconf/web/ConfigTest.java