Merge branch 'load-tables-from-module' of github.com:hbase-sculptor/s…

…culptor into load-tables-from-module

framework/ruby/classes/Initialize.rb

@@ -67,7 +67,7 @@
 log_level = org.apache.log4j.Level::ERROR
 org.apache.log4j.Logger.getLogger("org.apache.zookeeper").setLevel(log_level)
 org.apache.log4j.Logger.getLogger("org.apache.hadoop").setLevel(log_level)
-org.apache.log4j.Logger.getLogger("sculptor").setLevel(log_level)
+# org.apache.log4j.Logger.getLogger("sculptor").setLevel(log_level)
 
 $tableNameList = [];
 $fieldNameList = [];

framework/ruby/sculptor.rb

@@ -21,6 +21,7 @@
 #Sculptorのメインスクリプト
 #
 require 'etc'
+require 'pp'
 
 $userName = Etc.getlogin;
 
@@ -93,15 +94,10 @@
       end
     end
   rescue SyntaxError => e
-    eputs "不正な値が入力されました";
-  rescue NativeException => e
-    eputs "apiエラーです";
-    eputs e.cause
-  rescue HBaseClientException => e
-    eputs e.getMessage();
+    eputs "Command syntax error.";
   rescue => e
-    # TODO エラーハンドリング
-    p e;
+    pp e;
+    pp e.backtrace
   end
   #-eならばループしない
           if(ARGV[0]) then

sculptor

@@ -23,7 +23,12 @@ bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
 HBASE_HOME=/usr/local/hbase/current
-HBASE_CLASSPATH=$HBASE_CLASSPATH:$bin/sculptor-0.0.1.jar
+
+# add sculptor.jar to HBase classpath
+for jar in $bin/sculptor-*.jar
+do
+    HBASE_CLASSPATH=$HBASE_CLASSPATH:$jar
+done
 
 # add user defined libraries
 if [ -z "$SCULPTOR_AUXLIB_PATH" ]; then