diff --git a/.gitignore b/.gitignore index b559f5331..aa77d55f3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /.idea /*.iml /deploy +/target diff --git a/bootstrap/build.sh b/bootstrap/build.sh deleted file mode 100755 index d57de5990..000000000 --- a/bootstrap/build.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash -VERSION="1.0.2-SNAPSHOT" - -# profile -PROFILE="" -if [ "$1" != "" ] ; then - PROFILE="-P $1" - echo "*********************" - echo "USING PROFILE $1" - echo "*********************" -else - echo "*********************" - echo "USING DEFAULT PROFILE" - echo "*********************" -fi - -# build bootstrap -mvn clean install eclipse:eclipse package dependency:copy-dependencies -Dmaven.test.skip $PROFILE -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 3f2bfd8c9..f88170432 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -156,7 +156,7 @@ com.nhn.pinpoint.bootstrap.PinpointBootStrap - ${version} + ${project.version} diff --git a/bootstrap/proguard-0.0.3-SNAPSHOT.conf b/bootstrap/proguard-0.0.3-SNAPSHOT.conf deleted file mode 100644 index 7bda13707..000000000 --- a/bootstrap/proguard-0.0.3-SNAPSHOT.conf +++ /dev/null @@ -1,349 +0,0 @@ --injars ../pinpoint-testbed/agent/pinpoint-bootstrap-0.0.3-SNAPSHOT.jar --outjars ../pinpoint-testbed/agent-obfuscated --injars ../pinpoint-testbed/agent/lib/pinpoint-profiler-0.0.3-SNAPSHOT.jar --outjars ../pinpoint-testbed/agent-obfuscated - --libraryjars /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/rt.jar --libraryjars ../pinpoint-profiler/target/dependency/arcus-client-1.6.2.1.jar --libraryjars ../pinpoint-profiler/target/dependency/catalina-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/commons-io-1.3.2.jar --libraryjars ../pinpoint-profiler/target/dependency/commons-lang-2.5.jar --libraryjars ../pinpoint-profiler/target/dependency/ehcache-core-2.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/httpclient-4.1.3.jar --libraryjars ../pinpoint-profiler/target/dependency/httpcore-4.1.4.jar --libraryjars ../pinpoint-profiler/target/dependency/javassist-3.16.1-GA.jar --libraryjars ../pinpoint-profiler/target/dependency/jcl-over-slf4j-1.6.6.jar --libraryjars ../pinpoint-profiler/target/dependency/juli-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/libthrift-0.9.0.jar --libraryjars ../pinpoint-profiler/target/dependency/log4j-1.2.16.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-bloc-http11-5.5.23.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-net-common-1.5.5.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-npc-1.5.10.jar --libraryjars ../pinpoint-profiler/target/dependency/mina-core-2.0.0.6-external.jar --libraryjars ../pinpoint-profiler/target/dependency/mysql-connector-java-5.1.14.jar --libraryjars ../pinpoint-profiler/target/dependency/servlet-api-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/slf4j-api-1.6.6.jar --libraryjars ../pinpoint-profiler/target/dependency/slf4j-log4j12-1.6.6.jar --libraryjars ../pinpoint-commons/target/dependency/hbase-0.94.1.jar --libraryjars ../pinpoint-commons/target/dependency/zookeeper-3.4.3.jar --libraryjars ../pinpoint-commons/target/dependency/spring-data-hadoop-1.0.0.RC1.jar --libraryjars ../pinpoint-commons/target/dependency/spring-core-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/hadoop-core-1.0.1.jar --libraryjars ../pinpoint-commons/target/dependency/spring-beans-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-tx-3.1.2.RELEASE.jar - --dontshrink --dontoptimize - - -# com.nhn.pinpoint.bootstrap.PinpointBootStrap --keep class com.nhn.pinpoint.bootstrap.PinpointBootStrap { - ; -} - -# com.nhn.pinpoint.bootstrap.interceptor.InterceptorRegistry --keep class com.nhn.pinpoint.bootstrap.interceptor.InterceptorRegistry { - ; -} - -# com.nhn.pinpoint.profiler.interceptor --keep class * extends com.nhn.pinpoint.bootstrap.interceptor.Interceptor { - public ; -} - -# com.nhn.pinpoint.bootstrap.Agent --keep class * extends com.nhn.pinpoint.bootstrap.Agent - -# Also keep - Enumerations. Keep the special static methods that are required in -# enumeration classes. --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - -# Also keep - Serialization code. Keep all fields and methods that are used for -# serialization. --keepclassmembers class * extends java.io.Serializable { - static final long serialVersionUID; - static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# Also keep - Database drivers. Keep all implementations of java.sql.Driver. --keep class * extends java.sql.Driver - -# Also keep - Swing UI L&F. Keep all extensions of javax.swing.plaf.ComponentUI, -# along with the special 'createUI' method. --keep class * extends javax.swing.plaf.ComponentUI { - public static javax.swing.plaf.ComponentUI createUI(javax.swing.JComponent); -} - -# Keep names - Native method names. Keep all native class/method names. --keepclasseswithmembers,allowshrinking class * { - native ; -} - -# Remove - System method calls. Remove all invocations of System -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.System { - public static long currentTimeMillis(); - static java.lang.Class getCallerClass(); - public static int identityHashCode(java.lang.Object); - public static java.lang.SecurityManager getSecurityManager(); - public static java.util.Properties getProperties(); - public static java.lang.String getProperty(java.lang.String); - public static java.lang.String getenv(java.lang.String); - public static java.lang.String mapLibraryName(java.lang.String); - public static java.lang.String getProperty(java.lang.String,java.lang.String); -} - -# Remove - Math method calls. Remove all invocations of Math -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.Math { - public static double sin(double); - public static double cos(double); - public static double tan(double); - public static double asin(double); - public static double acos(double); - public static double atan(double); - public static double toRadians(double); - public static double toDegrees(double); - public static double exp(double); - public static double log(double); - public static double log10(double); - public static double sqrt(double); - public static double cbrt(double); - public static double IEEEremainder(double,double); - public static double ceil(double); - public static double floor(double); - public static double rint(double); - public static double atan2(double,double); - public static double pow(double,double); - public static int round(float); - public static long round(double); - public static double random(); - public static int abs(int); - public static long abs(long); - public static float abs(float); - public static double abs(double); - public static int max(int,int); - public static long max(long,long); - public static float max(float,float); - public static double max(double,double); - public static int min(int,int); - public static long min(long,long); - public static float min(float,float); - public static double min(double,double); - public static double ulp(double); - public static float ulp(float); - public static double signum(double); - public static float signum(float); - public static double sinh(double); - public static double cosh(double); - public static double tanh(double); - public static double hypot(double,double); - public static double expm1(double); - public static double log1p(double); -} - -# Remove - Number method calls. Remove all invocations of Number -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.* extends java.lang.Number { - public static java.lang.String toString(byte); - public static java.lang.Byte valueOf(byte); - public static byte parseByte(java.lang.String); - public static byte parseByte(java.lang.String,int); - public static java.lang.Byte valueOf(java.lang.String,int); - public static java.lang.Byte valueOf(java.lang.String); - public static java.lang.Byte decode(java.lang.String); - public int compareTo(java.lang.Byte); - public static java.lang.String toString(short); - public static short parseShort(java.lang.String); - public static short parseShort(java.lang.String,int); - public static java.lang.Short valueOf(java.lang.String,int); - public static java.lang.Short valueOf(java.lang.String); - public static java.lang.Short valueOf(short); - public static java.lang.Short decode(java.lang.String); - public static short reverseBytes(short); - public int compareTo(java.lang.Short); - public static java.lang.String toString(int,int); - public static java.lang.String toHexString(int); - public static java.lang.String toOctalString(int); - public static java.lang.String toBinaryString(int); - public static java.lang.String toString(int); - public static int parseInt(java.lang.String,int); - public static int parseInt(java.lang.String); - public static java.lang.Integer valueOf(java.lang.String,int); - public static java.lang.Integer valueOf(java.lang.String); - public static java.lang.Integer valueOf(int); - public static java.lang.Integer getInteger(java.lang.String); - public static java.lang.Integer getInteger(java.lang.String,int); - public static java.lang.Integer getInteger(java.lang.String,java.lang.Integer); - public static java.lang.Integer decode(java.lang.String); - public static int highestOneBit(int); - public static int lowestOneBit(int); - public static int numberOfLeadingZeros(int); - public static int numberOfTrailingZeros(int); - public static int bitCount(int); - public static int rotateLeft(int,int); - public static int rotateRight(int,int); - public static int reverse(int); - public static int signum(int); - public static int reverseBytes(int); - public int compareTo(java.lang.Integer); - public static java.lang.String toString(long,int); - public static java.lang.String toHexString(long); - public static java.lang.String toOctalString(long); - public static java.lang.String toBinaryString(long); - public static java.lang.String toString(long); - public static long parseLong(java.lang.String,int); - public static long parseLong(java.lang.String); - public static java.lang.Long valueOf(java.lang.String,int); - public static java.lang.Long valueOf(java.lang.String); - public static java.lang.Long valueOf(long); - public static java.lang.Long decode(java.lang.String); - public static java.lang.Long getLong(java.lang.String); - public static java.lang.Long getLong(java.lang.String,long); - public static java.lang.Long getLong(java.lang.String,java.lang.Long); - public static long highestOneBit(long); - public static long lowestOneBit(long); - public static int numberOfLeadingZeros(long); - public static int numberOfTrailingZeros(long); - public static int bitCount(long); - public static long rotateLeft(long,int); - public static long rotateRight(long,int); - public static long reverse(long); - public static int signum(long); - public static long reverseBytes(long); - public int compareTo(java.lang.Long); - public static java.lang.String toString(float); - public static java.lang.String toHexString(float); - public static java.lang.Float valueOf(java.lang.String); - public static java.lang.Float valueOf(float); - public static float parseFloat(java.lang.String); - public static boolean isNaN(float); - public static boolean isInfinite(float); - public static int floatToIntBits(float); - public static int floatToRawIntBits(float); - public static float intBitsToFloat(int); - public static int compare(float,float); - public boolean isNaN(); - public boolean isInfinite(); - public int compareTo(java.lang.Float); - public static java.lang.String toString(double); - public static java.lang.String toHexString(double); - public static java.lang.Double valueOf(java.lang.String); - public static java.lang.Double valueOf(double); - public static double parseDouble(java.lang.String); - public static boolean isNaN(double); - public static boolean isInfinite(double); - public static long doubleToLongBits(double); - public static long doubleToRawLongBits(double); - public static double longBitsToDouble(long); - public static int compare(double,double); - public boolean isNaN(); - public boolean isInfinite(); - public int compareTo(java.lang.Double); - public byte byteValue(); - public short shortValue(); - public int intValue(); - public long longValue(); - public float floatValue(); - public double doubleValue(); - public int compareTo(java.lang.Object); - public boolean equals(java.lang.Object); - public int hashCode(); - public java.lang.String toString(); -} - -# Remove - String method calls. Remove all invocations of String -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.String { - public static java.lang.String copyValueOf(char[]); - public static java.lang.String copyValueOf(char[],int,int); - public static java.lang.String valueOf(boolean); - public static java.lang.String valueOf(char); - public static java.lang.String valueOf(char[]); - public static java.lang.String valueOf(char[],int,int); - public static java.lang.String valueOf(double); - public static java.lang.String valueOf(float); - public static java.lang.String valueOf(int); - public static java.lang.String valueOf(java.lang.Object); - public static java.lang.String valueOf(long); - public boolean contentEquals(java.lang.StringBuffer); - public boolean endsWith(java.lang.String); - public boolean equalsIgnoreCase(java.lang.String); - public boolean equals(java.lang.Object); - public boolean matches(java.lang.String); - public boolean regionMatches(boolean,int,java.lang.String,int,int); - public boolean regionMatches(int,java.lang.String,int,int); - public boolean startsWith(java.lang.String); - public boolean startsWith(java.lang.String,int); - public byte[] getBytes(); - public byte[] getBytes(java.lang.String); - public char charAt(int); - public char[] toCharArray(); - public int compareToIgnoreCase(java.lang.String); - public int compareTo(java.lang.Object); - public int compareTo(java.lang.String); - public int hashCode(); - public int indexOf(int); - public int indexOf(int,int); - public int indexOf(java.lang.String); - public int indexOf(java.lang.String,int); - public int lastIndexOf(int); - public int lastIndexOf(int,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.CharSequence subSequence(int,int); - public java.lang.String concat(java.lang.String); - public java.lang.String replaceAll(java.lang.String,java.lang.String); - public java.lang.String replace(char,char); - public java.lang.String replaceFirst(java.lang.String,java.lang.String); - public java.lang.String[] split(java.lang.String); - public java.lang.String[] split(java.lang.String,int); - public java.lang.String substring(int); - public java.lang.String substring(int,int); - public java.lang.String toLowerCase(); - public java.lang.String toLowerCase(java.util.Locale); - public java.lang.String toString(); - public java.lang.String toUpperCase(); - public java.lang.String toUpperCase(java.util.Locale); - public java.lang.String trim(); -} - -# Remove - StringBuffer method calls. Remove all invocations of StringBuffer -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.StringBuffer { - public java.lang.String toString(); - public char charAt(int); - public int capacity(); - public int codePointAt(int); - public int codePointBefore(int); - public int indexOf(java.lang.String,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.String substring(int); - public java.lang.String substring(int,int); -} - -# Remove - StringBuilder method calls. Remove all invocations of StringBuilder -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.StringBuilder { - public java.lang.String toString(); - public char charAt(int); - public int capacity(); - public int codePointAt(int); - public int codePointBefore(int); - public int indexOf(java.lang.String,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.String substring(int); - public java.lang.String substring(int,int); -} diff --git a/bootstrap/proguard-0.0.4-SNAPSHOT.conf b/bootstrap/proguard-0.0.4-SNAPSHOT.conf deleted file mode 100644 index 35f124d11..000000000 --- a/bootstrap/proguard-0.0.4-SNAPSHOT.conf +++ /dev/null @@ -1,366 +0,0 @@ --injars ../pinpoint-testbed/agent/pinpoint-bootstrap-0.0.4-SNAPSHOT.jar --outjars ../pinpoint-testbed/agent-obfuscated --injars ../pinpoint-testbed/agent/lib/pinpoint-profiler-0.0.4-SNAPSHOT.jar --outjars ../pinpoint-testbed/agent-obfuscated --injars ../pinpoint-testbed/agent/lib/pinpoint-rpc-0.0.4-SNAPSHOT.jar --outjars ../pinpoint-testbed/agent-obfuscated - --libraryjars /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/rt.jar - --libraryjars ../pinpoint-commons/target/dependency/spring-data-hadoop-1.0.1.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-core-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-beans-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-tx-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/hbase-0.94.6-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/zookeeper-3.4.5-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/hadoop-core-2.0.0-mr1-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/hadoop-common-2.0.0-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/hbasewd-0.1.0.jar - --libraryjars ../pinpoint-rpc/target/dependency/netty-3.6.6.Final.jar - --libraryjars ../pinpoint-thrift/target/dependency/libthrift-0.9.1.jar - --libraryjars ../pinpoint-profiler/target/dependency/pinpoint-thrift-0.0.4-SNAPSHOT.jar --libraryjars ../pinpoint-profiler/target/dependency/arcus-client-1.6.2.1.jar --libraryjars ../pinpoint-profiler/target/dependency/catalina-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/commons-lang3-3.1.jar --libraryjars ../pinpoint-profiler/target/dependency/ehcache-core-2.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/httpclient-4.1.3.jar --libraryjars ../pinpoint-profiler/target/dependency/httpcore-4.1.4.jar --libraryjars ../pinpoint-profiler/target/dependency/javassist-3.18.0-GA.jar --libraryjars ../pinpoint-profiler/target/dependency/jcl-over-slf4j-1.7.5.jar --libraryjars ../pinpoint-profiler/target/dependency/juli-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/log4j-1.2.16.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-bloc-http11-5.5.23.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-net-common-1.5.6.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-npc-1.5.19.jar --libraryjars ../pinpoint-profiler/target/dependency/mina-core-2.0.0.6-external.jar --libraryjars ../pinpoint-profiler/target/dependency/mysql-connector-java-5.1.14.jar --libraryjars ../pinpoint-profiler/target/dependency/servlet-api-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/slf4j-api-1.7.5.jar --libraryjars ../pinpoint-profiler/target/dependency/slf4j-log4j12-1.7.5.jar --libraryjars ../pinpoint-profiler/target/dependency/guava-14.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/metrics-core-3.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/metrics-jvm-3.0.1.jar - --libraryjars ../pinpoint-commons/target/dependency/jackson-core-asl-1.9.9.jar --libraryjars ../pinpoint-commons/target/dependency/jackson-jaxrs-1.9.9.jar --libraryjars ../pinpoint-commons/target/dependency/jackson-mapper-asl-1.9.9.jar --libraryjars ../pinpoint-commons/target/dependency/jackson-xc-1.9.9.jar - --dontshrink --dontoptimize - - -# com.nhn.pinpoint.bootstrap.PinpointBootStrap --keep class com.nhn.pinpoint.bootstrap.PinpointBootStrap { - ; -} - -# com.nhn.pinpoint.bootstrap.interceptor.InterceptorRegistry --keep class com.nhn.pinpoint.bootstrap.interceptor.InterceptorRegistry { - ; -} - -# com.nhn.pinpoint.profiler.interceptor --keep class * extends com.nhn.pinpoint.bootstrap.interceptor.Interceptor { - public ; -} - -# com.nhn.pinpoint.bootstrap.Agent --keep class * extends com.nhn.pinpoint.bootstrap.Agent - -# Also keep - Enumerations. Keep the special static methods that are required in -# enumeration classes. --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - -# Also keep - Serialization code. Keep all fields and methods that are used for -# serialization. --keepclassmembers class * extends java.io.Serializable { - static final long serialVersionUID; - static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# Also keep - Database drivers. Keep all implementations of java.sql.Driver. --keep class * extends java.sql.Driver - -# Also keep - Swing UI L&F. Keep all extensions of javax.swing.plaf.ComponentUI, -# along with the special 'createUI' method. --keep class * extends javax.swing.plaf.ComponentUI { - public static javax.swing.plaf.ComponentUI createUI(javax.swing.JComponent); -} - -# Keep names - Native method names. Keep all native class/method names. --keepclasseswithmembers,allowshrinking class * { - native ; -} - -# Remove - System method calls. Remove all invocations of System -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.System { - public static long currentTimeMillis(); - static java.lang.Class getCallerClass(); - public static int identityHashCode(java.lang.Object); - public static java.lang.SecurityManager getSecurityManager(); - public static java.util.Properties getProperties(); - public static java.lang.String getProperty(java.lang.String); - public static java.lang.String getenv(java.lang.String); - public static java.lang.String mapLibraryName(java.lang.String); - public static java.lang.String getProperty(java.lang.String,java.lang.String); -} - -# Remove - Math method calls. Remove all invocations of Math -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.Math { - public static double sin(double); - public static double cos(double); - public static double tan(double); - public static double asin(double); - public static double acos(double); - public static double atan(double); - public static double toRadians(double); - public static double toDegrees(double); - public static double exp(double); - public static double log(double); - public static double log10(double); - public static double sqrt(double); - public static double cbrt(double); - public static double IEEEremainder(double,double); - public static double ceil(double); - public static double floor(double); - public static double rint(double); - public static double atan2(double,double); - public static double pow(double,double); - public static int round(float); - public static long round(double); - public static double random(); - public static int abs(int); - public static long abs(long); - public static float abs(float); - public static double abs(double); - public static int max(int,int); - public static long max(long,long); - public static float max(float,float); - public static double max(double,double); - public static int min(int,int); - public static long min(long,long); - public static float min(float,float); - public static double min(double,double); - public static double ulp(double); - public static float ulp(float); - public static double signum(double); - public static float signum(float); - public static double sinh(double); - public static double cosh(double); - public static double tanh(double); - public static double hypot(double,double); - public static double expm1(double); - public static double log1p(double); -} - -# Remove - Number method calls. Remove all invocations of Number -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.* extends java.lang.Number { - public static java.lang.String toString(byte); - public static java.lang.Byte valueOf(byte); - public static byte parseByte(java.lang.String); - public static byte parseByte(java.lang.String,int); - public static java.lang.Byte valueOf(java.lang.String,int); - public static java.lang.Byte valueOf(java.lang.String); - public static java.lang.Byte decode(java.lang.String); - public int compareTo(java.lang.Byte); - public static java.lang.String toString(short); - public static short parseShort(java.lang.String); - public static short parseShort(java.lang.String,int); - public static java.lang.Short valueOf(java.lang.String,int); - public static java.lang.Short valueOf(java.lang.String); - public static java.lang.Short valueOf(short); - public static java.lang.Short decode(java.lang.String); - public static short reverseBytes(short); - public int compareTo(java.lang.Short); - public static java.lang.String toString(int,int); - public static java.lang.String toHexString(int); - public static java.lang.String toOctalString(int); - public static java.lang.String toBinaryString(int); - public static java.lang.String toString(int); - public static int parseInt(java.lang.String,int); - public static int parseInt(java.lang.String); - public static java.lang.Integer valueOf(java.lang.String,int); - public static java.lang.Integer valueOf(java.lang.String); - public static java.lang.Integer valueOf(int); - public static java.lang.Integer getInteger(java.lang.String); - public static java.lang.Integer getInteger(java.lang.String,int); - public static java.lang.Integer getInteger(java.lang.String,java.lang.Integer); - public static java.lang.Integer decode(java.lang.String); - public static int highestOneBit(int); - public static int lowestOneBit(int); - public static int numberOfLeadingZeros(int); - public static int numberOfTrailingZeros(int); - public static int bitCount(int); - public static int rotateLeft(int,int); - public static int rotateRight(int,int); - public static int reverse(int); - public static int signum(int); - public static int reverseBytes(int); - public int compareTo(java.lang.Integer); - public static java.lang.String toString(long,int); - public static java.lang.String toHexString(long); - public static java.lang.String toOctalString(long); - public static java.lang.String toBinaryString(long); - public static java.lang.String toString(long); - public static long parseLong(java.lang.String,int); - public static long parseLong(java.lang.String); - public static java.lang.Long valueOf(java.lang.String,int); - public static java.lang.Long valueOf(java.lang.String); - public static java.lang.Long valueOf(long); - public static java.lang.Long decode(java.lang.String); - public static java.lang.Long getLong(java.lang.String); - public static java.lang.Long getLong(java.lang.String,long); - public static java.lang.Long getLong(java.lang.String,java.lang.Long); - public static long highestOneBit(long); - public static long lowestOneBit(long); - public static int numberOfLeadingZeros(long); - public static int numberOfTrailingZeros(long); - public static int bitCount(long); - public static long rotateLeft(long,int); - public static long rotateRight(long,int); - public static long reverse(long); - public static int signum(long); - public static long reverseBytes(long); - public int compareTo(java.lang.Long); - public static java.lang.String toString(float); - public static java.lang.String toHexString(float); - public static java.lang.Float valueOf(java.lang.String); - public static java.lang.Float valueOf(float); - public static float parseFloat(java.lang.String); - public static boolean isNaN(float); - public static boolean isInfinite(float); - public static int floatToIntBits(float); - public static int floatToRawIntBits(float); - public static float intBitsToFloat(int); - public static int compare(float,float); - public boolean isNaN(); - public boolean isInfinite(); - public int compareTo(java.lang.Float); - public static java.lang.String toString(double); - public static java.lang.String toHexString(double); - public static java.lang.Double valueOf(java.lang.String); - public static java.lang.Double valueOf(double); - public static double parseDouble(java.lang.String); - public static boolean isNaN(double); - public static boolean isInfinite(double); - public static long doubleToLongBits(double); - public static long doubleToRawLongBits(double); - public static double longBitsToDouble(long); - public static int compare(double,double); - public boolean isNaN(); - public boolean isInfinite(); - public int compareTo(java.lang.Double); - public byte byteValue(); - public short shortValue(); - public int intValue(); - public long longValue(); - public float floatValue(); - public double doubleValue(); - public int compareTo(java.lang.Object); - public boolean equals(java.lang.Object); - public int hashCode(); - public java.lang.String toString(); -} - -# Remove - String method calls. Remove all invocations of String -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.String { - public static java.lang.String copyValueOf(char[]); - public static java.lang.String copyValueOf(char[],int,int); - public static java.lang.String valueOf(boolean); - public static java.lang.String valueOf(char); - public static java.lang.String valueOf(char[]); - public static java.lang.String valueOf(char[],int,int); - public static java.lang.String valueOf(double); - public static java.lang.String valueOf(float); - public static java.lang.String valueOf(int); - public static java.lang.String valueOf(java.lang.Object); - public static java.lang.String valueOf(long); - public boolean contentEquals(java.lang.StringBuffer); - public boolean endsWith(java.lang.String); - public boolean equalsIgnoreCase(java.lang.String); - public boolean equals(java.lang.Object); - public boolean matches(java.lang.String); - public boolean regionMatches(boolean,int,java.lang.String,int,int); - public boolean regionMatches(int,java.lang.String,int,int); - public boolean startsWith(java.lang.String); - public boolean startsWith(java.lang.String,int); - public byte[] getBytes(); - public byte[] getBytes(java.lang.String); - public char charAt(int); - public char[] toCharArray(); - public int compareToIgnoreCase(java.lang.String); - public int compareTo(java.lang.Object); - public int compareTo(java.lang.String); - public int hashCode(); - public int indexOf(int); - public int indexOf(int,int); - public int indexOf(java.lang.String); - public int indexOf(java.lang.String,int); - public int lastIndexOf(int); - public int lastIndexOf(int,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.CharSequence subSequence(int,int); - public java.lang.String concat(java.lang.String); - public java.lang.String replaceAll(java.lang.String,java.lang.String); - public java.lang.String replace(char,char); - public java.lang.String replaceFirst(java.lang.String,java.lang.String); - public java.lang.String[] split(java.lang.String); - public java.lang.String[] split(java.lang.String,int); - public java.lang.String substring(int); - public java.lang.String substring(int,int); - public java.lang.String toLowerCase(); - public java.lang.String toLowerCase(java.util.Locale); - public java.lang.String toString(); - public java.lang.String toUpperCase(); - public java.lang.String toUpperCase(java.util.Locale); - public java.lang.String trim(); -} - -# Remove - StringBuffer method calls. Remove all invocations of StringBuffer -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.StringBuffer { - public java.lang.String toString(); - public char charAt(int); - public int capacity(); - public int codePointAt(int); - public int codePointBefore(int); - public int indexOf(java.lang.String,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.String substring(int); - public java.lang.String substring(int,int); -} - -# Remove - StringBuilder method calls. Remove all invocations of StringBuilder -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.StringBuilder { - public java.lang.String toString(); - public char charAt(int); - public int capacity(); - public int codePointAt(int); - public int codePointBefore(int); - public int indexOf(java.lang.String,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.String substring(int); - public java.lang.String substring(int,int); -} diff --git a/bootstrap/proguard-0.0.4.conf b/bootstrap/proguard-0.0.4.conf deleted file mode 100644 index 9224a1624..000000000 --- a/bootstrap/proguard-0.0.4.conf +++ /dev/null @@ -1,366 +0,0 @@ --injars ./target/pinpoint-bootstrap-0.0.4-jar-with-dependencies.jar --outjars ./target/pinpoint-bootstrap-0.0.4-jar-with-dependencies-obfuscated.jar - --injars ../pinpoint-profiler/target/pinpoint-profiler-0.0.4.jar --outjars ../pinpoint-profiler/target/pinpoint-profiler-0.0.4-obfuscated.jar - --injars ../pinpoint-rpc/target/pinpoint-rpc-0.0.4.jar --outjars ../pinpoint-rpc/target/pinpoint-rpc-0.0.4-obfuscated.jar - --libraryjars ../pinpoint-commons/target/dependency/spring-data-hadoop-1.0.1.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-core-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-beans-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/spring-tx-3.1.2.RELEASE.jar --libraryjars ../pinpoint-commons/target/dependency/hbase-0.94.6-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/zookeeper-3.4.5-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/hadoop-core-2.0.0-mr1-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/hadoop-common-2.0.0-cdh4.3.0.jar --libraryjars ../pinpoint-commons/target/dependency/hbasewd-0.1.0.jar - --libraryjars ../pinpoint-rpc/target/dependency/netty-3.6.6.Final.jar - --libraryjars ../pinpoint-thrift/target/dependency/libthrift-0.9.1.jar - --libraryjars ../pinpoint-profiler/target/dependency/pinpoint-thrift-0.0.4.jar --libraryjars ../pinpoint-profiler/target/dependency/arcus-client-1.6.2.1.jar --libraryjars ../pinpoint-profiler/target/dependency/catalina-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/commons-lang3-3.1.jar --libraryjars ../pinpoint-profiler/target/dependency/ehcache-core-2.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/httpclient-4.1.3.jar --libraryjars ../pinpoint-profiler/target/dependency/httpcore-4.1.4.jar --libraryjars ../pinpoint-profiler/target/dependency/javassist-3.18.0-GA.jar --libraryjars ../pinpoint-profiler/target/dependency/jcl-over-slf4j-1.7.5.jar --libraryjars ../pinpoint-profiler/target/dependency/juli-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/log4j-1.2.16.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-bloc-http11-5.5.23.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-net-common-1.5.6.jar --libraryjars ../pinpoint-profiler/target/dependency/lucy-npc-1.5.19.jar --libraryjars ../pinpoint-profiler/target/dependency/mina-core-2.0.0.6-external.jar --libraryjars ../pinpoint-profiler/target/dependency/mysql-connector-java-5.1.14.jar --libraryjars ../pinpoint-profiler/target/dependency/servlet-api-6.0.35.jar --libraryjars ../pinpoint-profiler/target/dependency/slf4j-api-1.7.5.jar --libraryjars ../pinpoint-profiler/target/dependency/slf4j-log4j12-1.7.5.jar --libraryjars ../pinpoint-profiler/target/dependency/guava-14.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/metrics-core-3.0.1.jar --libraryjars ../pinpoint-profiler/target/dependency/metrics-jvm-3.0.1.jar - --libraryjars ../pinpoint-commons/target/dependency/jackson-core-asl-1.9.9.jar --libraryjars ../pinpoint-commons/target/dependency/jackson-jaxrs-1.9.9.jar --libraryjars ../pinpoint-commons/target/dependency/jackson-mapper-asl-1.9.9.jar --libraryjars ../pinpoint-commons/target/dependency/jackson-xc-1.9.9.jar - --dontshrink --dontoptimize - - -# com.nhn.pinpoint.bootstrap.PinpointBootStrap --keep class com.nhn.pinpoint.bootstrap.PinpointBootStrap { - ; -} - -# com.nhn.pinpoint.bootstrap.interceptor.InterceptorRegistry --keep class com.nhn.pinpoint.bootstrap.interceptor.InterceptorRegistry { - ; -} - -# com.nhn.pinpoint.profiler.interceptor --keep class * extends com.nhn.pinpoint.bootstrap.interceptor.Interceptor { - public ; -} - -# com.nhn.pinpoint.bootstrap.Agent --keep class * extends com.nhn.pinpoint.bootstrap.Agent - -# Also keep - Enumerations. Keep the special static methods that are required in -# enumeration classes. --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - -# Also keep - Serialization code. Keep all fields and methods that are used for -# serialization. --keepclassmembers class * extends java.io.Serializable { - static final long serialVersionUID; - static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# Also keep - Database drivers. Keep all implementations of java.sql.Driver. --keep class * extends java.sql.Driver - -# Also keep - Swing UI L&F. Keep all extensions of javax.swing.plaf.ComponentUI, -# along with the special 'createUI' method. --keep class * extends javax.swing.plaf.ComponentUI { - public static javax.swing.plaf.ComponentUI createUI(javax.swing.JComponent); -} - -# Keep names - Native method names. Keep all native class/method names. --keepclasseswithmembers,allowshrinking class * { - native ; -} - -# Remove - System method calls. Remove all invocations of System -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.System { - public static long currentTimeMillis(); - static java.lang.Class getCallerClass(); - public static int identityHashCode(java.lang.Object); - public static java.lang.SecurityManager getSecurityManager(); - public static java.util.Properties getProperties(); - public static java.lang.String getProperty(java.lang.String); - public static java.lang.String getenv(java.lang.String); - public static java.lang.String mapLibraryName(java.lang.String); - public static java.lang.String getProperty(java.lang.String,java.lang.String); -} - -# Remove - Math method calls. Remove all invocations of Math -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.Math { - public static double sin(double); - public static double cos(double); - public static double tan(double); - public static double asin(double); - public static double acos(double); - public static double atan(double); - public static double toRadians(double); - public static double toDegrees(double); - public static double exp(double); - public static double log(double); - public static double log10(double); - public static double sqrt(double); - public static double cbrt(double); - public static double IEEEremainder(double,double); - public static double ceil(double); - public static double floor(double); - public static double rint(double); - public static double atan2(double,double); - public static double pow(double,double); - public static int round(float); - public static long round(double); - public static double random(); - public static int abs(int); - public static long abs(long); - public static float abs(float); - public static double abs(double); - public static int max(int,int); - public static long max(long,long); - public static float max(float,float); - public static double max(double,double); - public static int min(int,int); - public static long min(long,long); - public static float min(float,float); - public static double min(double,double); - public static double ulp(double); - public static float ulp(float); - public static double signum(double); - public static float signum(float); - public static double sinh(double); - public static double cosh(double); - public static double tanh(double); - public static double hypot(double,double); - public static double expm1(double); - public static double log1p(double); -} - -# Remove - Number method calls. Remove all invocations of Number -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.* extends java.lang.Number { - public static java.lang.String toString(byte); - public static java.lang.Byte valueOf(byte); - public static byte parseByte(java.lang.String); - public static byte parseByte(java.lang.String,int); - public static java.lang.Byte valueOf(java.lang.String,int); - public static java.lang.Byte valueOf(java.lang.String); - public static java.lang.Byte decode(java.lang.String); - public int compareTo(java.lang.Byte); - public static java.lang.String toString(short); - public static short parseShort(java.lang.String); - public static short parseShort(java.lang.String,int); - public static java.lang.Short valueOf(java.lang.String,int); - public static java.lang.Short valueOf(java.lang.String); - public static java.lang.Short valueOf(short); - public static java.lang.Short decode(java.lang.String); - public static short reverseBytes(short); - public int compareTo(java.lang.Short); - public static java.lang.String toString(int,int); - public static java.lang.String toHexString(int); - public static java.lang.String toOctalString(int); - public static java.lang.String toBinaryString(int); - public static java.lang.String toString(int); - public static int parseInt(java.lang.String,int); - public static int parseInt(java.lang.String); - public static java.lang.Integer valueOf(java.lang.String,int); - public static java.lang.Integer valueOf(java.lang.String); - public static java.lang.Integer valueOf(int); - public static java.lang.Integer getInteger(java.lang.String); - public static java.lang.Integer getInteger(java.lang.String,int); - public static java.lang.Integer getInteger(java.lang.String,java.lang.Integer); - public static java.lang.Integer decode(java.lang.String); - public static int highestOneBit(int); - public static int lowestOneBit(int); - public static int numberOfLeadingZeros(int); - public static int numberOfTrailingZeros(int); - public static int bitCount(int); - public static int rotateLeft(int,int); - public static int rotateRight(int,int); - public static int reverse(int); - public static int signum(int); - public static int reverseBytes(int); - public int compareTo(java.lang.Integer); - public static java.lang.String toString(long,int); - public static java.lang.String toHexString(long); - public static java.lang.String toOctalString(long); - public static java.lang.String toBinaryString(long); - public static java.lang.String toString(long); - public static long parseLong(java.lang.String,int); - public static long parseLong(java.lang.String); - public static java.lang.Long valueOf(java.lang.String,int); - public static java.lang.Long valueOf(java.lang.String); - public static java.lang.Long valueOf(long); - public static java.lang.Long decode(java.lang.String); - public static java.lang.Long getLong(java.lang.String); - public static java.lang.Long getLong(java.lang.String,long); - public static java.lang.Long getLong(java.lang.String,java.lang.Long); - public static long highestOneBit(long); - public static long lowestOneBit(long); - public static int numberOfLeadingZeros(long); - public static int numberOfTrailingZeros(long); - public static int bitCount(long); - public static long rotateLeft(long,int); - public static long rotateRight(long,int); - public static long reverse(long); - public static int signum(long); - public static long reverseBytes(long); - public int compareTo(java.lang.Long); - public static java.lang.String toString(float); - public static java.lang.String toHexString(float); - public static java.lang.Float valueOf(java.lang.String); - public static java.lang.Float valueOf(float); - public static float parseFloat(java.lang.String); - public static boolean isNaN(float); - public static boolean isInfinite(float); - public static int floatToIntBits(float); - public static int floatToRawIntBits(float); - public static float intBitsToFloat(int); - public static int compare(float,float); - public boolean isNaN(); - public boolean isInfinite(); - public int compareTo(java.lang.Float); - public static java.lang.String toString(double); - public static java.lang.String toHexString(double); - public static java.lang.Double valueOf(java.lang.String); - public static java.lang.Double valueOf(double); - public static double parseDouble(java.lang.String); - public static boolean isNaN(double); - public static boolean isInfinite(double); - public static long doubleToLongBits(double); - public static long doubleToRawLongBits(double); - public static double longBitsToDouble(long); - public static int compare(double,double); - public boolean isNaN(); - public boolean isInfinite(); - public int compareTo(java.lang.Double); - public byte byteValue(); - public short shortValue(); - public int intValue(); - public long longValue(); - public float floatValue(); - public double doubleValue(); - public int compareTo(java.lang.Object); - public boolean equals(java.lang.Object); - public int hashCode(); - public java.lang.String toString(); -} - -# Remove - String method calls. Remove all invocations of String -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.String { - public static java.lang.String copyValueOf(char[]); - public static java.lang.String copyValueOf(char[],int,int); - public static java.lang.String valueOf(boolean); - public static java.lang.String valueOf(char); - public static java.lang.String valueOf(char[]); - public static java.lang.String valueOf(char[],int,int); - public static java.lang.String valueOf(double); - public static java.lang.String valueOf(float); - public static java.lang.String valueOf(int); - public static java.lang.String valueOf(java.lang.Object); - public static java.lang.String valueOf(long); - public boolean contentEquals(java.lang.StringBuffer); - public boolean endsWith(java.lang.String); - public boolean equalsIgnoreCase(java.lang.String); - public boolean equals(java.lang.Object); - public boolean matches(java.lang.String); - public boolean regionMatches(boolean,int,java.lang.String,int,int); - public boolean regionMatches(int,java.lang.String,int,int); - public boolean startsWith(java.lang.String); - public boolean startsWith(java.lang.String,int); - public byte[] getBytes(); - public byte[] getBytes(java.lang.String); - public char charAt(int); - public char[] toCharArray(); - public int compareToIgnoreCase(java.lang.String); - public int compareTo(java.lang.Object); - public int compareTo(java.lang.String); - public int hashCode(); - public int indexOf(int); - public int indexOf(int,int); - public int indexOf(java.lang.String); - public int indexOf(java.lang.String,int); - public int lastIndexOf(int); - public int lastIndexOf(int,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.CharSequence subSequence(int,int); - public java.lang.String concat(java.lang.String); - public java.lang.String replaceAll(java.lang.String,java.lang.String); - public java.lang.String replace(char,char); - public java.lang.String replaceFirst(java.lang.String,java.lang.String); - public java.lang.String[] split(java.lang.String); - public java.lang.String[] split(java.lang.String,int); - public java.lang.String substring(int); - public java.lang.String substring(int,int); - public java.lang.String toLowerCase(); - public java.lang.String toLowerCase(java.util.Locale); - public java.lang.String toString(); - public java.lang.String toUpperCase(); - public java.lang.String toUpperCase(java.util.Locale); - public java.lang.String trim(); -} - -# Remove - StringBuffer method calls. Remove all invocations of StringBuffer -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.StringBuffer { - public java.lang.String toString(); - public char charAt(int); - public int capacity(); - public int codePointAt(int); - public int codePointBefore(int); - public int indexOf(java.lang.String,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.String substring(int); - public java.lang.String substring(int,int); -} - -# Remove - StringBuilder method calls. Remove all invocations of StringBuilder -# methods without side effects whose return values are not used. --assumenosideeffects public class java.lang.StringBuilder { - public java.lang.String toString(); - public char charAt(int); - public int capacity(); - public int codePointAt(int); - public int codePointBefore(int); - public int indexOf(java.lang.String,int); - public int lastIndexOf(java.lang.String); - public int lastIndexOf(java.lang.String,int); - public int length(); - public java.lang.String substring(int); - public java.lang.String substring(int,int); -} diff --git a/collector/build.sh b/collector/build.sh deleted file mode 100755 index 74991f6f3..000000000 --- a/collector/build.sh +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/bash -VERSION="1.0.2-SNAPSHOT" -DEPLOY_DIR="../pinpoint-testbed/pinpoint-collector/webapps" -FILENAME="pinpoint-collector-$VERSION.war" - -rm $DEPLOY_DIR/$FILENAME - -#profile -PROFILE="" -if [ "$1" != "" ] ; then - PROFILE="-P $1" - echo "*********************" - echo "USING PROFILE $1" - echo "*********************" -else - echo "*********************" - echo "USING DEFAULT PROFILE" - echo "*********************" -fi - -rm -fr $DEPLOY_DIR/* -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi - -#server -mvn clean eclipse:eclipse install package dependency:copy-dependencies -Dmaven.test.skip $PROFILE -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi - -cp ./target/pinpoint-collector-$VERSION.war $DEPLOY_DIR -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/commons/build.bat b/commons/build.bat deleted file mode 100644 index bea130034..000000000 --- a/commons/build.bat +++ /dev/null @@ -1 +0,0 @@ -mvn package install -Dmaven.test.skip -Dthrift.executable=D:\workspace\thrift-win\thrift.exe \ No newline at end of file diff --git a/commons/build.sh b/commons/build.sh deleted file mode 100755 index 6323727af..000000000 --- a/commons/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash -# common은 install만 하면 된다. -# bootstrap이 빌드될 때 common의 class를 bootstrap.jar에 포함시킴. - -# common lib -mvn clean eclipse:eclipse package dependency:copy-dependencies install -Dmaven.test.skip -Dthrift.executable.property=/Users/netspider/DEV-TOOLS/thrift-0.9.0/bin/thrift - -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/commons/makethrift.sh b/commons/makethrift.sh deleted file mode 100755 index f63e35733..000000000 --- a/commons/makethrift.sh +++ /dev/null @@ -1 +0,0 @@ -mvn clean eclipse:eclipse -P withThrift -Dthrift.executable.property=/Users/netspider/DEV-TOOLS/thrift-0.9.0/bin/thrift diff --git a/pom.xml b/pom.xml index d43f19213..5cd005cb8 100644 --- a/pom.xml +++ b/pom.xml @@ -698,7 +698,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.5.2 + 2.5.5 com.nhncorp.maven @@ -735,11 +735,10 @@ true ${encoding} ${encoding} - Pinpoint ${project.version} Cross - Reference - Pinpoint ${project.version} Cross - Reference + Pinpoint ${project.version} Cross Reference + Pinpoint ${project.version} Cross Reference + 2.3 org.codehaus.mojo @@ -749,6 +748,7 @@ true ${project.build.directory}/findbugs + 2.5.5 org.apache.maven.plugins @@ -769,6 +769,7 @@ true + 3.1.6 diff --git a/profiler-optional/build.bat b/profiler-optional/build.bat deleted file mode 100644 index 6b76f432f..000000000 --- a/profiler-optional/build.bat +++ /dev/null @@ -1 +0,0 @@ -mvn package install -Dmaven.test.skip \ No newline at end of file diff --git a/profiler-optional/build.sh b/profiler-optional/build.sh deleted file mode 100644 index 04e3a60f5..000000000 --- a/profiler-optional/build.sh +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/bash -VERSION="1.0.2-SNAPSHOT" -OUT_JAR="pinpoint-profiler-optional-$VERSION.jar" -DEPLOY_DIR="../pinpoint-testbed/agent" - -# profile -PROFILE="" -if [ "$1" != "" ] ; then - PROFILE="-P $1" - echo "*********************" - echo "USING PROFILE $1" - echo "*********************" -else - echo "*********************" - echo "USING DEFAULT PROFILE" - echo "*********************" -fi - -# cleanup optional jar in deploy directory -rm $DEPLOY_DIR/$OUT_JAR - -mvn clean install eclipse:eclipse package -Dmaven.test.skip $PROFILE - -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi - -# copy optional jar to deploy directory -cp ./target/$OUT_JAR $DEPLOY_DIR -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/profiler/build.sh b/profiler/build.sh deleted file mode 100755 index dcf694923..000000000 --- a/profiler/build.sh +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/bash -VERSION="1.0.2-SNAPSHOT" -DEPLOY_DIR="../pinpoint-testbed/agent" - -# profile -PROFILE="" -if [ "$1" != "" ] ; then - PROFILE="-P $1" - echo "*********************" - echo "USING PROFILE $1" - echo "*********************" -else - echo "*********************" - echo "USING DEFAULT PROFILE" - echo "*********************" -fi - -# cleanup deploy directory -rm -fr $DEPLOY_DIR - -# build profiler -mvn clean install eclipse:eclipse package dependency:copy-dependencies -Dmaven.test.skip $PROFILE - -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi - -# copy agent directory to Testbed. -cp -r ./target/pinpoint-agent $DEPLOY_DIR -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/rpc/build.sh b/rpc/build.sh deleted file mode 100755 index 2fd7b625e..000000000 --- a/rpc/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash -mvn clean eclipse:eclipse package dependency:copy-dependencies install -Dmaven.test.skip - -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/testweb/build.sh b/testweb/build.sh deleted file mode 100755 index 1bbe12c30..000000000 --- a/testweb/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -# testweb -mvn clean eclipse:eclipse package dependency:copy-dependencies -Dmaven.test.skip diff --git a/thrift/build.sh b/thrift/build.sh deleted file mode 100755 index 2fd7b625e..000000000 --- a/thrift/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash -mvn clean eclipse:eclipse package dependency:copy-dependencies install -Dmaven.test.skip - -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file diff --git a/web/build.sh b/web/build.sh deleted file mode 100755 index c602735cd..000000000 --- a/web/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/bash -#profile -PROFILE="" -if [ "$1" != "" ] ; then - PROFILE="-P $1" - echo "*********************" - echo "USING PROFILE $1" - echo "*********************" -else - echo "*********************" - echo "USING DEFAULT PROFILE" - echo "*********************" -fi - -echo "mvn clean eclipse:eclipse package war:exploded -Dmaven.test.skip $PROFILE" - -# web ui -mvn clean eclipse:eclipse package war:exploded -Dmaven.test.skip $PROFILE - -rc=$? -if [[ $rc != 0 ]] ; then - echo "BUILD FAILED $rc" - exit $rc -fi \ No newline at end of file