[#103] Moved private projects under private project

This commit is contained in:
Jongho Moon
2014-12-04 16:08:08 +09:00
parent e8dcdabe8c
commit f82fc91a15
345 changed files with 523 additions and 167 deletions
-4
View File
@@ -367,10 +367,6 @@
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.nhncorp.nelo2</groupId>
<artifactId>nelo2-java-sdk-log4j</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+11 -101
View File
@@ -11,36 +11,10 @@
<name>pinpoint</name>
<packaging>pom</packaging>
<distributionManagement>
<repository>
<id>nhn.release.repository</id>
<name>nhncorp.release</name>
<url>http://repo.nhncorp.com/maven2</url>
</repository>
<snapshotRepository>
<id>nhn.snapshot.repository</id>
<name>nhncorp.snapshot</name>
<url>http://repo.nhncorp.com/m2-snapshot-repository</url>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<id>nhn.snapshot.repository</id>
<name>NHN Snapshot Repository</name>
<url>http://repo.nhncorp.com/m2-snapshot-repository/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>nhn.release.repository</id>
<url>http://repo.nhncorp.com/maven2</url>
<id>cubrid.release.repository</id>
<url>http://maven.cubrid.org</url>
</repository>
<repository>
<id>cloudera</id>
@@ -49,11 +23,6 @@
</repositories>
<pluginRepositories>
<pluginRepository>
<id>nhn-repository</id>
<name>NHN Maven2 Repository</name>
<url>http://repo.nhncorp.com/maven2</url>
</pluginRepository>
<pluginRepository>
<id>codehaus repository</id>
<name>Codehaus Maven2 Repository</name>
@@ -61,20 +30,18 @@
</pluginRepository>
</pluginRepositories>
<modules>
<module>agent</module>
<module>bootstrap</module>
<module>collector</module>
<module>commons</module>
<module>naver-agent</module>
<module>naver-collector</module>
<module>naver-plugin</module>
<module>naver-web</module>
<module>profiler</module>
<module>profiler-optional</module>
<module>rpc</module>
<module>thrift</module>
<module>web</module>
<module>private</module>
</modules>
<properties>
@@ -346,42 +313,11 @@
<version>1.2.16</version>
</dependency>
<dependency>
<groupId>com.nhncorp.nelo2</groupId>
<artifactId>nelo2-java-sdk-log4j</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>lucy-core</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>lucy-npc</artifactId>
<version>1.5.19</version>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>lucy-nimmconnector</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>lucy-bloc-http11</artifactId>
<version>5.5.23</version>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>bloc-core</artifactId>
<version>4.0.3</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -389,9 +325,9 @@
<version>1.4-p2</version>
</dependency>
<dependency>
<groupId>com.ibatis</groupId>
<artifactId>ibatis2-sqlmap</artifactId>
<version>2.3.4.726-p4</version>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
<version>2.3.4.726</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
@@ -415,15 +351,10 @@
<artifactId>cubrid-jdbc</artifactId>
<version>8.4.3.1005</version>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.1.0.7.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>1.2.5</version>
<version>1.2.8</version>
</dependency>
<dependency>
@@ -454,14 +385,9 @@
</dependency>
<dependency>
<groupId>arcus</groupId>
<artifactId>arcus-client</artifactId>
<version>1.6.2.1</version>
</dependency>
<dependency>
<groupId>arcus</groupId>
<artifactId>arcus-spring</artifactId>
<version>0.3.5</version>
<groupId>com.navercorp.arcus</groupId>
<artifactId>arcus-java-client</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -475,18 +401,6 @@
</dependency>
<dependency>
<groupId>com.nhncorp</groupId>
<artifactId>triples-redis-client</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
@@ -683,10 +597,6 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+2
View File
@@ -0,0 +1,2 @@
/.settings/
/.project
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.nhn.pinpoint</groupId>
<artifactId>pom</artifactId>
<artifactId>pinpoint-naver</artifactId>
<version>1.0.4-SNAPSHOT</version>
</parent>
@@ -0,0 +1,217 @@
#
# Pinpoint agent configuration
# (Phase : local)
#
###########################################################
# Collector server #
###########################################################
# local
profiler.collector.ip=127.0.0.1
# dev
#profiler.collector.ip=dev.collector.pinpoint.navercorp.com
# real
#profiler.collector.ip=collector.pinpoint.navercorp.com
# placeHolder support "${key}"
profiler.collector.span.ip=${profiler.collector.ip}
profiler.collector.span.port=9996
# placeHolder support "${key}"
profiler.collector.stat.ip=${profiler.collector.ip}
profiler.collector.stat.port=9995
# placeHolder support "${key}"
profiler.collector.tcp.ip=${profiler.collector.ip}
profiler.collector.tcp.port=9994
###########################################################
# Profiler Global Configuration #
###########################################################
profiler.enable=true
profiler.jvm.collect.interval=1000
profiler.sampling.enable=true
# 아래 지정한 값중 한 개의 트랜잭션을 수집합니다. (예를들어 1로 지정하면 100%수집, 2로 지정하면 50%수집 셈)
profiler.sampling.rate=1
# span을 Io에 flush할 경우 buffering 여부
profiler.io.buffering.enable=true
# buffering 시 몇개 까지 저장할지 여부
profiler.io.buffering.buffersize=20
profiler.spandatasender.write.queue.size=5120
#profiler.spandatasender.socket.sendbuffersize=1048576
#profiler.spandatasender.socket.timeout=3000
profiler.spandatasender.chunk.size=16384
profiler.statdatasender.write.queue.size=5120
#profiler.statdatasender.socket.sendbuffersize=1048576
#profiler.statdatasender.socket.timeout=3000
profiler.statdatasender.chunk.size=16384
profiler.agentInfo.send.retry.interval=300000
# Tcp Data Command 허용 여부
profiler.tcpdatasender.command.accept.enable=true
###########################################################
# application type #
###########################################################
#profiler.applicationservertype=TOMCAT
#profiler.applicationservertype=BLOC
###########################################################
# user defined classes #
###########################################################
profiler.include=com.nhn.pinpoint.testweb.controller.*,com.nhn.pinpoint.testweb.MyClass
###########################################################
# TOMCAT #
###########################################################
profiler.tomcat.hidepinpointheader=true
#naver standard l7 check
profiler.tomcat.excludeurl=/monitor/l7check.html
#profiler.tomcat.excludeurl=/aa/test.html, /bb/exclude.html
###########################################################
# JDBC #
###########################################################
profiler.jdbc=true
profiler.jdbc.sqlcachesize=1024
profiler.jdbc.maxsqlbindvaluesize=1024
#
# MYSQL
#
profiler.jdbc.mysql=true
profiler.jdbc.mysql.setautocommit=true
profiler.jdbc.mysql.commit=true
profiler.jdbc.mysql.rollback=true
#
# MSSQL Jtds
#
profiler.jdbc.jtds=true
profiler.jdbc.jtds.setautocommit=true
profiler.jdbc.jtds.commit=true
profiler.jdbc.jtds.rollback=true
#
# Oracle
#
profiler.jdbc.oracle=true
profiler.jdbc.oracle.setautocommit=true
profiler.jdbc.oracle.commit=true
profiler.jdbc.oracle.rollback=true
#
# CUBRID
#
profiler.jdbc.cubrid=true
profiler.jdbc.cubrid.setautocommit=true
profiler.jdbc.cubrid.commit=true
profiler.jdbc.cubrid.rollback=true
#
# DBCP
#
profiler.jdbc.dbcp=true
profiler.jdbc.dbcp.connectionclose=true
###########################################################
# Apache HTTP Client 4.x #
###########################################################
profiler.apache.httpclient4=true
profiler.apache.httpclient4.cookie=true
# cookie를 언제 덤프할지 결정. ALWAYS or EXCEPTION 2가지
profiler.apache.httpclient4.cookie.dumptype=ALWAYS
profiler.apache.httpclient4.cookie.sampling.rate=1
# post, put의 entity를 덤프한다. 단 HttpEtity.isRepeatable()=true 인 Entity에 한정된다.
profiler.apache.httpclient4.entity=true
# entity를 언제 덤프할지 결정. ALWAYS or EXCEPTION 2가지
profiler.apache.httpclient4.entity.dumptype=ALWAYS
profiler.apache.httpclient4.entity.sampling.rate=1
profiler.apache.nio.httpclient4=true
###########################################################
# Ning Async HTTP Client #
###########################################################
profiler.ning.asynchttpclient=true
profiler.ning.asynchttpclient.cookie=true
profiler.ning.asynchttpclient.cookie.dumptype=ALWAYS
profiler.ning.asynchttpclient.cookie.dumpsize=1024
profiler.ning.asynchttpclient.cookie.sampling.rate=1
profiler.ning.asynchttpclient.entity=true
profiler.ning.asynchttpclient.entity.dumptype=ALWAYS
profiler.ning.asynchttpclient.entity.dumpsize=1024
profiler.ning.asynchttpclient.entity.sampling.rate=1
profiler.ning.asynchttpclient.param=true
profiler.ning.asynchttpclient.param.dumptype=ALWAYS
profiler.ning.asynchttpclient.param.dumpsize=1024
profiler.ning.asynchttpclient.param.sampling.rate=1
###########################################################
# LINE+ baseframework #
###########################################################
profiler.line.game.netty.param.dumpsize=512
profiler.line.game.netty.entity.dumpsize=512
###########################################################
# Arcus #
###########################################################
profiler.arcus=true
profiler.arcus.keytrace=true
###########################################################
# Memcached #
###########################################################
profiler.memcached=true
profiler.memcached.keytrace=true
###########################################################
# ibatis #
###########################################################
profiler.orm.ibatis=true
###########################################################
# mybatis #
###########################################################
profiler.orm.mybatis=true
###########################################################
# redis #
###########################################################
profiler.redis=true
profiler.redis.pipeline=true
###########################################################
# nBase-ARC #
###########################################################
profiler.nbase_arc=true
profiler.nbase_arc.pipeline=true
###########################################################
# spring-beans
###########################################################
profiler.spring.beans=false
profiler.spring.beans.name.pattern=
profiler.spring.beans.class.pattern=
profiler.spring.beans.annotation=org.springframework.stereotype.Controller,org.springframework.stereotype.Service,org.springframework.stereotype.Repository
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.nhn.pinpoint</groupId>
<artifactId>pom</artifactId>
<artifactId>pinpoint-naver</artifactId>
<version>1.0.4-SNAPSHOT</version>
</parent>
@@ -44,6 +44,11 @@
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.nhncorp.nelo2</groupId>
<artifactId>nelo2-java-sdk-log4j</artifactId>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.nhn.pinpoint</groupId>
<artifactId>pom</artifactId>
<artifactId>pinpoint-naver</artifactId>
<version>1.0.4-SNAPSHOT</version>
</parent>
@@ -16,8 +16,8 @@
<groupId>com.nhn.pinpoint</groupId>
<artifactId>pinpoint-profiler</artifactId>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>lucy-npc</artifactId>
@@ -46,7 +46,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- Redis -->
<!-- nBase-ARC -->
<dependency>
@@ -54,7 +54,7 @@
<artifactId>triples-redis-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nhncorp.lucy</groupId>
<artifactId>bloc-core</artifactId>
@@ -66,7 +66,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- Logging depedencies -->
<dependency>
@@ -117,16 +117,5 @@
<directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<debug>true</debug>
</configuration>
</plugin>
</plugins>
</build>
</project>

Some files were not shown because too many files have changed in this diff Show More