Merge pull request scouter-project#122 from scouter-project/master

merge for release

scouter.agent.host/src/scouter/agent/Configure.java

@@ -335,6 +335,9 @@ public boolean saveText(String text) {
 		File file = getPropertyFile();
 		OutputStream out = null;
 		try {
+			if (file.getParentFile().exists() == false) {
+				file.getParentFile().mkdirs();
+			}
 			out = new FileOutputStream(file);
 			out.write(text.getBytes());
 			return true;

scouter.agent.java/src/scouter/agent/Configure.java

@@ -652,6 +652,9 @@ public boolean saveText(String text) {
 		File file = getPropertyFile();
 		OutputStream out = null;
 		try {
+			if (file.getParentFile().exists() == false) {
+				file.getParentFile().mkdirs();
+			}
 			out = new FileOutputStream(file);
 			out.write(text.getBytes());
 			return true;

scouter.agent.java/src/scouter/agent/asm/JDBCPreparedStatementASM.java

@@ -39,6 +39,7 @@ public class JDBCPreparedStatementASM implements IASM, Opcodes {
 	public final HashSet<String> noField = new HashSet<String>();
 	public JDBCPreparedStatementASM() {
 		target.add("org.mariadb.jdbc.MariaDbClientPreparedStatement");
+		target.add("org.mariadb.jdbc.MariaDbServerPreparedStatement");
 		target.add("org/mariadb/jdbc/MySQLPreparedStatement");
 		target.add("oracle/jdbc/driver/OraclePreparedStatement");
 		target.add("org/postgresql/jdbc2/AbstractJdbc2Statement");
@@ -54,7 +55,7 @@ public JDBCPreparedStatementASM() {
         target.add("cubrid/jdbc/driver/CUBRIDPreparedStatement");
 
         // @skyworker - MySQL ServerPreparedStatement는 특별히 필드를 추가하지 않음
-		noField.add("org.mariadb.jdbc.MariaDbClientPreparedStatement");
+        noField.add("org.mariadb.jdbc.MariaDbServerPreparedStatement");
 		noField.add("com/mysql/jdbc/ServerPreparedStatement");
 		noField.add("jdbc/FakePreparedStatement2");
 	}

scouter.agent.java/src/scouter/agent/asm/JDBCResultSetASM.java

@@ -42,6 +42,7 @@ public JDBCResultSetASM() {
 		target.add("oracle/jdbc/driver/SensitiveScrollableResultSet");
 		target.add("org/hsqldb/jdbc/JDBCResultSet");
 		target.add("cubrid/jdbc/driver/CUBRIDResultSet");
+		target.add("org.mariadb.jdbc.MariaDbResultSet");
 	}
 
 	public ClassVisitor transform(ClassVisitor cv, String className, ClassDesc classDesc) {

scouter.agent.java/src/scouter/agent/asm/JDBCStatementASM.java

@@ -36,7 +36,7 @@
 public class JDBCStatementASM implements IASM, Opcodes {
 	public final HashSet<String> target =  HookingSet.getHookingClassSet(Configure.getInstance().hook_jdbc_stmt_classes);
 	public JDBCStatementASM() {
-		target.add("org.mariadb.jdbc.MariaDbStatement");
+		target.add("org/mariadb/jdbc/MariaDbStatement");
 		target.add("org/mariadb/jdbc/MySQLStatement");
 		target.add("oracle/jdbc/driver/OracleStatement");
 		target.add("com/mysql/jdbc/StatementImpl");

scouter.deploy/build-server.xml

@@ -140,6 +140,10 @@
         <copy todir="./out/package/scouter/server">
             <fileset dir="../scouter.server/scripts"/>
         </copy>
+    	<fixcrlf srcdir="../scouter.server/scripts" includes="**/*.sh"
+    	  eol="lf"
+    	  eof="remove"
+    	/>
         <copy todir="./out/package/scouter/server/conf">
             <fileset dir="../scouter.server/conf"/>
         </copy>

scouter.deploy/build.xml

@@ -4,14 +4,18 @@
 	<property name="deploy-dir" value="./out/package"/>
 	<property name="outpack-dir" value="./out"/>
 
-	<property name="VERSION" value="0.4.7"/>
+	<property name="VERSION" value="0.4.8"/>
 
 
     <target name="packing">
         <mkdir dir="${outpack-dir}"/>
         <tar destfile="${outpack-dir}/${outpack-file}">
+        	<tarfileset dir="${deploy-dir}" mode="755" >
+                <include name="**/*.sh"/>
+            </tarfileset>
             <tarfileset dir="${deploy-dir}">
                 <include name="**/*"/>
+            	<exclude name="**/*.sh"/>
             </tarfileset>
         </tar>
         <gzip src="${outpack-dir}/${outpack-file}" destfile="${outpack-dir}/${outpack-file}.gz"/>

scouter.server/scripts/sample1.startcon.sh

@@ -3,3 +3,4 @@
 . $(dirname $0)/env.sh
 
 java -Xmx512m -classpath "$TUNAHOME/boot.jar" scouter.boot.Boot "$TUNAHOME/lib" -console
+

scouter.server/scripts/sample1.startup.sh

@@ -6,3 +6,4 @@ sleep 1
 tail -100 nohup.out
 echo "Scouter server launching..."
 echo "See the nohup.out."
+

scouter.server/scripts/sample2.readlink.sh

@@ -8,13 +8,14 @@ TARGET_FILE=`basename $TARGET_FILE`
 # Iterate down a (possible) chain of symlinks
 while [ -L "$TARGET_FILE" ]
 do
-	TARGET_FILE=`readlink $TARGET_FILE`
-	cd `dirname $TARGET_FILE`
-	TARGET_FILE=`basename $TARGET_FILE`
+        TARGET_FILE=`readlink $TARGET_FILE`
+        cd `dirname $TARGET_FILE`
+        TARGET_FILE=`basename $TARGET_FILE`
 done
 
 # Compute the canonicalized name by finding the physical path
 # for the directory we're in and appending the target file.
 PHYS_DIR=`pwd -P`
 RESULT=$PHYS_DIR/$TARGET_FILE
 echo $RESULT
+

scouter.server/scripts/sample2.startup.sh

@@ -8,3 +8,4 @@ nohup java $JAVAOPTS -classpath "$TUNAHOME/boot.jar" scouter.boot.Boot "$TUNAHOM
 
 echo "Scouter server launching..."
 echo "See the nohup.out."
+

scouter.server/scripts/sample2.stop.sh

@@ -3,3 +3,4 @@
 . $(dirname $0)/env.sh
 
 rm -f "$TUNAHOME/*.scouter"
+

scouter.server/scripts/startup.sh

@@ -3,3 +3,4 @@
 nohup java -Xmx512m -classpath ./boot.jar scouter.boot.Boot ./lib > nohup.out &
 sleep 1
 tail -100 nohup.out
+

scouter.server/scripts/stop.sh

@@ -1 +1 @@
-rm -f *.scouter
+rm -f *.scouter

scouter.server/src/scouter/server/Configure.java

@@ -358,8 +358,9 @@ public boolean saveText(String text) {
 		File file = getPropertyFile();
 		OutputStream out = null;
 		try {
-			File parentDir = file.getParentFile();
-			parentDir.mkdirs();
+			if (file.getParentFile().exists() == false) {
+				file.getParentFile().mkdirs();
+			}
 			out = new FileOutputStream(file);
 			out.write(text.getBytes());
 			return true;