Merge branch '2.x'

# Conflicts:
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserLimitTest.xml
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserListenerTest.xml
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserOrderByTest.xml
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserQueryTest.xml
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserRoutingTest.xml
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserSelectFieldTest.xml
#	elasticsearch-query-core/target/surefire-reports/TEST-org.es.test.query.SqlParserWhereConditionTest.xml
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserLimitTest.txt
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserListenerTest.txt
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserOrderByTest.txt
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserQueryTest.txt
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserRoutingTest.txt
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserSelectFieldTest.txt
#	elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserWhereConditionTest.txt
#	elasticsearch-query-jdbc/target/surefire-reports/TEST-org.es.test.jdbc.ElasticDriverTest.xml
#	elasticsearch-query-jdbc/target/surefire-reports/TEST-org.es.test.jdbc.GroupByTest.xml
#	elasticsearch-query-jdbc/target/surefire-reports/TEST-org.es.test.jdbc.MethodQueryTest.xml
#	elasticsearch-query-jdbc/target/surefire-reports/TEST-org.es.test.jdbc.ScriptQueryTest.xml
#	elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.ElasticDriverTest.txt
#	elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.GroupByTest.txt
#	elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.MethodQueryTest.txt
#	elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.ScriptQueryTest.txt
#	elasticsearch-query-spring/target/surefire-reports/TEST-org.es.test.ProductIndexQueryTest.xml
#	elasticsearch-query-spring/target/surefire-reports/org.es.test.ProductIndexQueryTest.txt

.gitignore

@@ -10,12 +10,11 @@
 *.iml
 .classpath
 .gradle*
-build/*
-target/*
+*/build/*
+*/target/*
 out
 .idea
 draft.story
-chromedriver.log
 .classpath
 .gitignore.swp
 .project

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserLimitTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserLimitTest
--------------------------------------------------------------------------------
-Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.129 sec

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserListenerTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserListenerTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserOrderByTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserOrderByTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserQueryTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserQueryTest
--------------------------------------------------------------------------------
-Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.066 sec

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserRoutingTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserRoutingTest
--------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserSelectFieldTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserSelectFieldTest
--------------------------------------------------------------------------------
-Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec

elasticsearch-query-core/target/surefire-reports/org.es.test.query.SqlParserWhereConditionTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.query.SqlParserWhereConditionTest
--------------------------------------------------------------------------------
-Tests run: 8, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.056 sec

elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.ElasticDriverTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.jdbc.ElasticDriverTest
--------------------------------------------------------------------------------
-Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.24 sec

elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.GroupByTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.jdbc.GroupByTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.043 sec

elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.MethodQueryTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.jdbc.MethodQueryTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec

elasticsearch-query-jdbc/target/surefire-reports/org.es.test.jdbc.ScriptQueryTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.jdbc.ScriptQueryTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec

elasticsearch-query-spring/target/surefire-reports/org.es.test.ProductIndexQueryTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.es.test.ProductIndexQueryTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.23 sec

elasticsearch-query-spring/target/test-classes/application-context.xml

@@ -1,33 +0,0 @@
-<?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:tx="http://www.springframework.org/schema/tx"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-     http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-     http://www.springframework.org/schema/tx
-     http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-
-
-     http://www.springframework.org/schema/context
-     http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
-
-    <context:component-scan base-package="org.es" />
-
-    <bean id="elasticDataSource" class="org.es.jdbc.api.ElasticSingleConnectionDataSource" destroy-method="destroy">
-        <property name="driverClassName" value="org.es.jdbc.api.ElasticDriver" />
-        <property name="url" value="jdbc:elastic:192.168.0.109:9300/lu-search-cluster" />
-        <property name="suppressClose" value="true" />
-    </bean>
-
-
-    <bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
-        <property name="dataSource" ref="elasticDataSource" />
-        <property name="configLocation" value="classpath:sqlMapConfig.xml"/>
-    </bean>
-
-    <bean id="sqlMapClientTemplate" class="org.es.spring.ElasticSqlMapClientTemplate">
-        <property name="sqlMapClient" ref="sqlMapClient"/>
-    </bean>
-</beans>

elasticsearch-query-spring/target/test-classes/log4j.properties

@@ -1,30 +0,0 @@
-LOG_HOME=/tmp/logs/elasticsearch-query-spring
-
-log4j.appender.reporterAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.reporterAppender.Threshold=DEBUG
-log4j.appender.reporterAppender.File=${LOG_HOME}/elasticsearch-query-spring.log
-log4j.appender.reporterAppender.DatePattern='.'yyyy-MM-dd'.log'
-log4j.appender.reporterAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.reporterAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} [%-3p] [%t] %c{3} - %m%n
-
-log4j.appender.warnAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.warnAppender.Threshold=WARN
-log4j.appender.warnAppender.File=${LOG_HOME}/warn.log
-log4j.appender.warnAppender.DatePattern='.'yyyy-MM-dd'.log'
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.warnAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} [%-3p] [%t] %c{3} - %m%n
-
-log4j.appender.3rdPartyAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.3rdPartyAppender.Threshold=INFO
-log4j.appender.3rdPartyAppender.File=${LOG_HOME}/3rd-party.log
-log4j.appender.3rdPartyAppender.DatePattern='.'yyyy-MM-dd'.log'
-log4j.appender.3rdPartyAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.3rdPartyAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} [%-3p] [%t] %c{3} - %m%n
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Target=System.out
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}[%c]-[%p]%m%n
-
-log4j.rootLogger=INFO,reporterAppender,console
-#log4j.logger.org.elasticsearch.jdbc.search=DEBUG,remoteAppender

elasticsearch-query-spring/target/test-classes/sqlMapConfig.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMapConfig PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
-        "http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
-
-<sqlMapConfig>
-    <settings
-            cacheModelsEnabled="true"
-            lazyLoadingEnabled="true"
-            enhancementEnabled="true"
-            maxSessions="64"
-            maxTransactions="20"
-            maxRequests="128"
-            useStatementNamespaces="true"/>
-
-    <sqlMap resource="sqlmap/PRODUCT.xml"/>
-
-</sqlMapConfig>

elasticsearch-query-spring/target/test-classes/sqlmap/PRODUCT.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE sqlMap
-        PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
-        "http://ibatis.apache.org/dtd/sql-map-2.dtd">
-<sqlMap namespace="PRODUCT">
-    <select id="getProductByCodeAndMatchWord" parameterClass="java.util.Map" resultClass="java.lang.String">
-        SELECT *
-        FROM index.product
-        QUERY match(productName, #matchWord#) or prefix(productName, #prefixWord#, 'boost:2.0f')
-        WHERE productCode = #productCode#
-        AND advicePrice > #advicePrice#
-        AND $$buyers.buyerName IN ('china', 'usa')
-        ROUTING BY #routingVal#
-    </select>
-
-    <select id="getAllProduct" resultClass="java.lang.String">
-        SELECT * FROM index.product
-    </select>
-</sqlMap>