From f0f555c8176cab10b95b1810e019df8d07649d33 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Fri, 31 May 2013 06:51:13 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20hippo-common=EC=9D=98=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EB=AA=85=EC=9D=84=20pinpoint-common=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20=20-=20version=EC=9D=84=200.0.2=EC=97=90?= =?UTF-8?q?=EC=84=9C=200.0.3-SNAPSHOT=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@1730 84d0f5b1-2673-498c-a247-62c4ff18d310 --- pom.xml | 6 ++--- .../web/applicationmap/Application.java | 4 ++-- .../web/applicationmap/ApplicationMap.java | 2 +- .../applicationmap/ApplicationStatistics.java | 4 ++-- .../web/applicationmap/ResponseHistogram.java | 6 ++--- .../calltree/server/AgentIdNodeSelector.java | 4 ++-- .../server/ApplicationIdNodeSelector.java | 4 ++-- .../web/calltree/server/NodeSelector.java | 4 ++-- .../pinpoint/web/calltree/server/Server.java | 7 +++--- .../web/calltree/server/ServerCallTree.java | 6 ++--- .../pinpoint/web/calltree/span/SpanAlign.java | 4 ++-- .../web/calltree/span/SpanAligner.java | 2 +- .../web/calltree/span/SpanAligner2.java | 4 ++-- .../web/calltree/span/SpanPopulator.java | 4 ++-- .../controller/ApplicationMapController.java | 2 +- .../web/controller/MainController.java | 2 +- .../controller/ScatterChartController.java | 2 +- .../nhn/pinpoint/web/dao/AgentInfoDao.java | 2 +- .../nhn/pinpoint/web/dao/ApiMetaDataDao.java | 2 +- .../nhn/pinpoint/web/dao/SqlMetaDataDao.java | 2 +- .../com/nhn/pinpoint/web/dao/TraceDao.java | 2 +- .../web/dao/hbase/HbaseAgentInfoDao.java | 10 +++++---- .../web/dao/hbase/HbaseApiMetaDataDao.java | 6 ++--- .../dao/hbase/HbaseApplicationIndexDao.java | 4 ++-- ...baseApplicationMapStatisticsCalleeDao.java | 8 +++---- ...baseApplicationMapStatisticsCallerDao.java | 8 +++---- .../hbase/HbaseApplicationTraceIndexDao.java | 12 +++++----- .../dao/hbase/HbaseHostApplicationMapDao.java | 8 +++---- .../web/dao/hbase/HbaseSqlMetaDataDao.java | 6 ++--- .../pinpoint/web/dao/hbase/HbaseTraceDao.java | 6 ++--- .../web/dao/hbase/HbaseTraceIndexDao.java | 6 ++--- .../com/nhn/pinpoint/web/filter/Filter.java | 2 +- .../nhn/pinpoint/web/filter/FilterChain.java | 2 +- .../nhn/pinpoint/web/filter/FromToFilter.java | 6 ++--- .../pinpoint/web/mapper/AnnotationMapper.java | 11 +++++----- .../web/mapper/ApiMetaDataMapper.java | 6 ++--- .../ApplicationMapLinkStatisticsMapper.java | 4 ++-- .../ApplicationMapStatisticsCalleeMapper.java | 2 +- .../ApplicationMapStatisticsCallerMapper.java | 2 +- .../web/mapper/HostApplicationMapper.java | 2 +- .../nhn/pinpoint/web/mapper/SpanMapper.java | 10 ++++----- .../web/mapper/SqlMetaDataMapper.java | 2 +- .../pinpoint/web/mapper/TraceIndexMapper.java | 2 +- .../web/mapper/TraceIndexScatterMapper.java | 7 +++--- .../service/ApplicationMapServiceImpl.java | 4 ++-- .../web/service/FlowChartServiceImpl.java | 10 ++++----- .../pinpoint/web/service/MonitorService.java | 2 +- .../web/service/MonitorServiceImpl.java | 2 +- .../web/service/RecordSetServiceImpl.java | 14 ++++++------ .../web/service/ScatterChartService.java | 2 +- .../web/service/ScatterChartServiceImpl.java | 2 +- .../pinpoint/web/service/SpanServiceImpl.java | 22 +++++++++---------- .../com/nhn/pinpoint/web/vo/Application.java | 2 +- .../pinpoint/web/vo/BusinessTransaction.java | 4 ++-- .../pinpoint/web/vo/BusinessTransactions.java | 2 +- .../nhn/pinpoint/web/vo/ClientStatistics.java | 2 +- .../nhn/pinpoint/web/vo/LinkStatistics.java | 2 +- .../pinpoint/web/vo/ResponseHistogram.java | 6 ++--- .../pinpoint/web/vo/TerminalStatistics.java | 2 +- .../java/com/nhn/pinpoint/web/vo/TraceId.java | 4 ++-- .../pinpoint/web/vo/callstacks/Record.java | 2 +- .../resources/hbase-applicationContext.xml | 2 +- src/main/webapp/WEB-INF/pinpoint-function.tld | 8 +++---- .../web/dao/hbase/HbaseAgentInfoDaoTest.java | 5 ++--- .../com/nhn/pinpoint/web/path/PathTest.java | 2 +- .../pinpoint/web/service/SpanServiceTest.java | 15 ++++++------- .../resources/test-web-applicationContext.xml | 2 +- 67 files changed, 161 insertions(+), 164 deletions(-) diff --git a/pom.xml b/pom.xml index 3a46776b0..0fc3ac178 100644 --- a/pom.xml +++ b/pom.xml @@ -45,9 +45,9 @@ - com.nhn.hippo - hippo-commons - 0.0.2 + com.nhn.pinpoint + pinpoint-commons + 0.0.3-SNAPSHOT compile diff --git a/src/main/java/com/nhn/pinpoint/web/applicationmap/Application.java b/src/main/java/com/nhn/pinpoint/web/applicationmap/Application.java index 99090ec87..801e2d718 100644 --- a/src/main/java/com/nhn/pinpoint/web/applicationmap/Application.java +++ b/src/main/java/com/nhn/pinpoint/web/applicationmap/Application.java @@ -4,8 +4,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * application map에서 application을 나타낸다. diff --git a/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationMap.java b/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationMap.java index 94bb113a6..71146e649 100644 --- a/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationMap.java +++ b/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationMap.java @@ -10,7 +10,7 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.ServiceType; /** * Application map diff --git a/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationStatistics.java b/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationStatistics.java index 730a828bd..8d030d2e5 100644 --- a/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationStatistics.java +++ b/src/main/java/com/nhn/pinpoint/web/applicationmap/ApplicationStatistics.java @@ -3,8 +3,8 @@ package com.nhn.pinpoint.web.applicationmap; import java.util.HashSet; import java.util.Set; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * DB에서 조회한 application호출 관계 정보. diff --git a/src/main/java/com/nhn/pinpoint/web/applicationmap/ResponseHistogram.java b/src/main/java/com/nhn/pinpoint/web/applicationmap/ResponseHistogram.java index eca9da6b4..e7eddaa09 100644 --- a/src/main/java/com/nhn/pinpoint/web/applicationmap/ResponseHistogram.java +++ b/src/main/java/com/nhn/pinpoint/web/applicationmap/ResponseHistogram.java @@ -2,9 +2,9 @@ package com.nhn.pinpoint.web.applicationmap; import java.util.List; -import com.profiler.common.Histogram; -import com.profiler.common.HistogramSlot; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.Histogram; +import com.nhn.pinpoint.common.HistogramSlot; +import com.nhn.pinpoint.common.ServiceType; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/server/AgentIdNodeSelector.java b/src/main/java/com/nhn/pinpoint/web/calltree/server/AgentIdNodeSelector.java index eed58a99e..63fdba1ea 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/server/AgentIdNodeSelector.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/server/AgentIdNodeSelector.java @@ -1,7 +1,7 @@ package com.nhn.pinpoint.web.calltree.server; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/server/ApplicationIdNodeSelector.java b/src/main/java/com/nhn/pinpoint/web/calltree/server/ApplicationIdNodeSelector.java index e404725e2..1680fed6a 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/server/ApplicationIdNodeSelector.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/server/ApplicationIdNodeSelector.java @@ -1,7 +1,7 @@ package com.nhn.pinpoint.web.calltree.server; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/server/NodeSelector.java b/src/main/java/com/nhn/pinpoint/web/calltree/server/NodeSelector.java index 2c7dcf6e6..52cf4af81 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/server/NodeSelector.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/server/NodeSelector.java @@ -1,7 +1,7 @@ package com.nhn.pinpoint.web.calltree.server; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/server/Server.java b/src/main/java/com/nhn/pinpoint/web/calltree/server/Server.java index bf77f2280..4ac02c520 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/server/Server.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/server/Server.java @@ -4,10 +4,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.AgentInfoBo; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * @author netspider diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/server/ServerCallTree.java b/src/main/java/com/nhn/pinpoint/web/calltree/server/ServerCallTree.java index ec7b2d5c2..224f298c7 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/server/ServerCallTree.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/server/ServerCallTree.java @@ -14,9 +14,9 @@ import org.slf4j.LoggerFactory; import com.nhn.pinpoint.web.vo.ClientStatistics; import com.nhn.pinpoint.web.vo.ResponseHistogram; import com.nhn.pinpoint.web.vo.TerminalStatistics; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * Call Tree diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAlign.java b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAlign.java index 469e9991d..5f3388057 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAlign.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAlign.java @@ -1,7 +1,7 @@ package com.nhn.pinpoint.web.calltree.span; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner.java b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner.java index 2f3aefbd6..0cc724c3e 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner.java @@ -11,7 +11,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner2.java b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner2.java index bb94cd8d8..b002246c9 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner2.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanAligner2.java @@ -2,8 +2,8 @@ package com.nhn.pinpoint.web.calltree.span; import java.util.*; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanPopulator.java b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanPopulator.java index 3191d8dbf..2f9844e0b 100644 --- a/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanPopulator.java +++ b/src/main/java/com/nhn/pinpoint/web/calltree/span/SpanPopulator.java @@ -1,7 +1,7 @@ package com.nhn.pinpoint.web.calltree.span; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/nhn/pinpoint/web/controller/ApplicationMapController.java b/src/main/java/com/nhn/pinpoint/web/controller/ApplicationMapController.java index b1b293977..50784fadf 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/ApplicationMapController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/ApplicationMapController.java @@ -21,7 +21,7 @@ import com.nhn.pinpoint.web.service.FlowChartService; import com.nhn.pinpoint.web.util.TimeUtils; import com.nhn.pinpoint.web.vo.LinkStatistics; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.ServiceType; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/controller/MainController.java b/src/main/java/com/nhn/pinpoint/web/controller/MainController.java index e40decf30..24c5d3fbf 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/MainController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/MainController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam; import com.nhn.pinpoint.web.service.FlowChartService; import com.nhn.pinpoint.web.service.MonitorService; import com.nhn.pinpoint.web.vo.Application; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java index 1f11e681a..390c40273 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java @@ -22,7 +22,7 @@ import com.nhn.pinpoint.web.vo.TraceId; import com.nhn.pinpoint.web.vo.TraceIdWithTime; import com.nhn.pinpoint.web.vo.TransactionMetadataQuery; import com.nhn.pinpoint.web.vo.scatter.Dot; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/AgentInfoDao.java b/src/main/java/com/nhn/pinpoint/web/dao/AgentInfoDao.java index 24d17e31b..31d3637da 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/AgentInfoDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/AgentInfoDao.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.web.dao; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/ApiMetaDataDao.java b/src/main/java/com/nhn/pinpoint/web/dao/ApiMetaDataDao.java index 39bac8f62..c56819783 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/ApiMetaDataDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/ApiMetaDataDao.java @@ -2,7 +2,7 @@ package com.nhn.pinpoint.web.dao; import java.util.List; -import com.profiler.common.bo.ApiMetaDataBo; +import com.nhn.pinpoint.common.bo.ApiMetaDataBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/SqlMetaDataDao.java b/src/main/java/com/nhn/pinpoint/web/dao/SqlMetaDataDao.java index c02317c96..53fb7477f 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/SqlMetaDataDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/SqlMetaDataDao.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.web.dao; -import com.profiler.common.bo.SqlMetaDataBo; +import com.nhn.pinpoint.common.bo.SqlMetaDataBo; import java.util.List; diff --git a/src/main/java/com/nhn/pinpoint/web/dao/TraceDao.java b/src/main/java/com/nhn/pinpoint/web/dao/TraceDao.java index d28e75ef4..8885e9586 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/TraceDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/TraceDao.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java index 831840682..21022e778 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java @@ -1,7 +1,9 @@ package com.nhn.pinpoint.web.dao.hbase; -import com.profiler.common.bo.AgentInfoBo; -import com.profiler.common.util.*; +import com.nhn.pinpoint.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.util.BytesUtils; +import com.nhn.pinpoint.common.util.RowKeyUtils; +import com.nhn.pinpoint.common.util.TimeUtils; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; @@ -13,8 +15,8 @@ import org.springframework.data.hadoop.hbase.ResultsExtractor; import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.AgentInfoDao; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApiMetaDataDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApiMetaDataDao.java index fa5cdc5ea..f1f4bc93e 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApiMetaDataDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApiMetaDataDao.java @@ -9,9 +9,9 @@ import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.ApiMetaDataDao; -import com.profiler.common.bo.ApiMetaDataBo; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.bo.ApiMetaDataBo; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java index 172e70412..911b832e7 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java @@ -12,8 +12,8 @@ import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.ApplicationIndexDao; import com.nhn.pinpoint.web.vo.Application; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; /** * @author netspider diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCalleeDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCalleeDao.java index 464557c3f..c7d710077 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCalleeDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCalleeDao.java @@ -18,10 +18,10 @@ import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.applicationmap.ApplicationStatistics; import com.nhn.pinpoint.web.dao.ApplicationMapStatisticsCalleeDao; import com.nhn.pinpoint.web.mapper.ApplicationMapLinkStatisticsMapper; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; -import com.profiler.common.util.ApplicationMapStatisticsUtils; -import com.profiler.common.util.TimeSlot; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.util.ApplicationMapStatisticsUtils; +import com.nhn.pinpoint.common.util.TimeSlot; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java index 8f32093db..8ee7d7b98 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java @@ -18,10 +18,10 @@ import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.applicationmap.ApplicationStatistics; import com.nhn.pinpoint.web.dao.ApplicationMapStatisticsCallerDao; import com.nhn.pinpoint.web.mapper.ApplicationMapLinkStatisticsMapper; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; -import com.profiler.common.util.ApplicationMapStatisticsUtils; -import com.profiler.common.util.TimeSlot; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.util.ApplicationMapStatisticsUtils; +import com.nhn.pinpoint.common.util.TimeSlot; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDao.java index c98421fe5..e54ba9956 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDao.java @@ -20,12 +20,12 @@ import com.nhn.pinpoint.web.dao.ApplicationTraceIndexDao; import com.nhn.pinpoint.web.vo.TraceId; import com.nhn.pinpoint.web.vo.TraceIdWithTime; import com.nhn.pinpoint.web.vo.scatter.Dot; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; -import com.profiler.common.util.BytesUtils; -import com.profiler.common.util.SpanUtils; -import com.profiler.common.util.TimeUtils; -import com.profiler.common.util.TraceIdUtils; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.util.BytesUtils; +import com.nhn.pinpoint.common.util.SpanUtils; +import com.nhn.pinpoint.common.util.TimeUtils; +import com.nhn.pinpoint.common.util.TraceIdUtils; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseHostApplicationMapDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseHostApplicationMapDao.java index dd70f7340..59f2c7e2b 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseHostApplicationMapDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseHostApplicationMapDao.java @@ -15,10 +15,10 @@ import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.HostApplicationMapDao; import com.nhn.pinpoint.web.vo.Application; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; -import com.profiler.common.util.TimeSlot; -import com.profiler.common.util.TimeUtils; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.util.TimeSlot; +import com.nhn.pinpoint.common.util.TimeUtils; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseSqlMetaDataDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseSqlMetaDataDao.java index 7dafdab1e..4e5177bbe 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseSqlMetaDataDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseSqlMetaDataDao.java @@ -9,9 +9,9 @@ import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.SqlMetaDataDao; -import com.profiler.common.bo.SqlMetaDataBo; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.bo.SqlMetaDataBo; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceDao.java index efe53b7b4..2296bc074 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceDao.java @@ -13,9 +13,9 @@ import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.TraceDao; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java index 013f89965..dca5f4c29 100644 --- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java +++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java @@ -14,9 +14,9 @@ import org.springframework.stereotype.Repository; import com.nhn.pinpoint.web.dao.TraceIndexDao; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseOperations2; -import com.profiler.common.util.SpanUtils; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseOperations2; +import com.nhn.pinpoint.common.util.SpanUtils; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/filter/Filter.java b/src/main/java/com/nhn/pinpoint/web/filter/Filter.java index 900535850..498d1ae8f 100644 --- a/src/main/java/com/nhn/pinpoint/web/filter/Filter.java +++ b/src/main/java/com/nhn/pinpoint/web/filter/Filter.java @@ -2,7 +2,7 @@ package com.nhn.pinpoint.web.filter; import java.util.List; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/filter/FilterChain.java b/src/main/java/com/nhn/pinpoint/web/filter/FilterChain.java index c2f15a97b..8bb44f3a1 100644 --- a/src/main/java/com/nhn/pinpoint/web/filter/FilterChain.java +++ b/src/main/java/com/nhn/pinpoint/web/filter/FilterChain.java @@ -3,7 +3,7 @@ package com.nhn.pinpoint.web.filter; import java.util.ArrayList; import java.util.List; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/filter/FromToFilter.java b/src/main/java/com/nhn/pinpoint/web/filter/FromToFilter.java index ec42e6465..1821f1d7c 100644 --- a/src/main/java/com/nhn/pinpoint/web/filter/FromToFilter.java +++ b/src/main/java/com/nhn/pinpoint/web/filter/FromToFilter.java @@ -5,9 +5,9 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/AnnotationMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/AnnotationMapper.java index 588fcfc58..b4cb9b1f0 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/AnnotationMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/AnnotationMapper.java @@ -1,11 +1,10 @@ package com.nhn.pinpoint.web.mapper; -import com.profiler.common.bo.AnnotationBo; -import com.profiler.common.bo.AnnotationBoList; -import com.profiler.common.buffer.Buffer; -import com.profiler.common.buffer.FixedBuffer; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.util.BytesUtils; +import com.nhn.pinpoint.common.bo.AnnotationBo; +import com.nhn.pinpoint.common.bo.AnnotationBoList; +import com.nhn.pinpoint.common.buffer.Buffer; +import com.nhn.pinpoint.common.buffer.FixedBuffer; +import com.nhn.pinpoint.common.hbase.HBaseTables; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Result; import org.slf4j.Logger; diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/ApiMetaDataMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/ApiMetaDataMapper.java index 946027708..5553b5af1 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/ApiMetaDataMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/ApiMetaDataMapper.java @@ -3,7 +3,7 @@ package com.nhn.pinpoint.web.mapper; import java.util.ArrayList; import java.util.List; -import com.profiler.common.buffer.FixedBuffer; +import com.nhn.pinpoint.common.buffer.FixedBuffer; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Result; import org.slf4j.Logger; @@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory; import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; -import com.profiler.common.bo.ApiMetaDataBo; -import com.profiler.common.buffer.Buffer; +import com.nhn.pinpoint.common.bo.ApiMetaDataBo; +import com.nhn.pinpoint.common.buffer.Buffer; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapLinkStatisticsMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapLinkStatisticsMapper.java index a006f5b70..2ca6a242f 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapLinkStatisticsMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapLinkStatisticsMapper.java @@ -11,8 +11,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.hadoop.hbase.RowMapper; -import com.profiler.common.ServiceType; -import com.profiler.common.util.ApplicationMapStatisticsUtils; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.util.ApplicationMapStatisticsUtils; /** * rowkey = caller col = callee diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCalleeMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCalleeMapper.java index 041fa6dbc..9a3454590 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCalleeMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCalleeMapper.java @@ -15,7 +15,7 @@ import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; import com.nhn.pinpoint.web.applicationmap.ApplicationStatistics; -import com.profiler.common.util.ApplicationMapStatisticsUtils; +import com.nhn.pinpoint.common.util.ApplicationMapStatisticsUtils; /** * rowkey = caller col = callee diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCallerMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCallerMapper.java index d10c6752e..0d9eaee5d 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCallerMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/ApplicationMapStatisticsCallerMapper.java @@ -15,7 +15,7 @@ import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; import com.nhn.pinpoint.web.applicationmap.ApplicationStatistics; -import com.profiler.common.util.ApplicationMapStatisticsUtils; +import com.nhn.pinpoint.common.util.ApplicationMapStatisticsUtils; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/HostApplicationMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/HostApplicationMapper.java index f66f6fad5..58022ece0 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/HostApplicationMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/HostApplicationMapper.java @@ -10,7 +10,7 @@ import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; import com.nhn.pinpoint.web.vo.Application; -import com.profiler.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HBaseTables; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/SpanMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/SpanMapper.java index e3e292942..d8d8b3bb3 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/SpanMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/SpanMapper.java @@ -1,10 +1,10 @@ package com.nhn.pinpoint.web.mapper; -import com.profiler.common.bo.AnnotationBo; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.util.BytesUtils; +import com.nhn.pinpoint.common.bo.AnnotationBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.util.BytesUtils; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/SqlMetaDataMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/SqlMetaDataMapper.java index 96307aea6..e4a2ae94e 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/SqlMetaDataMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/SqlMetaDataMapper.java @@ -9,7 +9,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; -import com.profiler.common.bo.SqlMetaDataBo; +import com.nhn.pinpoint.common.bo.SqlMetaDataBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexMapper.java index 08413f97e..66ba1982e 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexMapper.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.util.BytesUtils; +import com.nhn.pinpoint.common.util.BytesUtils; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Result; import org.springframework.data.hadoop.hbase.RowMapper; diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexScatterMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexScatterMapper.java index 4a0ae4379..23cccaf68 100644 --- a/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexScatterMapper.java +++ b/src/main/java/com/nhn/pinpoint/web/mapper/TraceIndexScatterMapper.java @@ -3,17 +3,16 @@ package com.nhn.pinpoint.web.mapper; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.UUID; -import com.profiler.common.util.TimeUtils; -import com.profiler.common.util.TraceIdUtils; +import com.nhn.pinpoint.common.util.TimeUtils; +import com.nhn.pinpoint.common.util.TraceIdUtils; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Result; import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; import com.nhn.pinpoint.web.vo.scatter.Dot; -import com.profiler.common.util.BytesUtils; +import com.nhn.pinpoint.common.util.BytesUtils; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java index bf9761e64..b1c9a9404 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java @@ -19,8 +19,8 @@ import com.nhn.pinpoint.web.dao.ApplicationMapStatisticsCalleeDao; import com.nhn.pinpoint.web.dao.ApplicationMapStatisticsCallerDao; import com.nhn.pinpoint.web.dao.HostApplicationMapDao; import com.nhn.pinpoint.web.vo.Application; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/service/FlowChartServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/FlowChartServiceImpl.java index a95731c34..3869869f2 100755 --- a/src/main/java/com/nhn/pinpoint/web/service/FlowChartServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/FlowChartServiceImpl.java @@ -28,11 +28,11 @@ import com.nhn.pinpoint.web.vo.BusinessTransactions; import com.nhn.pinpoint.web.vo.ClientStatistics; import com.nhn.pinpoint.web.vo.LinkStatistics; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.AnnotationKey; -import com.profiler.common.ServiceType; -import com.profiler.common.bo.AnnotationBo; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.AnnotationKey; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.AnnotationBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; /** * @author netspider diff --git a/src/main/java/com/nhn/pinpoint/web/service/MonitorService.java b/src/main/java/com/nhn/pinpoint/web/service/MonitorService.java index 7b5ea26f8..9181800cd 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/MonitorService.java +++ b/src/main/java/com/nhn/pinpoint/web/service/MonitorService.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.web.service; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * @author netspider diff --git a/src/main/java/com/nhn/pinpoint/web/service/MonitorServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/MonitorServiceImpl.java index b3250f2cf..2a3ae18b4 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/MonitorServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/MonitorServiceImpl.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.nhn.pinpoint.web.dao.AgentInfoDao; -import com.profiler.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.bo.AgentInfoBo; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/service/RecordSetServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/RecordSetServiceImpl.java index e0f43f72f..39c373c9a 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/RecordSetServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/RecordSetServiceImpl.java @@ -10,13 +10,13 @@ import org.springframework.stereotype.Service; import com.nhn.pinpoint.web.calltree.span.SpanAlign; import com.nhn.pinpoint.web.vo.callstacks.Record; import com.nhn.pinpoint.web.vo.callstacks.RecordSet; -import com.profiler.common.AnnotationKey; -import com.profiler.common.bo.AnnotationBo; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SpanEventBo; -import com.profiler.common.util.AnnotationUtils; -import com.profiler.common.util.ApiDescription; -import com.profiler.common.util.ApiDescriptionParser; +import com.nhn.pinpoint.common.AnnotationKey; +import com.nhn.pinpoint.common.bo.AnnotationBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanEventBo; +import com.nhn.pinpoint.common.util.AnnotationUtils; +import com.nhn.pinpoint.common.util.ApiDescription; +import com.nhn.pinpoint.common.util.ApiDescriptionParser; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartService.java b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartService.java index 37ae6242c..37f545c15 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartService.java +++ b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartService.java @@ -6,7 +6,7 @@ import com.nhn.pinpoint.web.filter.Filter; import com.nhn.pinpoint.web.vo.TraceId; import com.nhn.pinpoint.web.vo.TransactionMetadataQuery; import com.nhn.pinpoint.web.vo.scatter.Dot; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; public interface ScatterChartService { diff --git a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java index 91cad0d26..e0888d832 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java @@ -14,7 +14,7 @@ import com.nhn.pinpoint.web.filter.Filter; import com.nhn.pinpoint.web.vo.TraceId; import com.nhn.pinpoint.web.vo.TransactionMetadataQuery; import com.nhn.pinpoint.web.vo.scatter.Dot; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; /** * @author netspider diff --git a/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java index 6463fc5cc..48a8a0df2 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java @@ -15,17 +15,17 @@ import com.nhn.pinpoint.web.dao.ApiMetaDataDao; import com.nhn.pinpoint.web.dao.SqlMetaDataDao; import com.nhn.pinpoint.web.dao.TraceDao; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.AnnotationKey; -import com.profiler.common.bo.AgentInfoBo; -import com.profiler.common.bo.AnnotationBo; -import com.profiler.common.bo.ApiMetaDataBo; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.bo.SqlMetaDataBo; -import com.profiler.common.mapping.ApiMappingTable; -import com.profiler.common.mapping.ApiUtils; -import com.profiler.common.mapping.MethodMapping; -import com.profiler.common.util.OutputParameterParser; -import com.profiler.common.util.SqlParser; +import com.nhn.pinpoint.common.AnnotationKey; +import com.nhn.pinpoint.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.bo.AnnotationBo; +import com.nhn.pinpoint.common.bo.ApiMetaDataBo; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SqlMetaDataBo; +import com.nhn.pinpoint.common.mapping.ApiMappingTable; +import com.nhn.pinpoint.common.mapping.ApiUtils; +import com.nhn.pinpoint.common.mapping.MethodMapping; +import com.nhn.pinpoint.common.util.OutputParameterParser; +import com.nhn.pinpoint.common.util.SqlParser; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/vo/Application.java b/src/main/java/com/nhn/pinpoint/web/vo/Application.java index 151fc51e4..ed0616df1 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/Application.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/Application.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.web.vo; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.ServiceType; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransaction.java b/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransaction.java index cb96c4ac7..3d8075efa 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransaction.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransaction.java @@ -3,8 +3,8 @@ package com.nhn.pinpoint.web.vo; import java.util.ArrayList; import java.util.List; -import com.profiler.common.bo.SpanBo; -import com.profiler.common.util.TraceIdUtils; +import com.nhn.pinpoint.common.bo.SpanBo; +import com.nhn.pinpoint.common.util.TraceIdUtils; public class BusinessTransaction { private final List traces = new ArrayList(); diff --git a/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java b/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java index 7f3cd65e3..e15a5eec2 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import com.profiler.common.bo.SpanBo; +import com.nhn.pinpoint.common.bo.SpanBo; public class BusinessTransactions { diff --git a/src/main/java/com/nhn/pinpoint/web/vo/ClientStatistics.java b/src/main/java/com/nhn/pinpoint/web/vo/ClientStatistics.java index 7c2c25cde..ba3f947ce 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/ClientStatistics.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/ClientStatistics.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.web.vo; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.ServiceType; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/vo/LinkStatistics.java b/src/main/java/com/nhn/pinpoint/web/vo/LinkStatistics.java index 8ab5565f9..724a3722b 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/LinkStatistics.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/LinkStatistics.java @@ -9,7 +9,7 @@ import java.util.TreeMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.profiler.common.HistogramSlot; +import com.nhn.pinpoint.common.HistogramSlot; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/vo/ResponseHistogram.java b/src/main/java/com/nhn/pinpoint/web/vo/ResponseHistogram.java index 2178d244d..7782c9213 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/ResponseHistogram.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/ResponseHistogram.java @@ -2,9 +2,9 @@ package com.nhn.pinpoint.web.vo; import java.util.List; -import com.profiler.common.Histogram; -import com.profiler.common.HistogramSlot; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.Histogram; +import com.nhn.pinpoint.common.HistogramSlot; +import com.nhn.pinpoint.common.ServiceType; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/vo/TerminalStatistics.java b/src/main/java/com/nhn/pinpoint/web/vo/TerminalStatistics.java index 2db63f10a..2b55bf966 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/TerminalStatistics.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/TerminalStatistics.java @@ -3,7 +3,7 @@ package com.nhn.pinpoint.web.vo; import java.util.HashSet; import java.util.Set; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.ServiceType; /** * diff --git a/src/main/java/com/nhn/pinpoint/web/vo/TraceId.java b/src/main/java/com/nhn/pinpoint/web/vo/TraceId.java index dc72decca..653129adf 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/TraceId.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/TraceId.java @@ -1,7 +1,7 @@ package com.nhn.pinpoint.web.vo; -import com.profiler.common.util.BytesUtils; -import com.profiler.common.util.TraceIdUtils; +import com.nhn.pinpoint.common.util.BytesUtils; +import com.nhn.pinpoint.common.util.TraceIdUtils; public class TraceId { diff --git a/src/main/java/com/nhn/pinpoint/web/vo/callstacks/Record.java b/src/main/java/com/nhn/pinpoint/web/vo/callstacks/Record.java index 42ae4d2dc..c5ead448f 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/callstacks/Record.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/callstacks/Record.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.web.vo.callstacks; -import com.profiler.common.ServiceType; +import com.nhn.pinpoint.common.ServiceType; /** * each stack diff --git a/src/main/resources/hbase-applicationContext.xml b/src/main/resources/hbase-applicationContext.xml index 7ca311b45..fbcea0c30 100644 --- a/src/main/resources/hbase-applicationContext.xml +++ b/src/main/resources/hbase-applicationContext.xml @@ -24,7 +24,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/pinpoint-function.tld b/src/main/webapp/WEB-INF/pinpoint-function.tld index 7ca23f16d..92c5f1d00 100644 --- a/src/main/webapp/WEB-INF/pinpoint-function.tld +++ b/src/main/webapp/WEB-INF/pinpoint-function.tld @@ -12,28 +12,28 @@ longToDateStr - com.profiler.common.util.AnnotationUtils + com.nhn.pinpoint.common.util.AnnotationUtils java.lang.String longToDateStr(long, java.lang.String) longLongToUUID - com.profiler.common.util.AnnotationUtils + com.nhn.pinpoint.common.util.AnnotationUtils java.lang.String longLongToUUID(long, long) sortAnnotationListByKey - com.profiler.common.util.AnnotationUtils + com.nhn.pinpoint.common.util.AnnotationUtils void sortAnnotationListByKey(com.profiler.common.bo.Span) getDisplayMethod - com.profiler.common.util.AnnotationUtils + com.nhn.pinpoint.common.util.AnnotationUtils java.lang.Object getDisplayMethod(com.profiler.common.bo.Span) diff --git a/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java b/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java index b83023572..40ec6cd6b 100644 --- a/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java +++ b/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java @@ -8,9 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.nhn.pinpoint.web.dao.hbase.HbaseAgentInfoDao; -import com.profiler.common.bo.AgentInfoBo; -import com.profiler.common.dto2.thrift.AgentInfo; +import com.nhn.pinpoint.common.bo.AgentInfoBo; +import com.nhn.pinpoint.common.dto2.thrift.AgentInfo; /** * diff --git a/src/test/java/com/nhn/pinpoint/web/path/PathTest.java b/src/test/java/com/nhn/pinpoint/web/path/PathTest.java index 0ae4953df..068fe1ae6 100644 --- a/src/test/java/com/nhn/pinpoint/web/path/PathTest.java +++ b/src/test/java/com/nhn/pinpoint/web/path/PathTest.java @@ -4,7 +4,7 @@ import java.text.SimpleDateFormat; import org.junit.Test; -import com.profiler.common.dto2.thrift.Span; +import com.nhn.pinpoint.common.dto2.thrift.Span; /** * diff --git a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java index 42628f83a..b6801328e 100644 --- a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java +++ b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java @@ -20,15 +20,14 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.nhn.pinpoint.web.calltree.span.SpanAlign; -import com.nhn.pinpoint.web.service.SpanService; import com.nhn.pinpoint.web.vo.TraceId; -import com.profiler.common.AnnotationKey; -import com.profiler.common.ServiceType; -import com.profiler.common.dto2.thrift.Annotation; -import com.profiler.common.dto2.thrift.Span; -import com.profiler.common.hbase.HBaseTables; -import com.profiler.common.hbase.HbaseTemplate2; -import com.profiler.common.util.SpanUtils; +import com.nhn.pinpoint.common.AnnotationKey; +import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.dto2.thrift.Annotation; +import com.nhn.pinpoint.common.dto2.thrift.Span; +import com.nhn.pinpoint.common.hbase.HBaseTables; +import com.nhn.pinpoint.common.hbase.HbaseTemplate2; +import com.nhn.pinpoint.common.util.SpanUtils; import com.profiler.server.dao.TracesDao; /** diff --git a/src/test/resources/test-web-applicationContext.xml b/src/test/resources/test-web-applicationContext.xml index 28181b5f5..4e9348dc7 100644 --- a/src/test/resources/test-web-applicationContext.xml +++ b/src/test/resources/test-web-applicationContext.xml @@ -26,7 +26,7 @@ - +