Merge "Fix the Contents of the Licence"

diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
index f49123d..905ad1b 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
@@ -23,8 +23,14 @@ port=$3
 host=$4
 echo "start init holmes rulemgt db"
 main_path=$HOME/../
+cat $main_path/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
+echo "user="$user
+echo "password"$password
+echo "port="$port
+echo "host="$host
 mysql -u$user -p$password -P$port -h$host <$main_path/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
 sql_result=$?
+cat "sql_result="$sql_result
 if [ $sql_result != 0 ] ; then
    echo "failed to init rulemgt database!"
    exit 1

diff --git a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
index 7b8b883..9551eb5 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
+++ b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
@@ -14,7 +14,7 @@ server:
   adminContextPath: /admin
   connector:
     type: http
-    port: 12004
+    port: 9101
 
 # Logging settings.
 logging:

diff --git a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
index 4d6b296..609ec51 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
+++ b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
@@ -13,26 +13,26 @@
 -- See the License for the specific language governing permissions and\r
 -- limitations under the License.\r
 --\r
-/******************DROP OLD DATABASE AND USER***************************/\r
-USE MYSQL;\r
-DROP DATABASE IF  EXISTS HOLMES;\r
-DELETE FROM USER WHERE USER='HOLMES';\r
+/******************drop old database and user***************************/\r
+use mysql;\r
+drop database IF  EXISTS holmes;\r
+delete from user where User='holmes';\r
 FLUSH PRIVILEGES;\r
 \r
 /******************CREATE NEW DATABASE AND USER***************************/\r
-CREATE DATABASE HOLMES CHARACTER SET UTF8;\r
+create database holmes CHARACTER SET utf8;\r
 \r
-GRANT ALL PRIVILEGES ON HOLMES.* TO 'HOLMES'@'%' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
-GRANT ALL PRIVILEGES ON MYSQL.* TO 'HOLMES'@'%' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
 \r
-GRANT ALL PRIVILEGES ON CATALOG.* TO 'HOLMES'@'LOCALHOST' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
-GRANT ALL PRIVILEGES ON MYSQL.* TO 'HOLMES'@'LOCALHOST' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
 FLUSH PRIVILEGES;\r
 \r
-USE HOLMES;\r
-SET NAMES 'UTF8';\r
+use holmes;\r
+set Names 'utf8';\r
 /******************DELETE OLD TABLE AND CREATE NEW***************************/\r
-USE HOLMES;\r
+use holmes;\r
 DROP TABLE IF EXISTS APLUS_RULE;\r
 CREATE TABLE APLUS_RULE (\r
   RID VARCHAR(30) NOT NULL,\r
@@ -56,5 +56,5 @@ CREATE TABLE APLUS_RULE (
   KEY IDX_APLUS_RULE_TEMPLATEID (TEMPLATEID),\r
   KEY IDX_APLUS_RULE_ENGINEID (ENGINEID),\r
   KEY IDX_APLUS_RULE_ENGINETYPE (ENGINETYPE)\r
-)\r
+);\r
 \r