[구태진] [pinpoint-web #130] Alarm 기능 추가

mysql 설정 추가 
(local 환경만 있기 때문에 local에서만 실행가능 실행하기 위해서는 applicationContext.xml의 주석을 제거하고 실행 해야 합니다.)

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3769 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
koo-taejin
2014-04-30 05:09:46 +00:00
parent ce6a502574
commit 39c4caf16b
5 changed files with 84 additions and 2 deletions
+42
View File
@@ -12,6 +12,8 @@
<slf4j.version>1.7.5</slf4j.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<fastxml.jackson.version>2.3.1</fastxml.jackson.version>
<mybatis.version>3.1.1</mybatis.version>
<mybatis.spring.version>1.1.1</mybatis.spring.version>
</properties>
<repositories>
@@ -448,6 +450,46 @@
<version>${spring.version}</version>
</dependency>
<!-- Mybatis dependecies -->
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4-p2</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>${mybatis.spring.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>${mybatis.spring.version}</version>
</dependency>
<!-- Caching dependecies -->
<dependency>
<groupId>net.sf.ehcache</groupId>
+1 -1
View File
@@ -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
+4
View File
@@ -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
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- DataSource Configuration -->
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="${jdbc.driverClassName}"/>
<property name="url" value="${jdbc.url}"/>
<property name="username" value="${jdbc.username}"/>
<property name="password" value="${jdbc.password}"/>
<property name="initialSize" value="30"/>
<property name="maxActive" value="30"/>
<property name="maxIdle" value="30"/>
<property name="minIdle" value="30"/>
<property name="maxWait" value="3000"/>
<property name="testOnBorrow" value="false"/>
<property name="testOnReturn" value="false"/>
<property name="testWhileIdle" value="false"/>
<property name="timeBetweenEvictionRunsMillis" value="30000"/>
<property name="numTestsPerEvictionRun" value="6"/>
<property name="minEvictableIdleTimeMillis" value="-1"/>
<property name="validationQuery" value="SELECT 0 FROM db_root"/>
<!-- preparedStatement cache 사용여부 -->
<property name="poolPreparedStatements" value="true"/>
<property name="maxOpenPreparedStatements" value="50"/>
</bean>
</beans>
+4 -1
View File
@@ -25,11 +25,14 @@
<property name="locations">
<list>
<value>classpath:hbase.properties</value>
</list>
<!-- <value>classpath:jdbc.properties</value>
-->
</list>
</property>
</bean>
<import resource="classpath:applicationContext-hbase.xml" />
<!--<import resource="classpath:applicationContext-datasource.xml" />-->
<!--<import resource="classpath:applicationContext-cache.xml" />-->
<bean id="spanMapper" class="com.nhn.pinpoint.web.mapper.SpanMapper"></bean>