diff --git a/pom.xml b/pom.xml index 4be616658..a6d6a2c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,8 @@ 1.7.5 1.9.13 2.3.1 + 3.1.1 + 1.1.1 @@ -448,6 +450,46 @@ ${spring.version} + + + commons-dbcp + commons-dbcp + 1.4-p2 + + + org.mybatis + mybatis + 3.1.1 + + + org.mybatis + mybatis-spring + ${mybatis.spring.version} + + + org.springframework + spring-core + + + org.springframework + spring-tx + + + org.springframework + spring-jdbc + + + org.springframework + spring-context + + + + + org.mybatis + mybatis-spring + ${mybatis.spring.version} + + net.sf.ehcache diff --git a/src/main/resources-local/hbase.properties b/src/main/resources-local/hbase.properties index c8237bc89..5b3deaab5 100644 --- a/src/main/resources-local/hbase.properties +++ b/src/main/resources-local/hbase.properties @@ -1,5 +1,5 @@ # local -hbase.client.host=localhost +hbase.client.host=dev.zk.pinpoint.navercorp.com # dev #hbase.client.host=dev.zk.pinpoint.navercorp.com # local-dev diff --git a/src/main/resources-local/jdbc.properties b/src/main/resources-local/jdbc.properties new file mode 100644 index 000000000..fdd674607 --- /dev/null +++ b/src/main/resources-local/jdbc.properties @@ -0,0 +1,4 @@ +jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://10.101.28.112:13306/pinpoint?characterEncoding=UTF-8 +jdbc.username=admin +jdbc.password=admin \ No newline at end of file diff --git a/src/main/resources/applicationContext-datasource.xml b/src/main/resources/applicationContext-datasource.xml new file mode 100644 index 000000000..2fdd18159 --- /dev/null +++ b/src/main/resources/applicationContext-datasource.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index 54a34e245..85bbef5bc 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -25,11 +25,14 @@ classpath:hbase.properties - + + +