[강운덕] [LUCYSUS-1744] hippo-common의 패키지 명을 pinpoint-common으로 변경.

- version을 0.0.2에서 0.0.3-SNAPSHOT으로 변경.

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@1730 84d0f5b1-2673-498c-a247-62c4ff18d310

pom.xml

@@ -53,9 +53,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.nhn.hippo</groupId>
-            <artifactId>hippo-commons</artifactId>
-            <version>0.0.2</version>
+            <groupId>com.nhn.pinpoint</groupId>
+            <artifactId>pinpoint-commons</artifactId>
+            <version>0.0.3-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.hadoop</groupId>

src/main/java/com/profiler/DefaultAgent.java

@@ -1,9 +1,9 @@
 package com.profiler;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.common.dto.thrift.AgentInfo;
-import com.profiler.common.hbase.HBaseTables;
-import com.profiler.common.mapping.ApiMappingTable;
+import com.nhn.pinpoint.common.hbase.HBaseTables;
+import com.nhn.pinpoint.common.mapping.ApiMappingTable;
 import com.profiler.config.ProfilerConfig;
 import com.profiler.context.BypassStorageFactory;
 import com.profiler.context.DefaultTraceContext;

src/main/java/com/profiler/context/DefaultAsyncTrace.java

@@ -2,8 +2,8 @@ package com.profiler.context;
 
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicInteger;
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.interceptor.MethodDescriptor;
 import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;

src/main/java/com/profiler/context/DefaultTrace.java

@@ -1,8 +1,8 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.interceptor.MethodDescriptor;
 import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;

src/main/java/com/profiler/context/DefaultTraceContext.java

@@ -4,8 +4,8 @@ package com.profiler.context;
 import com.profiler.DefaultAgent;
 import com.profiler.common.dto.thrift.ApiMetaData;
 import com.profiler.common.dto.thrift.SqlMetaData;
-import com.profiler.common.util.ParsingResult;
-import com.profiler.common.util.SqlParser;
+import com.nhn.pinpoint.common.util.ParsingResult;
+import com.nhn.pinpoint.common.util.SqlParser;
 import com.profiler.exception.PinPointException;
 import com.profiler.interceptor.MethodDescriptor;
 import com.profiler.logging.Logger;

src/main/java/com/profiler/context/DisableTrace.java

@@ -1,8 +1,8 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.interceptor.MethodDescriptor;
 
 import java.util.List;

src/main/java/com/profiler/context/Span.java

@@ -1,7 +1,7 @@
 package com.profiler.context;
 
 import com.profiler.DefaultAgent;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.common.dto.thrift.Annotation;
 
 import java.util.ArrayList;

src/main/java/com/profiler/context/SpanEvent.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.profiler.DefaultAgent;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.common.dto.thrift.AgentKey;
 import com.profiler.common.dto.thrift.Annotation;
 

src/main/java/com/profiler/context/TraceAnnotation.java

@@ -1,6 +1,6 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
+import com.nhn.pinpoint.common.AnnotationKey;
 import com.profiler.common.dto.thrift.Annotation;
 import com.profiler.util.AnnotationTranscoder;
 

src/main/java/com/profiler/interceptor/DefaultMethodDescriptor.java

@@ -1,6 +1,6 @@
 package com.profiler.interceptor;
 
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 
 import java.util.Arrays;
 

src/main/java/com/profiler/interceptor/bci/JavaAssistClass.java

@@ -2,8 +2,8 @@ package com.profiler.interceptor.bci;
 
 import java.io.IOException;
 
-import com.profiler.common.mapping.ApiMappingTable;
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiMappingTable;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 import com.profiler.interceptor.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.util.JavaAssistUtils;

src/main/java/com/profiler/io/HeaderTBaseDeserializer.java

@@ -1,7 +1,7 @@
 package com.profiler.io;
 
 import com.profiler.common.dto.Header;
-import com.profiler.common.util.BytesUtils;
+import com.nhn.pinpoint.common.util.BytesUtils;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TCompactProtocol;

src/main/java/com/profiler/io/HeaderTBaseSerializer.java

@@ -1,7 +1,7 @@
 package com.profiler.io;
 
 import com.profiler.common.dto.Header;
-import com.profiler.common.util.BytesUtils;
+import com.nhn.pinpoint.common.util.BytesUtils;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TCompactProtocol;
@@ -9,7 +9,6 @@ import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.transport.TIOStreamTransport;
 
