Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint

Conflicts:
	bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/config/ProfilerConfig.java
	bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/interceptor/InterceptorRegistry.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/DefaultModifierRegistry.java
	testweb/src/main/resources/applicationContext-testweb.xml

.gitignore

@@ -2,3 +2,4 @@
 /.settings/
 /.idea
 /*.iml
+/deploy

bootstrap/build.xml

@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="pinpoint-bootstrap-build" basedir="." default="deploy">
-    <property environment="env"/>
-
-    <property name="pinpoint.version" value="1.0.2"/>
-
-    <property name="pinpoint.bootstrap.jar" value="pinpoint-bootstrap-${pinpoint.version}.jar"/>
-
-
-    <property name="maven.dir" value="${env.M2_HOME}"/>
-    <property name="agent.dir" value="${basedir}/../deploy/pinpoint-agent/"/>
-    <property name="target.dir" value="${basedir}/target/"/>
-
-
-    <target name="deploy" depends="mvn.build.install, copy.agent">
-    </target>
-
-    <target name="copy.agent">
-        <copy file="${target.dir}/${pinpoint.bootstrap.jar}" tofile="${agent.dir}/${pinpoint.bootstrap.jar}" overwrite="true">
-        </copy>
-    </target>
-
-    <target name="mvn.build.install">
-        <exec executable="${maven.dir}/bin/mvn.bat ">
-            <arg value="-Dmaven.test.skip=true"/>
-            <arg value="clean"/>
-            <arg value="install"/>
-            <!--<arg value="compile"/>-->
-            <!--<arg value="jar:jar"/>-->
-        </exec>
-    </target>
-
-    <target name="mvn.build.package">
-        <exec executable="${maven.dir}/bin/mvn.bat ">
-            <arg value="-Dmaven.test.skip=true"/>
-            <arg value="package"/>
-            <!--<arg value="compile"/>-->
-            <!--<arg value="jar:jar"/>-->
-        </exec>
-    </target>
-
-
-    <!--<target name="clean" >-->
-    <!--<delete dir="${class.dir}/class/*"/>-->
-    <!--<delete dir="${jar.dir}/jar/*"/>-->
-    <!--<delete dir="${javadoc.dir}/doc/*"/>-->
-    <!--</target>-->
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="pinpoint-bootstrap-build" basedir="." default="deploy">
+    <property environment="env"/>
+
+    <property name="pinpoint.version" value="1.0.2"/>
+
+    <property name="pinpoint.bootstrap.jar" value="pinpoint-bootstrap-${pinpoint.version}.jar"/>
+
+
+    <property name="maven.dir" value="${env.M2_HOME}"/>
+    <property name="agent.dir" value="${basedir}/../deploy/pinpoint-agent/"/>
+    <property name="target.dir" value="${basedir}/target/"/>
+
+
+    <target name="deploy" depends="mvn.build.install, copy.agent">
+    </target>
+
+    <target name="copy.agent">
+        <copy file="${target.dir}/${pinpoint.bootstrap.jar}" tofile="${agent.dir}/${pinpoint.bootstrap.jar}" overwrite="true">
+        </copy>
+    </target>
+
+    <target name="mvn.build.install">
+        <exec executable="${maven.dir}/bin/mvn.bat ">
+            <arg value="-Dmaven.test.skip=true"/>
+            <arg value="clean"/>
+            <arg value="install"/>
+            <!--<arg value="compile"/>-->
+            <!--<arg value="jar:jar"/>-->
+        </exec>
+    </target>
+
+    <target name="mvn.build.package">
+        <exec executable="${maven.dir}/bin/mvn.bat ">
+            <arg value="-Dmaven.test.skip=true"/>
+            <arg value="package"/>
+            <!--<arg value="compile"/>-->
+            <!--<arg value="jar:jar"/>-->
+        </exec>
+    </target>
+
+
+    <!--<target name="clean" >-->
+    <!--<delete dir="${class.dir}/class/*"/>-->
+    <!--<delete dir="${jar.dir}/jar/*"/>-->
+    <!--<delete dir="${javadoc.dir}/doc/*"/>-->
+    <!--</target>-->
+
 </project>

bootstrap/findbugs-exclude.xml

@@ -1,13 +1,13 @@
-<FindBugsFilter>
-    <!--
-        <Match> <Class name="com.foobar.ClassWithSomeBugsMatched" /> <Bug
-        code="DE,UrF,SIC" /> </Match>
-    -->
-    <!--<Match>-->
-        <!--<Class name="com.nhncorp.usf.core.result.RedirectResult" />-->
-        <!--<Bug pattern="DM_CONVERT_CASE" />-->
-    <!--</Match>-->
-    <!--
-        Match all XYZ violations. <Match> <Bug code="XYZ" /> </Match>
-    -->
+<FindBugsFilter>
+    <!--
+        <Match> <Class name="com.foobar.ClassWithSomeBugsMatched" /> <Bug
+        code="DE,UrF,SIC" /> </Match>
+    -->
+    <!--<Match>-->
+        <!--<Class name="com.nhncorp.usf.core.result.RedirectResult" />-->
+        <!--<Bug pattern="DM_CONVERT_CASE" />-->
+    <!--</Match>-->
+    <!--
+        Match all XYZ violations. <Match> <Bug code="XYZ" /> </Match>
+    -->
 </FindBugsFilter>

bootstrap/src/main/java/com/navercorp/pinpoint/ProductInfo.java

@@ -1,9 +1,9 @@
-package com.nhn.pinpoint;
-
-/**
- * @author emeroad
- */
-public final class ProductInfo {
-    public static final String NAME = "pinpoint";
-    public static final String CAMEL_NAME = "Pinpoint";
-}
+package com.nhn.pinpoint;
+
+/**
+ * @author emeroad
+ */
+public final class ProductInfo {
+    public static final String NAME = "pinpoint";
+    public static final String CAMEL_NAME = "Pinpoint";
+}

bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/Agent.java

@@ -1,23 +1,22 @@
-package com.nhn.pinpoint.bootstrap;
-
-import com.nhn.pinpoint.bootstrap.config.ProfilerConfig;
-import com.nhn.pinpoint.bootstrap.context.TraceContext;
-
-/**
- * @author emeroad
- */
-public interface Agent {
-    // TODO 필요없을것 같음 started를 start로 바꿔도 될 듯...
-    void start();
-
-    void started();
-
-    void stop();
-
-    void addConnector(String protocol, int port);
-
-    TraceContext getTraceContext();
-
-    ProfilerConfig getProfilerConfig();
-
-}
+package com.nhn.pinpoint.bootstrap;
+
+import com.nhn.pinpoint.bootstrap.config.ProfilerConfig;
+import com.nhn.pinpoint.bootstrap.context.TraceContext;
+
+/**
+ * @author emeroad
+ * @author hyungil.jeong
+ */
+public interface Agent {
+
+    void start();
+
+    void stop();
+
+    void addConnector(String protocol, int port);
+
+    TraceContext getTraceContext();
+
+    ProfilerConfig getProfilerConfig();
+
+}