Fix for https://github.com/Activiti/Activiti/issues/294 + Fixing event log entry mapping

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql

@@ -186,8 +186,7 @@ create table ACT_EVT_LOG (
     DATA_ longvarbinary,
     LOCK_OWNER_ varchar(255),
     LOCK_TIME_ timestamp,
-    IS_PROCESSED_ bit default 0,
-    primary key (LOG_NR_)
+    IS_PROCESSED_ bit default 0
 );
 
 create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_);

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql

@@ -181,11 +181,11 @@ create table ACT_EVT_LOG (
     PROC_INST_ID_ varchar(64),
     EXECUTION_ID_ varchar(64),
     TASK_ID_ varchar(64),
-    TIME_STAMP_ datetime not null,
+    TIME_STAMP_ timestamp not null,
     USER_ID_ varchar(255),
     DATA_ LONGBLOB,
     LOCK_OWNER_ varchar(255),
-    LOCK_TIME_ datetime null,
+    LOCK_TIME_ timestamp null,
     IS_PROCESSED_ tinyint default 0,
     primary key (LOG_NR_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;

modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/EventLogEntry.xml

@@ -62,7 +62,7 @@
   
   <resultMap id="eventLogEntryResultMap" type="org.activiti.engine.impl.persistence.entity.EventLogEntryEntity">
     <id property="logNumber" column="LOG_NR_" jdbcType="BIGINT" />
-    <result property="type" column="TYPE_" jdbcType="INTEGER"/>
+    <result property="type" column="TYPE_" jdbcType="VARCHAR"/>
     <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
     <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR"/>
     <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR"/>
@@ -77,7 +77,7 @@
   
   <resultMap id="eventLogEntryResultMap_postgres" type="org.activiti.engine.impl.persistence.entity.EventLogEntryEntity">
     <id property="logNumber" column="LOG_NR_" jdbcType="BIGINT" />
-    <result property="type" column="TYPE_" jdbcType="INTEGER"/>
+    <result property="type" column="TYPE_" jdbcType="VARCHAR"/>
     <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
     <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR"/>
     <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR"/>

modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.5151.to.516.engine.sql

@@ -16,8 +16,7 @@ create table ACT_EVT_LOG (
     DATA_ longvarbinary,
     LOCK_OWNER_ varchar(255),
     LOCK_TIME_ timestamp,
-    IS_PROCESSED_ bit default 0,
-    primary key (LOG_NR_)
+    IS_PROCESSED_ bit default 0
 );  	
 	
 	

modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql55.upgradestep.5151.to.516.engine.sql

@@ -11,11 +11,11 @@ create table ACT_EVT_LOG (
     PROC_INST_ID_ varchar(64),
     EXECUTION_ID_ varchar(64),
     TASK_ID_ varchar(64),
-    TIME_STAMP_ datetime(3) not null,
+    TIME_STAMP_ timestamp not null,
     USER_ID_ varchar(255),
     DATA_ LONGBLOB,
     LOCK_OWNER_ varchar(255),
-    LOCK_TIME_ datetime(3) null,
+    LOCK_TIME_ timestamp null,
     IS_PROCESSED_ tinyint default 0,
     primary key (LOG_NR_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;