Modify engine database script

Change-Id: Idcb64f57c228aac8b8d708172292782ce045c801
Issue-ID:HOLMES-47
Signed-off-by: tangpeng <tang.peng5@zte.com.cn>

diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
index 5fce4b8..3a11fcb 100644 (file)
--- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml
+++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
@@ -51,9 +51,8 @@ logging:
 database:\r
   driverClass: com.mysql.jdbc.Driver\r
   user: root\r
-  password: root321\r
-#  url: jdbc:mysql://${db_ip}:${db_port}/mysql?useUnicode=relationtesttrue&characterEncoding=UTF8\r
-  url: jdbc:mysql://10.74.156.206:3306/mysql?useUnicode=true&characterEncoding=UTF8\r
+  password: rootpass\r
+  url: jdbc:mysql://10.74.156.206:3306/holmes\r
   properties:\r
     charSet: UTF-8\r
   maxWaitForConnection: 1s\r

diff --git a/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql b/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql
index 73d51ee..e69de29 100644 (file)
--- a/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql
+++ b/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql
@@ -1,60 +0,0 @@
---\r
--- Copyright 2017 ZTE Corporation.\r
---\r
--- Licensed under the Apache License, Version 2.0 (the "License");\r
--- you may not use this file except in compliance with the License.\r
--- You may obtain a copy of the License at\r
---\r
---     http://www.apache.org/licenses/LICENSE-2.0\r
---\r
--- Unless required by applicable law or agreed to in writing, software\r
--- distributed under the License is distributed on an "AS IS" BASIS,\r
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
--- 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
-FLUSH PRIVILEGES;\r
-\r
-/******************create new database and user***************************/\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
-\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
-FLUSH PRIVILEGES;\r
-\r
-use holmes;\r
-set Names 'utf8';\r
-/******************delete old table and create new***************************/\r
-use holmes;\r
-DROP TABLE IF EXISTS aplus_rule;\r
-CREATE TABLE aplus_rule (\r
-  rid varchar(30) NOT NULL,\r
-  name varchar(150) CHARACTER NOT NULL,\r
-  description varchar(4000) CHARACTER SET  DEFAULT NULL,\r
-  enable int(1) NOT NULL,\r
-  templateID int(10) NOT NULL,\r
-  engineID varchar(20) CHARACTER  NOT NULL,\r
-  engineType varchar(20) CHARACTER  NOT NULL,\r
-  creator varchar(20) CHARACTER  NOT NULL,\r
-  createTime datetime NOT NULL,\r
-  updator varchar(20) CHARACTER  DEFAULT NULL,\r
-  updateTime datetime DEFAULT NULL,\r
-  params varchar(4000) CHARACTER  DEFAULT NULL,\r
-  content varchar(4000) CHARACTER  NOT NULL,\r
-  vendor varchar(100) CHARACTER  NOT NULL,\r
-  package varchar(255) DEFAULT NULL,\r
-  PRIMARY KEY (rid),\r
-  UNIQUE KEY name (name),\r
-  KEY IDX_APLUS_RULE_ENABLE (enable),\r
-  KEY IDX_APLUS_RULE_TEMPLATEID (templateID),\r
-  KEY IDX_APLUS_RULE_ENGINEID (engineID),\r
-  KEY IDX_APLUS_RULE_ENGINETYPE (engineType)\r
-)\r
-\r

diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 7075c2d..9176aa0 100644 (file)
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
@@ -148,6 +149,8 @@
             <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
+
+
     </dependencies>
 
     <build>