From 9af37f99aff41fd5b720768d6890539e164e9eb5 Mon Sep 17 00:00:00 2001
From: knightliao <knightliao@gmail.com>
Date: Tue, 1 Dec 2015 17:04:05 +0800
Subject: [PATCH] 2.6.30

---
 disconf-client/pom.xml                               |  2 +-
 .../disconf/client/test/DisconfMgrTestCase.java      |  1 +
 .../src/test/resources/applicationContext.xml        | 12 +++++++-----
 disconf-core/pom.xml                                 |  2 +-
 disconf-web/pom.xml                                  |  2 +-
 pom.xml                                              |  8 ++++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml
index 62e79b2e8..0952447b7 100644
--- a/disconf-client/pom.xml
+++ b/disconf-client/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.30-SNAPSHOT</version>
+        <version>2.6.30</version>
     </parent>
 
     <licenses>
diff --git a/disconf-client/src/test/java/com/baidu/disconf/client/test/DisconfMgrTestCase.java b/disconf-client/src/test/java/com/baidu/disconf/client/test/DisconfMgrTestCase.java
index ed16ce664..1358b61dc 100644
--- a/disconf-client/src/test/java/com/baidu/disconf/client/test/DisconfMgrTestCase.java
+++ b/disconf-client/src/test/java/com/baidu/disconf/client/test/DisconfMgrTestCase.java
@@ -93,6 +93,7 @@ public DisconfCoreMgr getDisconfCoreMgr(Registry registry) throws Exception {
             fileSet.add("atomserverl.properties");
             fileSet.add("atomserverm_slave.properties");
             DisconfCenterHostFilesStore.getInstance().addJustHostFileSet(fileSet);
+
             DisconfMgr.getInstance().start(StringUtil.parseStringToStringList(ScanPackTestCase.SCAN_PACK_NAME,
                     DisconfMgrBean.SCAN_SPLIT_TOKEN));
 
diff --git a/disconf-client/src/test/resources/applicationContext.xml b/disconf-client/src/test/resources/applicationContext.xml
index 7c09bb746..19a853771 100644
--- a/disconf-client/src/test/resources/applicationContext.xml
+++ b/disconf-client/src/test/resources/applicationContext.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-    xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
         http://www.springframework.org/schema/aop 
         http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
@@ -11,8 +11,10 @@
         http://www.springframework.org/schema/context/spring-context-3.0.xsd
         ">
 
-    <context:component-scan base-package="com.baidu" />
+    <context:component-scan base-package="com.baidu"/>
 
-    <aop:aspectj-autoproxy proxy-target-class="true" />
+    <aop:aspectj-autoproxy proxy-target-class="true"/>
+
+    <bean class="com.baidu.disconf.client.store.aspect.DisconfAspectJ"/>
 
 </beans>
\ No newline at end of file
diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml
index 50fd62707..390537a1c 100644
--- a/disconf-core/pom.xml
+++ b/disconf-core/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.30-SNAPSHOT</version>
+        <version>2.6.30</version>
     </parent>
 
     <licenses>
diff --git a/disconf-web/pom.xml b/disconf-web/pom.xml
index cc185086e..22f21e3c8 100644
--- a/disconf-web/pom.xml
+++ b/disconf-web/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.30-SNAPSHOT</version>
+        <version>2.6.30</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 675270482..9ffdbbf24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.baidu.disconf</groupId>
     <artifactId>disconf-base</artifactId>
-    <version>2.6.30-SNAPSHOT</version>
+    <version>2.6.30</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -25,9 +25,9 @@
 
     <properties>
         <!-- 模块版本号 -->
-        <disconf-core.version>2.6.30-SNAPSHOT</disconf-core.version>
-        <disconf-client.version>2.6.30-SNAPSHOT</disconf-client.version>
-        <disconf-client-spring.version>2.6.30-SNAPSHOT</disconf-client-spring.version>
+        <disconf-core.version>2.6.30</disconf-core.version>
+        <disconf-client.version>2.6.30</disconf-client.version>
+        <disconf-client-spring.version>2.6.30</disconf-client-spring.version>
 
         <!-- Spring項目配置 -->
         <encoding>UTF-8</encoding>