Merge pull request #1 from MyCATApache/1.6

跟新代码
MyCATApache · Jan 7, 2017 · c08a811 · c08a811
2 parents bd47a75 + 4db6c77
commit c08a811
Show file tree

Hide file tree

Showing 355 changed files with 21,302 additions and 6,478 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mycat</groupId>
 	<artifactId>Mycat-server</artifactId>
-	<version>1.6-ALPHA</version>
+	<version>1.6.5-DEV</version>
 	<packaging>jar</packaging>
 	<name>Mycat-server</name>
 	<description>The project of Mycat-server</description>
@@ -68,13 +68,12 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
-			<version>1.0.23</version>
+			<version>1.0.26</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.35</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
@@ -127,7 +126,7 @@
 		<dependency>
 			<groupId>com.univocity</groupId>
 			<artifactId>univocity-parsers</artifactId>
-			<version>2.1.1</version>
+			<version>2.2.1</version>
 			<type>jar</type>
 		</dependency>
 
@@ -156,17 +155,17 @@
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-framework</artifactId>
-			<version>2.10.0</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-recipes</artifactId>
-			<version>2.10.0</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-test</artifactId>
-			<version>2.10.0</version>
+			<version>2.11.0</version>
 			<scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -175,11 +174,6 @@
                 </exclusion>
             </exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.17</version>
-		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
@@ -192,6 +186,12 @@
 			<version>2.9.3</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.shyiko</groupId>
+			<artifactId>mysql-binlog-connector-java</artifactId>
+			<version>0.6.0</version>
+		</dependency>
+
 
 		<dependency>
 			<groupId>org.mockito</groupId>

diff --git a/src/main/assembly/bin/init_zk_data.bat b/src/main/assembly/bin/init_zk_data.bat
@@ -14,4 +14,4 @@ set "CURR_DIR=%cd%"
 cd ..
 set "MYCAT_HOME=%cd%"
 cd %CURR_DIR%
-"%JAVA_CMD%" -Xms256M -Xmx1G -XX:MaxPermSize=64M  -DMYCAT_HOME=%MYCAT_HOME% -cp "..\conf;..\lib\*" demo.catlets.ZkCreate
+%JAVA_CMD% -Xms256M -Xmx1G -XX:MaxPermSize=64M  -DMYCAT_HOME=%MYCAT_HOME% -cp "..\conf;..\lib\*" io.mycat.config.loader.zkprocess.xmltozk.XmltoZkMain
diff --git a/src/main/assembly/bin/init_zk_data.sh b/src/main/assembly/bin/init_zk_data.sh
@@ -2,7 +2,7 @@
 
 echo "check JAVA_HOME & java"
 JAVA_CMD=$JAVA_HOME/bin/java
-MAIN_CLASS=demo.catlets.ZkCreate
+MAIN_CLASS=io.mycat.config.loader.zkprocess.xmltozk.XmltoZkMain
 if [ ! -d "$JAVA_HOME" ]; then
     echo ---------------------------------------------------
     echo WARN: JAVA_HOME environment variable is not set. 

diff --git a/src/main/assembly/bin/xml_to_yaml.bat b/src/main/assembly/bin/xml_to_yaml.bat
diff --git a/src/main/assembly/bin/xml_to_yaml.sh b/src/main/assembly/bin/xml_to_yaml.sh
diff --git a/src/main/assembly/conf/log4j2.xml b/src/main/assembly/conf/log4j2.xml
@@ -5,9 +5,9 @@
             <PatternLayout pattern="%d [%-5p][%t] %m %throwable{full} (%C:%F:%L) %n"/>
         </Console>
 
-        <RollingFile name="RollingFile" fileName="/logs/mycat.log"
-                     filePattern="logs/$${date:yyyy-MM}/mycat-%d{MM-dd}-%i.log.gz">
-            <PatternLayout>
+        <RollingFile name="RollingFile" fileName="${sys:MYCAT_HOME}/logs/mycat.log"
+                     filePattern="${sys:MYCAT_HOME}/logs/$${date:yyyy-MM}/mycat-%d{MM-dd}-%i.log.gz">
+        <PatternLayout>
                 <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p [%t] (%l) - %m%n</Pattern>
             </PatternLayout>
             <Policies>
@@ -24,7 +24,7 @@
         <!--</AsyncLogger>-->
         <asyncRoot level="info" includeLocation="true">
 
-            <AppenderRef ref="Console" />
+            <!--<AppenderRef ref="Console" />-->
             <AppenderRef ref="RollingFile"/>
 
         </asyncRoot>