-import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 
 /**

src/main/java/com/profiler/metadata/StringCache.java

@@ -1,6 +1,6 @@
 package com.profiler.metadata;
 
-import com.profiler.common.util.BytesUtils;
+import com.nhn.pinpoint.common.util.BytesUtils;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

src/main/java/com/profiler/modifier/AbstractModifier.java

@@ -2,7 +2,7 @@ package com.profiler.modifier;
 
 import com.profiler.logging.Logger;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.interceptor.ServiceTypeSupport;
 
 import com.profiler.Agent;

src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java

@@ -8,17 +8,16 @@ import java.nio.charset.Charset;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
+import com.nhn.pinpoint.common.AnnotationKey;
 import com.profiler.context.AsyncTrace;
 import com.profiler.context.TraceContext;
 import com.profiler.logging.LoggerFactory;
-import com.profiler.logging.LoggingUtils;
 import com.profiler.util.TimeObject;
 import net.spy.memcached.MemcachedNode;
 import net.spy.memcached.ops.OperationState;
 import net.spy.memcached.protocol.BaseOperationImpl;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.util.MetaObject;
 
 /**

src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java

@@ -6,8 +6,8 @@ import java.util.UUID;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.sampler.util.SamplingFlagUtils;

src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java

@@ -11,8 +11,8 @@ import com.profiler.sampler.util.SamplingFlagUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.client.methods.HttpUriRequest;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 
 /**
  * Method interceptor

src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/ExecuteMethodInterceptor.java

@@ -3,14 +3,14 @@ package com.profiler.modifier.connector.httpclient4.interceptor;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
+import com.nhn.pinpoint.common.AnnotationKey;
 import com.profiler.context.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.sampler.util.SamplingFlagUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 
 /**
  * Method interceptor

src/main/java/com/profiler/modifier/connector/jdkhttpconnector/interceptor/ConnectMethodInterceptor.java

@@ -5,8 +5,8 @@ import java.net.HttpURLConnection;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.sampler.util.SamplingFlagUtils;

src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java

@@ -1,6 +1,6 @@
 package com.profiler.modifier.db.interceptor;
 
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
 import com.profiler.interceptor.*;

src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java

@@ -1,6 +1,5 @@
 package com.profiler.modifier.db.interceptor;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -8,8 +7,8 @@ import java.util.Map;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
 import com.profiler.interceptor.util.JDBCScope;

src/main/java/com/profiler/modifier/method/interceptors/MethodInterceptor.java

@@ -3,7 +3,7 @@ package com.profiler.modifier.method.interceptors;
 import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
 import com.profiler.interceptor.*;

src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java

@@ -5,8 +5,7 @@ import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;
 
 import com.profiler.Agent;
-import com.profiler.DefaultAgent;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.interceptor.Interceptor;
 import com.profiler.interceptor.bci.ByteCodeInstrumentor;
 import com.profiler.interceptor.bci.InstrumentClass;

src/main/java/com/profiler/modifier/servlet/interceptors/HttpServletInterceptor.java

@@ -9,8 +9,8 @@ import com.profiler.logging.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.sampler.util.SamplingFlagUtils;
 import com.profiler.util.NumberUtils;

src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java

@@ -9,8 +9,8 @@ import com.profiler.logging.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.sampler.util.SamplingFlagUtils;
 import com.profiler.util.NetworkUtils;

src/main/java/com/profiler/util/AnnotationTranscoder.java

@@ -2,7 +2,7 @@ package com.profiler.util;
 
 
 import com.profiler.common.dto.thrift.*;
-import com.profiler.common.util.TranscoderUtils;
+import com.nhn.pinpoint.common.util.TranscoderUtils;
 
 import java.io.UnsupportedEncodingException;
 

src/test/java/com/profiler/context/TraceTest.java

@@ -1,7 +1,7 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.sender.DataSender;
 
 import com.profiler.sender.LoggingDataSender;

src/test/java/com/profiler/dto/HeaderTest.java

@@ -1,6 +1,6 @@
 package com.profiler.dto;
 
-import com.profiler.common.dto2.Header;
+import com.nhn.pinpoint.common.dto2.Header;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/test/java/com/profiler/modifier/mapping/ApiUtilsTest.java

@@ -1,11 +1,9 @@
 package com.profiler.modifier.mapping;
 
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 import junit.framework.Assert;
 import org.junit.Test;
 
-import java.math.MathContext;
-
 /**
  *
  */

src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java

@@ -1,11 +1,11 @@
 package com.profiler.util;
 
-import com.profiler.common.dto2.Header;
-import com.profiler.common.dto2.thrift.JVMInfoThriftDTO;
-import com.profiler.common.io.DefaultTBaseLocator;
-import com.profiler.common.io.HeaderTBaseDeserializer;
-import com.profiler.common.io.HeaderTBaseSerializer;
-import com.profiler.common.io.TBaseLocator;
+import com.nhn.pinpoint.common.dto2.Header;
+import com.nhn.pinpoint.common.dto2.thrift.JVMInfoThriftDTO;
+import com.nhn.pinpoint.common.io.DefaultTBaseLocator;
+import com.nhn.pinpoint.common.io.HeaderTBaseDeserializer;
+import com.nhn.pinpoint.common.io.HeaderTBaseSerializer;
+import com.nhn.pinpoint.common.io.TBaseLocator;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;

src/test/java/com/profiler/util/JavaAssistUtilsTest.java

@@ -1,6 +1,6 @@
 package com.profiler.util;
 
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 import javassist.*;
 import org.junit.Assert;
 import org.junit.Before;