minor updates

CenturyLinkCloud · Jan 10, 2020 · dc14ded · dc14ded
1 parent b7ca1c6
commit dc14ded
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/mdw-common/src/META-INF/mdw/db/oracle/upgrade.json b/mdw-common/src/META-INF/mdw/db/oracle/upgrade.json
@@ -19,11 +19,6 @@
       "name": "activity log",
       "check": "select * from all_tab_cols WHERE table_name ='ACTIVITY_LOG'",
       "upgrade":"CREATE TABLE ACTIVITY_LOG(LOG_ID NUMBER GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, PROCESS_INSTANCE_ID NUMBER(20) NOT NULL, ACTIVITY_INSTANCE_ID  NUMBER(20),CREATE_DT TIMESTAMP DEFAULT SYSTIMESTAMP,LOG_LEVEL VARCHAR(5),THREAD VARCHAR(32),MESSAGE VARCHAR(4000),CONSTRAINT activity_log_pk PRIMARY KEY (LOG_ID) USING INDEX); CREATE INDEX ACTIVITY_LOG_ACTIVITY_INST_IDX ON ACTIVITY_LOG (ACTIVITY_INSTANCE_ID); CREATE INDEX ACTIVITY_LOG_PROCESS_INST_IDX ON ACTIVITY_LOG (PROCESS_INSTANCE_ID);"
-    },
-    {
-      "name": "activity log id",
-      "check": "select * from all_tab_cols WHERE table_name = 'ACTIVITY_LOG' and column_name='LOG_ID'",
-      "upgrade":"ALTER TABLE ACTIVITY_LOG ADD(LOG_ID NUMBER GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, CONSTRAINT activity_log_pk PRIMARY KEY (LOG_ID) USING INDEX);"
     }
   ]
 }
diff --git a/mdw-workflow/assets/com/centurylink/mdw/base/.mdw/versions b/mdw-workflow/assets/com/centurylink/mdw/base/.mdw/versions
@@ -6,7 +6,7 @@ MdwRpcWebService.wsdl=2
 PauseActivity.java=5
 ProcessCleanup.java=5
 ProcessDueDateMonitor.java=5
-StuckActivities.java=2
+StuckActivities.java=3
 TimerWaitFallback.java=1
 activity.png=1
 adapter.png=1

diff --git a/mdw-workflow/assets/com/centurylink/mdw/base/StuckActivities.java b/mdw-workflow/assets/com/centurylink/mdw/base/StuckActivities.java
@@ -19,7 +19,6 @@
 import com.centurylink.mdw.common.service.ServiceException;
 import com.centurylink.mdw.config.PropertyException;
 import com.centurylink.mdw.config.PropertyManager;
-import com.centurylink.mdw.constant.PropertyNames;
 import com.centurylink.mdw.dataaccess.DatabaseAccess;
 import com.centurylink.mdw.model.user.UserAction;
 import com.centurylink.mdw.model.workflow.ActivityInstance;
@@ -38,9 +37,6 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
-
-
 
 /**
  * This script fixes stuck activities by failing them and then retrying them