Merge branch 'DEVELOP_BE' of ssh://git.eclipse.org:29418/elogbook/elogbook into DEVELOP_BE
diff --git a/db/create_BTB_DB_0.1.1.sql b/db/db_dev_evolution/create_BTB_DB_0.1.1.sql
similarity index 97%
rename from db/create_BTB_DB_0.1.1.sql
rename to db/db_dev_evolution/create_BTB_DB_0.1.1.sql
index 61b2927..22eab2a 100644
--- a/db/create_BTB_DB_0.1.1.sql
+++ b/db/db_dev_evolution/create_BTB_DB_0.1.1.sql
@@ -1,6 +1,10 @@
-- Database: betriebstagebuch
+
-- DROP DATABASE betriebstagebuch;
+
+-- REVIEW: Why is drop commented out? A clean install is strongly encouraged
+
/*
CREATE DATABASE betriebstagebuch
WITH
@@ -231,6 +235,7 @@
INSERT INTO public."tbl_settings" (parameter_name, parameter_value ) VALUES ( 'notification_list_closed_max_age', '6');
+-- REVIEW: Why are the Sprint comments necessary?
-->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -299,6 +304,8 @@
ALTER TABLE public.tbl_responsibility
OWNER TO btbservice;
+--REVIEW: Should be refactored to test data. We should have one script with DDL and multiple, content oriented DML scripts
+
-- >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-- Fill DB Script
@@ -307,6 +314,7 @@
INSERT INTO public."ref_grid_territory" (id, name, description) VALUES ( 1, 'MA', 'Mannheim');
INSERT INTO public."ref_grid_territory" (id, name, description) VALUES ( 2, 'OF', 'Offenbach');
+
-- Table: public."tbl_responsibility" (Verantwortlichkeiten) -------------------------------------------------
INSERT INTO public."tbl_responsibility" (id, fk_ref_grid_territory, fk_ref_branch, responsible_user, create_user, create_date) VALUES ( 1, 1, 1, 'admin','admin',now());
INSERT INTO public."tbl_responsibility" (id, fk_ref_grid_territory, fk_ref_branch, responsible_user, create_user, create_date) VALUES ( 2, 1, 2, 'admin','admin',now());
diff --git a/db/create_BTB_DB_0.1.2_Sprint4_OK145_ALTER_TABLE.sql b/db/db_dev_evolution/create_BTB_DB_0.1.2_Sprint4_OK145_ALTER_TABLE.sql
similarity index 100%
rename from db/create_BTB_DB_0.1.2_Sprint4_OK145_ALTER_TABLE.sql
rename to db/db_dev_evolution/create_BTB_DB_0.1.2_Sprint4_OK145_ALTER_TABLE.sql
diff --git a/db/create_BTB_DB_0.1.3_Sprint6_OK210_notifications_fks_nullable.sql b/db/db_dev_evolution/create_BTB_DB_0.1.3_Sprint6_OK210_notifications_fks_nullable.sql
similarity index 100%
rename from db/create_BTB_DB_0.1.3_Sprint6_OK210_notifications_fks_nullable.sql
rename to db/db_dev_evolution/create_BTB_DB_0.1.3_Sprint6_OK210_notifications_fks_nullable.sql
diff --git a/db/create_BTB_DB_0.1.3_Sprint6_OK225_create_htbl_responsibility.sql b/db/db_dev_evolution/create_BTB_DB_0.1.3_Sprint6_OK225_create_htbl_responsibility.sql
similarity index 100%
rename from db/create_BTB_DB_0.1.3_Sprint6_OK225_create_htbl_responsibility.sql
rename to db/db_dev_evolution/create_BTB_DB_0.1.3_Sprint6_OK225_create_htbl_responsibility.sql
diff --git a/db/create_BTB_DB_0.1.4_Sprint7_OK298_insert_remaining_responsibilities.sql b/db/db_dev_evolution/create_BTB_DB_0.1.4_Sprint7_OK298_insert_remaining_responsibilities.sql
similarity index 100%
rename from db/create_BTB_DB_0.1.4_Sprint7_OK298_insert_remaining_responsibilities.sql
rename to db/db_dev_evolution/create_BTB_DB_0.1.4_Sprint7_OK298_insert_remaining_responsibilities.sql
diff --git a/db/create_BTB_DB_0.1.4_Sprint7_OK351u353_create_index.sql b/db/db_dev_evolution/create_BTB_DB_0.1.4_Sprint7_OK351u353_create_index.sql
similarity index 100%
rename from db/create_BTB_DB_0.1.4_Sprint7_OK351u353_create_index.sql
rename to db/db_dev_evolution/create_BTB_DB_0.1.4_Sprint7_OK351u353_create_index.sql
diff --git a/db/create_BTB_DB_1.0.0_Sprint9_SET_1.0.0.sql b/db/db_dev_evolution/create_BTB_DB_1.0.0_Sprint9_SET_1.0.0.sql
similarity index 100%
rename from db/create_BTB_DB_1.0.0_Sprint9_SET_1.0.0.sql
rename to db/db_dev_evolution/create_BTB_DB_1.0.0_Sprint9_SET_1.0.0.sql
diff --git a/db/test_data.sql b/db/db_dev_evolution/test_data.sql
similarity index 99%
rename from db/test_data.sql
rename to db/db_dev_evolution/test_data.sql
index 1194b12..6882886 100644
--- a/db/test_data.sql
+++ b/db/db_dev_evolution/test_data.sql
@@ -1,38 +1,38 @@
--- Hier können weitere/alle benötigte Testdaten eingefügt werden.
-
--- Testdata for tbl_notification
-
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (14,5,2,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (15,6,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (16,7,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (17,8,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (21,12,1,3,'fasdf','sadfsdf','sdfsdf',4,'sdfds',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-15 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdfds',to_timestamp('2017-05-22 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (22,13,1,2,'sdfsadf','sdfsda','sdafsd',3,'sdfsd',null,null,'sdfsd',null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (23,14,1,1,'dsfsdaf','sdafsdf','fdgsdfg',2,'sadfdsf',null,null,'sdfsdf',null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (11,2,0,1,'sfg','freetext11','freetext_extended',1,null,null,null,null,null,'Creator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (27,18,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (33,100,3,1,'Text 100 3',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:12.467632','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:12.467632','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (36,101,3,1,'Text 101 3',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (30,100,1,1,'Text 100 1',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:53:29.925035','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:53:29.925035','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (32,100,2,1,'Text 100 2',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:04.506725','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:04.506725','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (35,101,2,1,'Text 101 2',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (34,101,1,1,'Text 101 1',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'));
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (37,19,1,1,'Meldung _fd 1, 2, 3','Freitext zur Meldung 1,23','',1,'Hermann Meister',to_timestamp('2017-05-10 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-18 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Frank D.',null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (38,20,1,2,'test^1','test2','test3',2,'avb',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-17 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdfd',to_timestamp('2017-05-15 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (41,23,1,2,'test','tasdf','asdfsd',2,null,null,null,null,null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (42,24,1,3,'teste','teste','teset',2,'asdf',to_timestamp('2017-05-24 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-14 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'asdf',to_timestamp('2017-05-16 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (43,25,1,1,'Text','FT','wFT',1,'Schulzendorff',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (45,27,1,1,'nochne Meldung','t','ft',1,'Schulzendorff',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (46,28,1,3,'asdfds','sdafsdf','sdafdsf',3,'sdf',to_timestamp('2017-05-22 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-30 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdf',to_timestamp('2017-05-16 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (47,29,1,3,'dsfdas','sdfdasf','asdfsdfas',2,'asdfas',to_timestamp('2017-05-22 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'dsfds',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (48,30,1,1,'neu',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (49,31,2,1,'neu',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (50,32,3,1,'neu und 2mal update',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (51,33,1,1,'admin','admin','�lja�ldfkj',1,null,to_timestamp('2017-05-09 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-09 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (52,34,1,2,'adfaf','adfaf','adfaf',1,'adfaf',null,null,null,null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (53,35,4,1,'neu und 3mal update',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (55,35,5,1,'neu und 4mal update',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (56,35,7,1,'pk_id 55 neue Version ',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (57,20,2,2,'test^1 update versuch. Die Indident ID soll auf 20 bleiben. Die Version muss 2 sein.','test2','test3',2,'avb',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-17 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdfd',to_timestamp('2017-05-15 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (58,36,1,3,'fasdfasdf','asdfdasf','sadfdasf',3,'sdfdas',to_timestamp('2017-05-10 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-16 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'dsfdas',to_timestamp('2017-05-08 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
-Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (59,37,1,3,'sadfasdf','sdafasdf','asdfasdf',1,'asdfasdf',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'asdfdasf',to_timestamp('2017-05-29 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+-- Hier können weitere/alle benötigte Testdaten eingefügt werden.
+
+-- Testdata for tbl_notification
+
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (14,5,2,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (15,6,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (16,7,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (17,8,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (21,12,1,3,'fasdf','sadfsdf','sdfsdf',4,'sdfds',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-15 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdfds',to_timestamp('2017-05-22 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (22,13,1,2,'sdfsadf','sdfsda','sdafsd',3,'sdfsd',null,null,'sdfsd',null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (23,14,1,1,'dsfsdaf','sdafsdf','fdgsdfg',2,'sadfdsf',null,null,'sdfsdf',null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (11,2,0,1,'sfg','freetext11','freetext_extended',1,null,null,null,null,null,'Creator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (27,18,1,1,'Meldung X:Y','','extended',2,'',null,null,'Abteilung 4',null,'MasterAndCreator',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),'_fd',to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-03-09 15:27:17.0','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (33,100,3,1,'Text 100 3',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:12.467632','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:12.467632','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (36,101,3,1,'Text 101 3',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (30,100,1,1,'Text 100 1',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:53:29.925035','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:53:29.925035','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (32,100,2,1,'Text 100 2',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:04.506725','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:04.506725','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (35,101,2,1,'Text 101 2',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (34,101,1,1,'Text 101 1',null,null,1,null,null,null,null,null,'Administrator',to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-11 15:54:47.84887','YYYY-MM-DD HH24:MI:SS.US'));
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (37,19,1,1,'Meldung _fd 1, 2, 3','Freitext zur Meldung 1,23','',1,'Hermann Meister',to_timestamp('2017-05-10 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-18 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Frank D.',null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (38,20,1,2,'test^1','test2','test3',2,'avb',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-17 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdfd',to_timestamp('2017-05-15 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (41,23,1,2,'test','tasdf','asdfsd',2,null,null,null,null,null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (42,24,1,3,'teste','teste','teset',2,'asdf',to_timestamp('2017-05-24 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-14 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'asdf',to_timestamp('2017-05-16 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (43,25,1,1,'Text','FT','wFT',1,'Schulzendorff',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (45,27,1,1,'nochne Meldung','t','ft',1,'Schulzendorff',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (46,28,1,3,'asdfds','sdafsdf','sdafdsf',3,'sdf',to_timestamp('2017-05-22 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-30 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdf',to_timestamp('2017-05-16 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (47,29,1,3,'dsfdas','sdfdasf','asdfsdfas',2,'asdfas',to_timestamp('2017-05-22 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'dsfds',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (48,30,1,1,'neu',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (49,31,2,1,'neu',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (50,32,3,1,'neu und 2mal update',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (51,33,1,1,'admin','admin','�lja�ldfkj',1,null,to_timestamp('2017-05-09 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),null,null,to_timestamp('2017-05-09 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (52,34,1,2,'adfaf','adfaf','adfaf',1,'adfaf',null,null,null,null,'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (53,35,4,1,'neu und 3mal update',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (55,35,5,1,'neu und 4mal update',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (56,35,7,1,'pk_id 55 neue Version ',null,null,1,'GS',null,null,null,null,'Otto Normalverbraucher',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (57,20,2,2,'test^1 update versuch. Die Indident ID soll auf 20 bleiben. Die Version muss 2 sein.','test2','test3',2,'avb',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-17 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'sdfd',to_timestamp('2017-05-15 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (58,36,1,3,'fasdfasdf','asdfdasf','sadfdasf',3,'sdfdas',to_timestamp('2017-05-10 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-16 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'dsfdas',to_timestamp('2017-05-08 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
+Insert into TBL_NOTIFICATION ("id","incident_id","version","fk_ref_branch","notification_text","free_text","free_text_extended","fk_ref_notification_status","responsibility_forwarding","reminder_date","expected_finished_date","responsibility_control_point","finished_date","create_user","create_date","mod_user","mod_date","begin_date") values (59,37,1,3,'sadfasdf','sdafasdf','asdfasdf',1,'asdfasdf',to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),to_timestamp('2017-05-23 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'asdfdasf',to_timestamp('2017-05-29 22:00:00.0','YYYY-MM-DD HH24:MI:SS.US'),'Administrator',LOCALTIMESTAMP,null,null,LOCALTIMESTAMP );
diff --git a/db/postgreSQL/01_add_DB.sql b/db/postgreSQL/01_add_DB.sql
new file mode 100644
index 0000000..641e684
--- /dev/null
+++ b/db/postgreSQL/01_add_DB.sql
@@ -0,0 +1,17 @@
+-- DROP DATABASE betriebstagebuch;
+
+CREATE DATABASE betriebstagebuch
+ WITH
+ OWNER = postgres
+ ENCODING = 'UTF8'
+ LC_COLLATE = 'German_Germany.1252'
+ LC_CTYPE = 'German_Germany.1252'
+ TABLESPACE = pg_default
+ CONNECTION LIMIT = -1;
+
+-- Role: btbservice
+
+-- DROP ROLE btbservice;
+CREATE ROLE btbservice LOGIN
+ ENCRYPTED PASSWORD 'md5014d35e4f8632560130b265acb21413f'
+ NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION;
diff --git a/db/postgreSQL/01a_drop_DB_1.0.0.sql b/db/postgreSQL/01a_drop_DB_1.0.0.sql
new file mode 100644
index 0000000..9ad583e
--- /dev/null
+++ b/db/postgreSQL/01a_drop_DB_1.0.0.sql
@@ -0,0 +1,19 @@
+drop table public.REF_BRANCH cascade;
+drop table public.REF_GRID_TERRITORY cascade;
+drop table public.REF_NOTIFICATION_STATUS cascade;
+drop table public.TBL_NOTIFICATION cascade;
+drop FUNCTION public.TBL_NOTIFICATION_INCIDENT_TRG();
+drop table public.TBL_RESPONSIBILITY cascade;
+drop table public.HTBL_RESPONSIBILITY cascade;
+drop view public.VIEW_ACTIVE_NOTIFICATION cascade;
+drop table public.REF_VERSION cascade;
+
+DROP SEQUENCE public.HTBL_RESPONSIBILITY_ID_SEQ;
+DROP SEQUENCE public.REF_BRANCH_ID_SEQ;
+DROP SEQUENCE public.REF_GRID_TERRITORY_ID_SEQ;
+DROP SEQUENCE public.REF_NOTIFICATION_STATUS_ID_SEQ;
+DROP SEQUENCE public.TBL_NOTIFICATION_ID_SEQ;
+DROP SEQUENCE public.TBL_NOTIFICATION_INCIDENT_ID_SEQ;
+DROP SEQUENCE public.TBL_RESPONSIBILITY_ID_SEQ;
+
+
diff --git a/db/postgreSQL/02_create_DB_1.0.0.sql b/db/postgreSQL/02_create_DB_1.0.0.sql
new file mode 100644
index 0000000..fa39c43
--- /dev/null
+++ b/db/postgreSQL/02_create_DB_1.0.0.sql
@@ -0,0 +1,413 @@
+
+
+
+
+
+CREATE SEQUENCE public.HTBL_RESPONSIBILITY_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 354
+ CACHE 1;
+ALTER TABLE public.HTBL_RESPONSIBILITY_ID_SEQ
+ OWNER TO btbservice;
+
+
+CREATE SEQUENCE public.REF_BRANCH_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 5
+ CACHE 1;
+ALTER TABLE public.REF_BRANCH_ID_SEQ
+ OWNER TO btbservice;
+
+CREATE SEQUENCE public.REF_GRID_TERRITORY_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 2
+ CACHE 1;
+ALTER TABLE public.REF_GRID_TERRITORY_ID_SEQ
+ OWNER TO btbservice;
+
+CREATE SEQUENCE public.REF_NOTIFICATION_STATUS_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 5
+ CACHE 1;
+ALTER TABLE public.REF_NOTIFICATION_STATUS_ID_SEQ
+ OWNER TO btbservice;
+
+CREATE SEQUENCE public.TBL_NOTIFICATION_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1395
+ CACHE 1;
+ALTER TABLE public.TBL_NOTIFICATION_ID_SEQ
+ OWNER TO btbservice;
+
+CREATE SEQUENCE public.TBL_NOTIFICATION_INCIDENT_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 81
+ CACHE 1;
+ALTER TABLE public.TBL_NOTIFICATION_INCIDENT_ID_SEQ
+ OWNER TO btbservice;
+
+CREATE SEQUENCE public.TBL_RESPONSIBILITY_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 21
+ CACHE 1;
+ALTER TABLE public.TBL_RESPONSIBILITY_ID_SEQ
+ OWNER TO btbservice;
+
+
+CREATE TABLE public.REF_BRANCH
+(
+ id integer NOT NULL DEFAULT nextval('ref_branch_id_seq'::regclass),
+ name character varying(50) NOT NULL,
+ description character varying(255),
+ CONSTRAINT REF_BRANCH_PKEY PRIMARY KEY (id)
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.REF_BRANCH
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.REF_BRANCH TO btbservice;
+
+
+CREATE TABLE public.REF_GRID_TERRITORY
+(
+ id integer NOT NULL DEFAULT nextval('ref_grid_territory_id_seq'::regclass),
+ name character varying(50) NOT NULL,
+ description character varying(255),
+ fk_ref_master integer NOT NULL,
+ CONSTRAINT REF_GRID_TERRITORY_PKEY PRIMARY KEY (id),
+ CONSTRAINT FK_REF_GRID_TERRITORY_SELF FOREIGN KEY (fk_ref_master)
+ REFERENCES public.REF_GRID_TERRITORY (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE CASCADE
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.REF_GRID_TERRITORY
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.REF_GRID_TERRITORY TO btbservice;
+
+-- Index: public.fki_fk_grid_territory_self
+
+-- DROP INDEX public.fki_fk_grid_territory_self;
+
+CREATE INDEX FKI_FK_GRID_TERRITORY_SELF
+ ON public.REF_GRID_TERRITORY
+ USING btree
+ (fk_ref_master);
+
+-- Index: public.ref_grid_territory_description_unique
+
+-- DROP INDEX public.ref_grid_territory_description_unique;
+
+CREATE UNIQUE INDEX REF_GRID_TERRITORY_DESCRIPTION_UNIQUE
+ ON public.REF_GRID_TERRITORY
+ USING btree
+ (description COLLATE pg_catalog."default");
+
+
+CREATE TABLE public.REF_NOTIFICATION_STATUS
+(
+ id integer NOT NULL DEFAULT nextval('ref_notification_status_id_seq'::regclass),
+ name character varying(50) NOT NULL,
+ CONSTRAINT REF_NOTIFICATION_STATUS_PKEY PRIMARY KEY (id)
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.REF_NOTIFICATION_STATUS
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.REF_NOTIFICATION_STATUS TO btbservice;
+
+
+CREATE TABLE public.REF_VERSION
+(
+ id integer NOT NULL,
+ version character varying(100) NOT NULL,
+ CONSTRAINT ref_version_pkey PRIMARY KEY (id)
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.REF_VERSION
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.REF_VERSION TO btbservice;
+
+
+CREATE TABLE public.TBL_NOTIFICATION
+(
+ id integer NOT NULL DEFAULT nextval('tbl_notification_id_seq'::regclass),
+ incident_id integer DEFAULT nextval('tbl_notification_incident_id_seq'::regclass),
+ version integer NOT NULL DEFAULT 0,
+ fk_ref_branch integer,
+ notification_text character varying(200) NOT NULL,
+ free_text character varying(1000),
+ free_text_extended character varying(1000),
+ fk_ref_notification_status integer NOT NULL,
+ responsibility_forwarding character varying(100),
+ reminder_date timestamp without time zone,
+ expected_finished_date timestamp without time zone,
+ responsibility_control_point character varying(100),
+ begin_date timestamp without time zone NOT NULL,
+ finished_date timestamp without time zone,
+ create_user character varying(100) NOT NULL,
+ create_date timestamp without time zone NOT NULL,
+ mod_user character varying(100),
+ mod_date timestamp without time zone,
+ fk_ref_grid_territory integer,
+ admin_flag boolean NOT NULL DEFAULT false,
+ CONSTRAINT TBL_NOTIFICATION_PKEY PRIMARY KEY (id),
+ CONSTRAINT FK_NOTIFICATION_FK_BRANCH FOREIGN KEY (fk_ref_branch)
+ REFERENCES public.REF_BRANCH (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION,
+ CONSTRAINT FK_NOTIFICATION_FK_GRID_TERRITORY FOREIGN KEY (fk_ref_grid_territory)
+ REFERENCES public.REF_GRID_TERRITORY (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE CASCADE,
+ CONSTRAINT FK_NOTIFICATION_FK_STATUS FOREIGN KEY (fk_ref_notification_status)
+ REFERENCES public.REF_NOTIFICATION_STATUS (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.TBL_NOTIFICATION
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.TBL_NOTIFICATION TO btbservice;
+
+-- Index: public.create_date_idx
+
+-- DROP INDEX public.create_date_idx;
+
+CREATE INDEX CREATE_DATE_IDX
+ ON public.TBL_NOTIFICATION
+ USING btree
+ (create_date);
+
+-- Index: public.fki_notification_fk_branch
+
+-- DROP INDEX public.fki_notification_fk_branch;
+
+CREATE INDEX FKI_NOTIFICATION_FK_BRANCH
+ ON public.TBL_NOTIFICATION
+ USING btree
+ (fk_ref_branch);
+
+-- Index: public.fki_notification_fk_grid_territory
+
+-- DROP INDEX public.fki_notification_fk_grid_territory;
+
+CREATE INDEX FKI_NOTIFICATION_FK_GRID_TERRITORY
+ ON public.TBL_NOTIFICATION
+ USING btree
+ (fk_ref_grid_territory);
+
+-- Index: public.fki_notification_fk_status
+
+-- DROP INDEX public.fki_notification_fk_status;
+
+CREATE INDEX FKI_NOTIFICATION_FK_STATUS
+ ON public.TBL_NOTIFICATION
+ USING btree
+ (fk_ref_notification_status);
+
+-- Index: public.mod_date_idx
+
+-- DROP INDEX public.mod_date_idx;
+
+CREATE INDEX MOD_DATE_IDX
+ ON public.TBL_NOTIFICATION
+ USING btree
+ (mod_date);
+
+-- Index: public.responsibility_forwarding_idx
+
+-- DROP INDEX public.responsibility_forwarding_idx;
+
+CREATE INDEX RESPONSIBILITY_FORWARDING_IDX
+ ON public.TBL_NOTIFICATION
+ USING btree
+ (responsibility_forwarding COLLATE pg_catalog."default");
+
+-- Index: public.tbl_notification_incident_version_unique
+
+-- DROP INDEX public.tbl_notification_incident_version_unique;
+
+CREATE UNIQUE INDEX TBL_NOTIFICATION_INCIDENT_VERSION_UNIQUE
+ ON public.tbl_notification
+ USING btree
+ (incident_id, version);
+
+
+CREATE OR REPLACE FUNCTION public.TBL_NOTIFICATION_INCIDENT_TRG()
+ RETURNS trigger AS
+$BODY$
+ BEGIN
+
+ IF NEW.incident_id IS NULL THEN
+ NEW.incident_id := NEW.id;
+ END IF;
+
+ RETURN NEW;
+ END;
+$BODY$
+ LANGUAGE plpgsql VOLATILE
+ COST 100;
+ALTER FUNCTION public.TBL_NOTIFICATION_INCIDENT_TRG()
+ OWNER TO btbservice;
+
+
+-- Trigger: tbl_notification_incident_trg on public.tbl_notification
+
+-- DROP TRIGGER tbl_notification_incident_trg ON public.tbl_notification;
+
+CREATE TRIGGER TBL_NOTIFICATION_INCIDENT_TRG
+ BEFORE INSERT
+ ON public.tbl_notification
+ FOR EACH ROW
+ EXECUTE PROCEDURE public.TBL_NOTIFICATION_INCIDENT_TRG();
+
+
+CREATE TABLE public.TBL_RESPONSIBILITY
+(
+ id integer NOT NULL DEFAULT nextval('tbl_responsibility_id_seq'::regclass),
+ fk_ref_grid_territory integer NOT NULL,
+ fk_ref_branch integer NOT NULL,
+ responsible_user character varying(100) NOT NULL,
+ new_responsible_user character varying(100),
+ create_user character varying(100) NOT NULL,
+ create_date timestamp without time zone NOT NULL,
+ mod_user character varying(100),
+ mod_date timestamp without time zone,
+ CONSTRAINT TBL_RESPONSIBILITY_PKEY PRIMARY KEY (id),
+ CONSTRAINT FK_BRANCH FOREIGN KEY (fk_ref_branch)
+ REFERENCES public.REF_BRANCH (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION,
+ CONSTRAINT FK_GRID_TERRITORY FOREIGN KEY (fk_ref_grid_territory)
+ REFERENCES public.REF_GRID_TERRITORY (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.TBL_RESPONSIBILITY
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.TBL_RESPONSIBILITY TO btbservice;
+
+-- Index: public.tbl_responsibility_territory_branch_user_unique
+
+-- DROP INDEX public.tbl_responsibility_territory_branch_user_unique;
+
+CREATE UNIQUE INDEX TBL_RESPONSIBILITY_TERRITORY_BRANCH_USER_UNIQUE
+ ON public.TBL_RESPONSIBILITY
+ USING btree
+ (fk_ref_grid_territory, fk_ref_branch);
+
+
+CREATE TABLE public.HTBL_RESPONSIBILITY
+(
+ id integer NOT NULL DEFAULT nextval('htbl_responsibility_id_seq'::regclass),
+ fk_ref_grid_territory integer NOT NULL,
+ fk_ref_branch integer NOT NULL,
+ transfer_date timestamp without time zone NOT NULL,
+ transaction_id integer NOT NULL,
+ responsible_user character varying(100) NOT NULL,
+ former_responsible_user character varying(100),
+ create_user character varying(100) NOT NULL,
+ create_date timestamp without time zone NOT NULL,
+ mod_user character varying(100),
+ mod_date timestamp without time zone,
+ CONSTRAINT HTBL_RESPONSIBILITY_PKEY PRIMARY KEY (id),
+ CONSTRAINT fk_branch FOREIGN KEY (fk_ref_branch)
+ REFERENCES public.REF_BRANCH (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION,
+ CONSTRAINT FK_GRID_TERRITORY FOREIGN KEY (fk_ref_grid_territory)
+ REFERENCES public.REF_GRID_TERRITORY (id) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.HTBL_RESPONSIBILITY
+ OWNER TO btbservice;
+
+-- Index: public.htbl_responsibility_territory_branch_user_transaction_id_unique
+
+-- DROP INDEX public.htbl_responsibility_territory_branch_user_transaction_id_unique;
+
+CREATE UNIQUE INDEX HTBL_RESPONSIBILITY_TERRITORY_BRANCH_USER_TRANSACTION_ID_UNIQUE
+ ON public.HTBL_RESPONSIBILITY
+ USING btree
+ (fk_ref_grid_territory, fk_ref_branch, transaction_id);
+
+
+CREATE OR REPLACE VIEW public.VIEW_ACTIVE_NOTIFICATION AS
+ SELECT s.id,
+ s.incident_id,
+ s.version,
+ s.fk_ref_branch,
+ s.notification_text,
+ s.free_text,
+ s.free_text_extended,
+ s.fk_ref_notification_status,
+ s.responsibility_forwarding,
+ s.reminder_date,
+ s.expected_finished_date,
+ s.responsibility_control_point,
+ s.begin_date,
+ s.finished_date,
+ s.create_user,
+ s.create_date,
+ s.mod_user,
+ s.mod_date,
+ s.fk_ref_grid_territory,
+ s.admin_flag
+ FROM ( SELECT tbl_notification.id,
+ tbl_notification.incident_id,
+ tbl_notification.version,
+ tbl_notification.fk_ref_branch,
+ tbl_notification.notification_text,
+ tbl_notification.free_text,
+ tbl_notification.free_text_extended,
+ tbl_notification.fk_ref_notification_status,
+ tbl_notification.responsibility_forwarding,
+ tbl_notification.reminder_date,
+ tbl_notification.expected_finished_date,
+ tbl_notification.responsibility_control_point,
+ tbl_notification.begin_date,
+ tbl_notification.finished_date,
+ tbl_notification.create_user,
+ tbl_notification.create_date,
+ tbl_notification.mod_user,
+ tbl_notification.mod_date,
+ tbl_notification.fk_ref_grid_territory,
+ tbl_notification.admin_flag,
+ rank() OVER (PARTITION BY tbl_notification.incident_id ORDER BY tbl_notification.version DESC) AS rank
+ FROM TBL_NOTIFICATION) s
+ WHERE s.rank = 1;
+
+ALTER TABLE public.VIEW_ACTIVE_NOTIFICATION
+ OWNER TO btbservice;
+GRANT ALL ON TABLE public.VIEW_ACTIVE_NOTIFICATION TO btbservice;
+
+
+
+
+
+
+
+
+
diff --git a/db/postgreSQL/03_config_DB_1.0.0.sql b/db/postgreSQL/03_config_DB_1.0.0.sql
new file mode 100644
index 0000000..1c491d0
--- /dev/null
+++ b/db/postgreSQL/03_config_DB_1.0.0.sql
@@ -0,0 +1,24 @@
+
+INSERT INTO REF_NOTIFICATION_STATUS ( "id", "name" ) VALUES ( 1, 'offen' );
+INSERT INTO REF_NOTIFICATION_STATUS ( "id", "name" ) VALUES ( 2, 'in Arbeit' );
+INSERT INTO REF_NOTIFICATION_STATUS ( "id", "name" ) VALUES ( 3, 'erledigt' );
+INSERT INTO REF_NOTIFICATION_STATUS ( "id", "name" ) VALUES ( 4, 'geschlossen' );
+
+INSERT INTO REF_BRANCH ("id", "name", "description" ) VALUES ( 1, 'S', 'Strom' );
+INSERT INTO REF_BRANCH ("id", "name", "description" ) VALUES ( 2, 'G', 'Gas' );
+INSERT INTO REF_BRANCH ("id", "name", "description" ) VALUES ( 3, 'FW', 'Fernwärme' );
+INSERT INTO REF_BRANCH ("id", "name", "description" ) VALUES ( 4, 'W', 'Wasser' );
+
+INSERT INTO REF_GRID_TERRITORY ("id", "name", "description", "fk_ref_master") VALUES ( 1, 'MA', 'Mannheim', 1);
+INSERT INTO REF_GRID_TERRITORY ("id", "name", "description", "fk_ref_master") VALUES ( 2, 'OF', 'Offenbach', 2);
+
+INSERT INTO REF_VERSION VALUES (1, '1.0.0_PG');
+
+INSERT INTO TBL_RESPONSIBILITY ("fk_ref_grid_territory", "fk_ref_branch", "responsible_user", "create_user", "create_date") VALUES (1, 2, 'admin','admin', CURRENT_TIMESTAMP);
+INSERT INTO TBL_RESPONSIBILITY ("fk_ref_grid_territory", "fk_ref_branch", "responsible_user", "create_user", "create_date") VALUES (1, 3, 'admin','admin', CURRENT_TIMESTAMP);
+INSERT INTO TBL_RESPONSIBILITY ("fk_ref_grid_territory", "fk_ref_branch", "responsible_user", "create_user", "create_date") VALUES (1, 4, 'admin','admin', CURRENT_TIMESTAMP);
+INSERT INTO TBL_RESPONSIBILITY ("fk_ref_grid_territory", "fk_ref_branch", "responsible_user", "create_user", "create_date") VALUES (2, 1, 'admin','admin', CURRENT_TIMESTAMP);
+INSERT INTO TBL_RESPONSIBILITY ("fk_ref_grid_territory", "fk_ref_branch", "responsible_user", "create_user", "create_date") VALUES (2, 3, 'otto','admin', CURRENT_TIMESTAMP);
+INSERT INTO TBL_RESPONSIBILITY ("fk_ref_grid_territory", "fk_ref_branch", "responsible_user", "create_user", "create_date") VALUES (2, 4, 'otto','admin', CURRENT_TIMESTAMP);
+
+
diff --git a/src/main/asciidoc/GetStarted.adoc b/src/main/asciidoc/GetStarted.adoc
deleted file mode 100644
index 6f350c5..0000000
--- a/src/main/asciidoc/GetStarted.adoc
+++ /dev/null
@@ -1,215 +0,0 @@
-Wie richte ich AsciiDoc ein?
-============================
-:Author: Sergej Kern
-:Email: sergej.kern@pta.de
-:Date: 2017-07-12
-:Reviosion: 1
-:icons:
-:source-highlighter: highlightjs
-:highlightjs-theme: solarized_dark
-
-
-== Das wichtigste
-IMPORTANT: Wenn andere Zeichen benutzt werden, als ANSI (d.h. immer), muss unbedingt darauf geachtet werden,
-dass die *.adoc-Dateien im UTF-8-Format gespeichert werden. Wenn eine Datei im ANSI-Format gespeichert ist,
-meldet AsciiDoc nur, dass irgendwo eine unerwartete UTF-8-Sequenz gefunden wurde, sagt aber nicht, wo genau.
-
-== Voraussetzungen
-* eingerichtetes Maven
-* erstelltes Maven-Projekt
-* Python 2.4 oder neuer (-> 2.7.13)
-* AsciiDoc 8.6.9
-
-CAUTION: AsciiDoc-Version 8.6.9 funktioniert mit Python 3.6 nicht.
-
-<<anchor-links, Siehe Links>>
-
-== Einbinden
-Volgender XML-Knoten muss in der Datei pom.xml unter build/plugins eingetragen werden, um AsciiDoc in Maven einzurichten.
-
-
-[source,xml]
-----
-<plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.3</version>
-</plugin>
-----
-
-Damit die Dokumente genereiert werden, muss unter dem plugin-Knoten folgendes eingetragen werden:
-
-[source,xml]
-----
-<executions>
- <execution>
- <id>output-html</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- </execution>
-</executions>
-----
-
-Mit dieser Konfiguration werden alle *.adoc Dateien aus dem Verzeichnis "src\main\asciidoc" verarbeitet und im Verzeichnis "target\generated-docs" werden Dokumentation im DocBook-Format erzeugt.
-
-== Einstellungen
-Per Konfiguration können vom Standard abweichende Einstellungen festlegen.
-Damit statt einem DocBook eine HTML-Seite erzeugt wird, muss unter dem Knoten "plugin"
-(oder unter dem Knoten "execution") folgende Konfiguration eingetragen werden.
-
-[source,xml]
-----
-<configuration>
- <backend>html</backend>
- <doctype>book</doctype>
-</configuration>
-----
-
-Damit wird eine HTML-Seite erzeugt. In dieser Seite ist ein CSS integriert. Man kann aber auch eine eigene CSS-Datei verwenden.
-Dazu wird unter dem configuration-Knoten folgendes eingetragen:
-
-[source,xml]
-----
-<attributes>
- <stylesheet>my-theme.css</stylesheet>
-</attributes>
-----
-
-Wenn die Konfiguration unter "execution" eingetragen wird, gilt sie nur für diese eine "Ablauf",
-und man kann weitere "Abläufe" mit abweichenden Einstellungen eintragen.
-Bpsw. kann neben HTML auch PDF generiert werden. Dazu wird unter "executions" folgender Knoten Eingetragen:
-
-[source,xml]
-----
-<execution>
- <id>output-pdf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
- <doctype>book</doctype>
- </configuration>
-</execution>
-----
-
-Das allein ist aber nicht ausreichend, denn es muss zusätzlich eine Referenz auf einen PDF-Generator definiert werden.
-Dazu werden unter dem Knoten "plugin" folgende Abhängigkeiten eingetragen:
-
-[source,xml]
-----
-<dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.0-alpha.11</version>
- </dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>1.7.21</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>1.5.4</version>
- </dependency>
-</dependencies>
-----
-
-Mit sourceDirectory und outputDirectory unter dem configuration-Knoten kann man alternative Pfade für Quell- und Zieldaten einstellen.
-
-[source,XML]
-----
-<sourceDirectory>src/main/doc</sourceDirectory>
-<outputDirectory>target/docs</outputDirectory>
-----
-
-Für das farbige Hervorheben vom Quelltext fügt man zur "configration" einen "sourceHighlighter"-Knoten.
-
-[source,xml]
-----
-<sourceHighlighter>coderay</sourceHighlighter>
-----
-
-Oder, man definiert die Hervorhebung im Dokument selber. Das sind dokumentübergreifende Attribute,
-d.h. sie wirken sich auf das ganze Dokument aus, unabhängig davon, an welcher Stelle sie eingetragen sind.
-Am besten definiert man solche Attribute am Anfang des Dokuments
-
-----------------------------------
-:source-highlighter: highlightjs
-:highlightjs-theme: solarized_dark
-----------------------------------
-
-WARNING: Wenn man Quelltexthervorhebung nur per Dokumentattribute definiert,
-reicht es nicht, zumindest wenn maven als Build verwendet wird. Anscheinend muss
-der Knoten "sourceHighlighter" in pom.xml vorhanden sein.
-
-=== Bilder
-
-Im pom.xml wird unter "configuration" das Bilder-Verzeichnis festgelegt.
-Die Pfadangaben bei den Bildern sind dan relativ zum festgelegten Pfad.
-
-[source,xml]
-----
-<imagesDir>./images</imagesDir>
-----
-
-image::ba.png[]
-
-^^ Bild
-
-=== Symbole
-
-Die Symbole werden im Dokument per Attribut :icon: aktiviert.
-Standardmäßig werden im Verzeichnis ./images/icons .PNG dateien erwartet,
-die in HTML-Seiten als Symbole angezeigt werden.
-
-Der name des Bildes entspricht der Bezeichnung des Symbols.
-
-.Zuordnung von Symbolen zu Bildernamen
-[options="header,footer"]
-|=========================================================
-|Symbol|Standardpfad|Verwendung
-|NOTE|./images/icons/note.png|NOTE: Notiz
-|TIP|./images/icons/tip.png|TIP: Empfehlung
-|IMPORTANT|./images/icons/important.png|IMPORTANT: Wichtig
-|CAUTION|./images/icons/caution.png|CAUTION: Achtung!
-|WARNING|./images/icons/warning.png|WARNING: Warnung
-|=========================================================
-
-TIP: Für PDF-Generierung sind keine Bilder für Symbole erforderlich. Da wird wohl was eigenes verwendet.
-
-== Ergebnisse
-Standardmäßig werden die Ergebnisse im Verzeichnis "target\generated-docs" abgelegt.
-Mit Standardeinstellungen wird eine DocBook-XML-Datei erzeugt. Diese kann benutzt werden, um mit der DocBook-Toolchain weitere Formate zu erzeugen, die vom AsciiDoc nicht erzeugt werden können.
-Die Erstellung von PDF und HTML wurde oben beschrieben.
-
-== Erstellen
-Mit folgendem Befehl werden die definierten Dokumente erstellt:
-
-[source,Batchfile]
-----
-mvn package
-----
-
-Wenn eine Änderung an der pom.xml sich nicht auswirkt, kann "Neu Erstellen" mit folgendem Befehl eingeleitet werden:
-
-[source,batch]
-----
-mvn clean dependency:copy-dependencies package
-----
-
-[[anchor-links]]
-== Nützliche Links
-* Auflistung der möglichen Formatierungen: http://powerman.name/doc/asciidoc
-* Noch eine auflistung der möglichen Formatierungen: http://asciidoctor.org/docs/asciidoc-writers-guide/
-* Maven in 5 Minutes: https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html
-* Einbinden des AsciiDoc in Maven: http://asciidoctor.org/docs/asciidoctor-maven-plugin/
-* Python 2.7.13: https://www.python.org/ftp/python/2.7.13/python-2.7.13.msi
-* AsciiDoc 8.6.9: http://sourceforge.net/projects/asciidoc/
-* CodeRay-Syntax-Highliter: http://coderay.rubychan.de
-* NextLevel Ascii-Doc: https://leanpub.com/awesomeasciidoctornotebook/read
\ No newline at end of file
diff --git a/src/main/asciidoc/InstallationAufUbuntu.adoc b/src/main/asciidoc/InstallationAufUbuntu.adoc
deleted file mode 100644
index cc6be4e..0000000
--- a/src/main/asciidoc/InstallationAufUbuntu.adoc
+++ /dev/null
@@ -1,38 +0,0 @@
-Wie richte ich AsciiDoc ein?
-============================
-:Author: Sergej Kern
-:Email: sergej.kern@pta.de
-:Date: 2017-07-12
-:Reviosion: 1
-
-== Voraussetzungen
-* Ubuntu 16.4.02 LTS
-
-CAUTION: AsciiDoc-Version 8.6.9 funktioniert mit Python 3.6 nicht.
-
-TIP: Maven ist nur eine der Möglichkeiten AsciiDoc in ein Build-Prozess einzubinden.
-
-<<anchor-links, Siehe Links>>
-
-== Installation
-
-[source,batchfile]
-----
-apt-get install maven asciidoc
-----
-
-Fertig.
-
-Damit wird die gesamte Tool-Chain von AsciiDoc+DocBook installiert, zusammen mit dblatex und docbook-xml bzw. -xslt,
-all das, was unter Windows entweder mühevoll zusammengesucht werden muss, oder eben gar nicht erst zur verfügung steht (z.B. dblatex).
-
-== Maven-Build erstellen
-
-link:GetStarted.html[Maven-Build]
-
-[[anchor-links]]
-== Nützliche Links
-* Auflistung der möglichen Formatierungen: http://powerman.name/doc/asciidoc
-* Einbinden des AsciiDoc in Maven: http://asciidoctor.org/docs/asciidoctor-maven-plugin/
-* AsciiDoc 8.6.9: http://sourceforge.net/projects/asciidoc/
-* CodeRay-Syntax-Highliter: http://coderay.rubychan.de
\ No newline at end of file
diff --git a/src/main/asciidoc/architectureDocumentation/elogbook_architectureDocumentation.adoc b/src/main/asciidoc/architectureDocumentation/elogbook_architectureDocumentation.adoc
index 65fa673..34cbad7 100644
--- a/src/main/asciidoc/architectureDocumentation/elogbook_architectureDocumentation.adoc
+++ b/src/main/asciidoc/architectureDocumentation/elogbook_architectureDocumentation.adoc
@@ -338,10 +338,8 @@
* Dependencies of modules to services realized by other modules have to be specified and documented explicitly.
* When CIM is not appropriate (like access management), other standards in their respective domain shall be taken into account first to avoid proprietary and inaccurate interfaces. The interface has also be documented in the overall openKONSEQUENZ interface profile and it should use REST & XML.
-The interfaces of the module eLogbook are described in:
-
-* TODO: Bezeichnung und Link einfügen
-
+The interfaces of the module eLogbook are described in the documentation *"elogbook_interfaceDocumentation"*.
+
=== Solution Strategy
The module eLogbook bases on a three-tier architecture:
@@ -355,13 +353,24 @@
=== Whitebox Overall System
The module eLogbook contains two components (see figure 2):
-
. *UI* - Represents the graphical user interface and consumes the services from the Business logic component via RESTful webservices.
. *Business Logic* - Realizes the business functionality and the data storage of the module.
.Module components
[options="header,footer"]
-image::ModuleComponents.png[Module components]
+[plantuml]
+----
+node Module {
+ rectangle UI
+ rectangle BusinessLogic
+
+ interface REST
+
+ UI -> REST
+ REST -- BusinessLogic
+}
+----
+ //REVIEW: Communication Links between the execution environments are required. (Background: There are various possibilities to communicate between Tomcat and postgres; architecture has to define which one to use)
Bases on the abstract concept mentioned above, the following figure shows the concrete realization of the main components.
The mapping from the abstract to the concrete view is as follows:
@@ -370,11 +379,30 @@
- elogbookFE-SPA
. Business Logic
- elogbook.war (Rest-Service)
- - elogbook-DB (in figure called: Betriebstagebuch DatenbankQU)
+ - elogbook-DB (in figure called: Betriebstagebuch Datenbank)
.Distribution of components
[options="header,footer"]
-image::DistributionOfComponents1.png[DistributionComp]
+[plantuml]
+----
+node ClientComputer {
+ node WebBrowser {
+ component elogbookFE_SPA
+ }
+}
+
+node openKonsequenz_LAN {
+ node ApacheTomcat {
+ component elogbook_war_RESTService
+ }
+ node PostgresDMBS {
+ component elogbook_Database
+ }
+}
+
+WebBrowser -(0- ApacheTomcat
+ApacheTomcat -(0- PostgresDMBS
+----
==== elogbook.war (Backend tier)
@@ -382,24 +410,36 @@
elogbookFE – SPA can use the functions in the frontend.
The elogbook.war runs on the Apache Tomcat in the DSO specific environments (in the figures shown as openKONSEQUENZ - LAN)
+ //REVIEW: Give rationale to the decision for Tomcat; also explain constraints/consequences of the decision (intent: Whenever openK chooses to switch to other application server implementations, they need to know)
+ // ? -> Demand of "Architecture committee"!
+
==== elogbook-DB (Database tier)
This component stores the data of the digital logbook. It provides an interface to the elogbook.war to create or
change data in the database.
-The elogbook-DB runs on a Postgre DBMS.
+The elogbook-DB runs on a Postgres DBMS.
+ //REVIEW: Give rationale to the decision for Postgres; also explain constraints/consequences of the decision (intent: Whenever openK chooses to switch to other database server implementations, they need to know)
+ // ? -> Demand of "Architecture committee"!
+
==== eLogbook-API
The eLogbook needs information from the system "SCADA". Therefore, it must provide an interface for receiving the according data, see figure 1.
+(see below "Import functionality")
+
=== Level 2
==== elogbookFE – SPA (Frontend tier)
-The frontend component implements the concept of a single-page application (SPA). The framework used is Angular2. It divides
-the elogbookFE into three layers:
+The frontend component implements the concept of a single-page application (SPA). The framework used is Angular2/4.
+(The decision was made on this framework because the "AngularJS" required in the "Architecture Committee Handbook" was already out of date at the time the project started)
+Because the frontend is only connected to the backend via REST-services, changing to another technology is rather easy.
+
+
+It divides the elogbookFE into three layers:
. *Components* - The components (Pages, Lists, Dialogs, Common Comp.) represent the presentation layer and the control layer. A component contains the control logic (.ts-file), an HTML-fragment as presentation description (.html-file) and a style definition (.css-file).
. *Services* - The service component communicates with the interfaces of the backend via HTTP requests by using the model component.
@@ -422,6 +462,8 @@
.. DAO
.. Model
+//REVIEW: Give a description for the layers and components. The mere list of their names is not very helpful
+
.Backend tier
[options="header,footer"]
image::BackendTier.png[]
@@ -468,7 +510,7 @@
eLogbookBackend->eLogbookFrontend: return service result
end
group Authorization failed
- eLogbookBackend->eLogbookFrontend: return HTTP Code 404
+ eLogbookBackend->eLogbookFrontend: return HTTP Code 401
end
end
....
@@ -486,7 +528,7 @@
First the frontend reads all users from the backend. After that the backend reads all current
responsibilities of Max (The backend determines "Max" from the given session info) and returns them.
-On the dialog "Schichübergabe" (->Shift change) Max assigns all of his current responsibilities to
+On the dialog "Schichtübergabe" (->Shift change) Max assigns all of his current responsibilities to
'Hugo' and 'Pete'. Both users are now *planned* for responsibilities.
@@ -526,7 +568,8 @@
....
After the dialog "Schichtübergabe" 'Pete' and 'Hugo' are stored as
-*planned responsibilies* for different combinations of grid terr./branch.
+*planned responsibilies* for different combinations of grid territory/branch.
+
.Pete logs in
[plantuml]
@@ -563,7 +606,6 @@
from 'planned' to 'current' in a single transaction. That means, that 'Pete'
is no longer planned for a set of responsibilities. From now on he is responsible
for them. In the same transaction the data of this process is stored as the historical data
-(this is described in another chapter).
When 'Hugo' logs in, it is the same process as for 'Pete'.
@@ -571,10 +613,37 @@
then that one will be kept with 'Max' as responsible person. 'Max' will then
need to plan it for another person.
+=== Import functionality
+
+Informations can be imported into the elogbook system. Therefore an exchange file directory can be defined (see below "Configuration of the backend").
+If there exist files in that directory, then the "Import"-Button changes its colour from blue to orange. An import file has to
+have to following structure:
+[source, text]
+----
+1: PROTOKOLL_STROM
+2: 08.09.2017 10:10:51 - 08.09.2017 10:22:04
+3:
+4:Betriebsart: Prozessführung
+5:Modus : Spalten-Filtern
+6:Verknüpfung: --------
+7:
+8:.............OW.........................................................................................................................
+9:16:12:51,425 OW Test text Offenbach Wasser
+10:ENDE
+11:
+12:08.09.2017 10:23:34
+----
+
+Only Line 9 will be imported. This line number can be configured in the backend:
+
+* "OW" means "Offenbach/Water" ("O"=Offenbach, "M"=Mannheim; "E" in the file means "S" in the branches, "W", "FW", "G" are mapped directly to the branches).
+* The text right to "OW" is imported as the notification text.
== Deployment View
-The elogbook application consists of 3 part regarding the deployment.
+The elogbook application consists of 3 parts regarding the deployment.
+
+ //REVIEW: Add pom.xml and repository names
. Frontend: "elogbookFE"-Directory
. Backend: "elogbook.war"
@@ -607,9 +676,15 @@
DB management applications like *pgAdminIII* or directly in the *postgres-console*.
These script can be found in the backend project in the directory
- <elogbook backend project directory>/db
+ <elogbook backend project directory>/db/postgreSQL
-CAUTION: Consider the order of the scripts!
+
+. If needed, create the Database and the access role "btbservice" with *"01_add_DB.sql"*
+. The script *"01a_drop_DB_1.0.0.sql"* is only needed for dropping all objects in the db!
+. Use the script *"02_create_DB_1.0.0.sql"* to create all database objects
+. You will probably need to modify the last script *"03_config_DB_1.0.0.sql"* before you run it. Configurate
+your branches, grid territories and your responsibilities here!
+
==== Configuration of the system
@@ -617,6 +692,9 @@
. Grid territories - The grid-territories have to be configured in the DB-Table *ref_grid_territory*
+ //REVIEW: This should be handled using the SQL scripts.
+ //REVIEW: Information on database server configuration is required, e.g. /var/lib/postgresql/data/pg_hba.conf. This should be documented or the significant settings should be committed to git
+
===== Configuration of the webserver
There exists the file *context.xml* in the "conf" subdirectory (*<TOMCAT>/conf*) of the target apache tomcat installation.
@@ -655,6 +733,8 @@
CAUTION: The postgres database driver (postgresql-42.0.0.jar) referenced in the *context.xml* needs to be copied from the lib folder within the
backend source files to the *<TOMCAT>/lib* folder of the target tomcat installation.
+(The jar is located in *deploy/lib/*)
+
===== Configuration of the backend
After the backend war file has been deployed and unpacked inside of the *<TOMCAT>/webapps* folder there are different
@@ -690,23 +770,32 @@
* *importFilesFolderPath* - Defines the exchange directory for the import functionality
+
=== CI- and CD-Components
==== GIT-Repository
-<TODO>
+Frontend Repository:
+http://git.eclipse.org/c/elogbook/elogbookFE.git/
+
+Backend Repository (containing this documentation and the db creation scripts)
+http://git.eclipse.org/c/elogbook/elogbook.git/
+
==== Hudson
<TODO>
+ //Review: Needs content
==== Sonar
<TODO>
+ //Review: Needs content
==== Code-Coverage of the Frontend - Karma-Istanbul-Output
<TODO>
+ //Review: Needs content
=== Continuous Deployment
@@ -726,6 +815,8 @@
starts on the hudson ci-server. If the Snapshot-build is successful, then
outcome of that build is directly deployed on the Dev-Environment.
+ //Review: This should be revised to reflect the eclipse environment. After all, the eclipse environment will be the long-term infrastructure
+
At the end of a scrum sprint or when a big userstory is realized, all
the code changes are merged from the *Snapshot*-Branch to the *Trunc*.
This automatically triggers the build and the deployment on the
@@ -733,35 +824,35 @@
CAUTION: Changes on the database are not deployed automatically!
-
== Design Decisions
All architecture decisions based on the Architecture Committee Handbook. There are no deviations.
-
== Quality Requirements
TODO: Muss noch beschrieben werden
+ //Review: Yes!
+ //Review: If we have I18N requirements: please document and provide the parameter files. For the moment, externalized json files are fine.
=== Quality Tree
TODO: Muss noch beschrieben werden
+ //Review: Yes!
=== Quality Scenarios
TODO: Muss noch beschrieben werden
-
-
+ //Review: Yes!
== Risks and Technical Debts
-(Muss noch beschrieben werden)
+(Currently there aren't any known issues)
<<<
== Glossary
-.Technical Contraints
+.Abbreviations and glossary terms
[options="header,footer"]
|========================================================
|Short|Long|German|Description
diff --git a/src/main/asciidoc/test/test.adoc b/src/main/asciidoc/test/test.adoc
deleted file mode 100644
index 7ed1d54..0000000
--- a/src/main/asciidoc/test/test.adoc
+++ /dev/null
@@ -1,157 +0,0 @@
-Wie richte ich AsciiDoc ein?
-============================
-:Author: Sergej Kern
-:Email: sergej.kern@pta.de
-:Date: 2017-07-12
-:Reviosion: 1
-
-== Das wichtigste
-IMPORTANT: Wenn andere Zeichen benutzt werden, als ANSI (d.h. immer), muss unbedingt darauf geachtet werden,
-dass die *.adoc-Dateien im UTF-8-Format gespeichert werden. Wenn eine Datei im ANSI-Format gespeichert ist,
-meldet AsciiDoc nur, dass irgendwo eine unerwartete UTF-8-Sequenz gefunden wurde, sagt aber nicht, wo genau.
-
-== Voraussetzungen
-* eingerichtetes Maven
-* Python 2.4 oder neuer (-> 2.7.13)
-* AsciiDoc 8.6.9
-
-CAUTION: AsciiDoc-Version 8.6.9 funktioniert mit Python 3.6 nicht.
-
-<<anchor-links, Siehe Links>>
-
-== Einbinden
-Volgender XML-Knoten muss in der Datei pom.xml unter build/plugins eingetragen werden, um AsciiDoc in Maven einzurichten.
-
-[source,xml]
-----
-<plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.3</version>
-</plugin>
-----
-
-Damit die Dokumente genereiert werden, muss unter dem plugin-Knoten folgendes eingetragen werden:
-
-[source,xml]
-----
-<executions>
- <execution>
- <id>output-html</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- </execution>
-</executions>
-----
-
-Mit dieser Konfiguration werden alle *.adoc Dateien aus dem Verzeichnis "src\main\asciidoc" verarbeitet und im Verzeichnis "target\generated-docs" werden Dokumentation im DocBook-Format erzeugt.
-
-== Einstellungen
-Per Konfiguration können vom Standard abweichende Einstellungen festlegen.
-Damit statt einem DocBook eine HTML-Seite erzeugt wird, muss unter dem Knoten "plugin"
-(oder unter dem Knoten "execution") folgende Konfiguration eingetragen werden.
-
-[source,xml]
-----
-<configuration>
- <backend>html</backend>
- <doctype>book</doctype>
-</configuration>
-----
-
-Damit wird eine HTML-Seite erzeugt. In dieser Seite ist ein CSS integriert. Man kann aber auch eine eigene CSS-Datei verwenden.
-Dazu wird unter dem configuration-Knoten folgendes eingetragen:
-
-[source,xml]
-----
-<attributes>
- <stylesheet>my-theme.css</stylesheet>
-</attributes>
-----
-
-Wenn die Konfiguration unter "execution" eingetragen wird, gilt sie nur für diese eine "Ablauf",
-und man kann weitere "Abläufe" mit abweichenden Einstellungen eintragen.
-Bpsw. kann neben HTML auch PDF generiert werden. Dazu wird unter "executions" folgender Knoten Eingetragen:
-
-[source,xml]
-----
-<execution>
- <id>output-pdf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
- <doctype>book</doctype>
- </configuration>
-</execution>
-----
-
-Das allein ist aber nicht ausreichend, denn es muss zusätzlich eine Referenz auf einen PDF-Generator definiert werden.
-Dazu werden unter dem Knoten "plugin" folgende Abhängigkeiten eingetragen:
-
-[source,xml]
-----
-<dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.0-alpha.11</version>
- </dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>1.7.21</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>1.5.4</version>
- </dependency>
-</dependencies>
-----
-
-Mit sourceDirectory und outputDirectory unter dem configuration-Knoten kann man alternative Pfade für Quell- und Zieldaten einstellen.
-
-[source,xml]
-----
-<sourceDirectory>src/main/doc</sourceDirectory>
-<outputDirectory>target/docs</outputDirectory>
-----
-
-Für das farbige Hervorheben vom Quelltext fügt man zur "configration" einen "sourceHighlighter"-Knoten.
-
-[source,xml]
-----
-<sourceHighlighter>coderay</sourceHighlighter>
-----
-
-== Ergebnisse
-Standardmäßig werden die Ergebnisse im Verzeichnis "target\generated-docs" abgelegt.
-Mit Standardeinstellungen wird eine DocBook-XML-Datei erzeugt. Diese kann benutzt werden, um mit der DocBook-Toolchain weitere Formate zu erzeugen, die vom AsciiDoc nicht erzeugt werden können.
-
-== Erstellen
-Mit folgendem Befehl werden die definierten Dokumente erstellt:
-
-[source,batch]
-----
-mvn package
-----
-
-Wenn eine Änderung an der pom.xml sich nicht auswirkt, kann "Neu Erstellen" mit folgendem Befehl eingeleitet werden:
-
-[source,batch]
-----
-mvn clean dependency:copy-dependencies package
-----
-
-[[anchor-links]]
-== Nützliche Links
-* Auflistung der möglichen Formatierungen: http://powerman.name/doc/asciidoc
-* Einbinden des AsciiDoc in Maven: http://asciidoctor.org/docs/asciidoctor-maven-plugin/
-* Python 2.7.13: https://www.python.org/ftp/python/2.7.13/python-2.7.13.msi
-* AsciiDoc 8.6.9: http://sourceforge.net/projects/asciidoc/
-* CodeRay-Syntax-Highliter: http://coderay.rubychan.de
\ No newline at end of file
diff --git a/src/main/java/org/eclipse/openk/elogbook/common/Globals.java b/src/main/java/org/eclipse/openk/elogbook/common/Globals.java
index 889a819..409c3ec 100644
--- a/src/main/java/org/eclipse/openk/elogbook/common/Globals.java
+++ b/src/main/java/org/eclipse/openk/elogbook/common/Globals.java
@@ -8,19 +8,6 @@
public static final int MAX_CREDENTIALS_LENGTH = 500;
public static final int MAX_NOTIFICATION_LENGTH = 16384;
- public static final int HTTPSTATUS_OK = 200;
- public static final int HTTPSTATUS_BAD_REQUEST = 400;
- public static final int HTTPSTATUS_UNAUTHORIZED = 401;
- public static final int HTTPSTATUS_FORBIDDEN = 403;
- public static final int HTTPSTATUS_NOT_FOUND = 404;
- public static final int HTTPSTATUS_GONE = 410;
- public static final int HTTPSTATUS_LOCKED = 423;
- public static final int HTTPSTATUS_INTERNAL_SERVER_ERROR = 500;
- public static final int HTTPSTATUS_NOT_AVAILABLE = 503;
- public static final int HTTPSTATUS_POLICY_NOT_FULFILLED = 420;
- public static final int HTTPSTATUS_CONFLICT = 409;
- public static final int HTTPSTATUS_DECISION = 900;
-
//For Branches: for later use in a configurable json
public static final String ELECTRICITY_MARK = "S";
public static final String GAS_MARK = "G";
diff --git a/src/main/java/org/eclipse/openk/elogbook/communication/RestServiceWrapper.java b/src/main/java/org/eclipse/openk/elogbook/communication/RestServiceWrapper.java
index 75672a1..0291bf5 100644
--- a/src/main/java/org/eclipse/openk/elogbook/communication/RestServiceWrapper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/communication/RestServiceWrapper.java
@@ -1,8 +1,7 @@
package org.eclipse.openk.elogbook.communication;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -16,13 +15,12 @@
import org.apache.log4j.Logger;
import org.eclipse.openk.elogbook.auth2.util.JwtHelper;
import org.eclipse.openk.elogbook.common.Globals;
-import org.eclipse.openk.elogbook.exceptions.BtbException;
-import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
-import org.eclipse.openk.elogbook.exceptions.BtbNestedException;
-import org.eclipse.openk.elogbook.exceptions.BtbServiceUnavailable;
-import org.eclipse.openk.elogbook.exceptions.BtbUnauthorized;
+import org.eclipse.openk.elogbook.exceptions.*;
import org.eclipse.openk.elogbook.viewmodel.ErrorReturn;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
public class RestServiceWrapper {
private static final Logger LOGGER = Logger.getLogger(RestServiceWrapper.class.getName());
private String baseURL;
@@ -126,7 +124,7 @@
throw new BtbInternalServerError("IOException");
}
- if (response.getStatusLine().getStatusCode() != Globals.HTTPSTATUS_OK) {
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
ErrorReturn errorReturn = new ErrorReturn();
errorReturn.setErrorCode(response.getStatusLine().getStatusCode());
errorReturn.setErrorText(response.getStatusLine().getReasonPhrase());
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java b/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java
index 747f142..440cdea 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java
@@ -1,15 +1,16 @@
package org.eclipse.openk.elogbook.controller;
-import java.util.HashMap;
-import java.util.Map;
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpStatus;
import org.apache.log4j.Logger;
import org.eclipse.openk.elogbook.auth2.model.JwtPayload;
import org.eclipse.openk.elogbook.auth2.util.JwtHelper;
-import org.eclipse.openk.elogbook.common.Globals;
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.eclipse.openk.elogbook.exceptions.BtbExceptionMapper;
+import javax.ws.rs.core.Response;
+import java.util.HashMap;
+import java.util.Map;
+
public abstract class BaseWebService {
public enum SecureType {NONE, NORMAL, HIGH}
private final Map<String, Long> currentTimeMeasures = new HashMap<>();
@@ -67,7 +68,7 @@
} catch (Exception e) {
logger.error("Unexpected exception", e);
- return Response.status(Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR).build();
+ return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).build();
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java b/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java
index d865a72..51d5fb6 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java
@@ -1,5 +1,6 @@
package org.eclipse.openk.elogbook.controller;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.elogbook.common.Globals;
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
@@ -16,7 +17,7 @@
}
private Response.ResponseBuilder getResponseBuilder(byte[] json) {
- return Response.status(Globals.HTTPSTATUS_OK).entity(json)
+ return Response.status(HttpStatus.SC_OK).entity(json)
.header("Content-Type", "application/json; charset=utf-8")
.header("X-XSS-Protection", "1; mode = block")
.header("X-DNS-Prefetch-Control", "off")
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbBadRequest.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbBadRequest.java
index bc69928..c068f62 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbBadRequest.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbBadRequest.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbBadRequest extends BtbException {
public BtbBadRequest() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_BAD_REQUEST;
+ return HttpStatus.SC_BAD_REQUEST;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbConflict.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbConflict.java
index cc06364..e3dfbe6 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbConflict.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbConflict.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbConflict extends BtbException {
public BtbConflict() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_CONFLICT;
+ return HttpStatus.SC_CONFLICT;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbDecision.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbDecision.java
deleted file mode 100644
index ad849bd..0000000
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbDecision.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.openk.elogbook.exceptions;
-
-import org.eclipse.openk.elogbook.common.Globals;
-
-public class BtbDecision extends BtbException {
- public BtbDecision() {
- super();
- }
-
- public BtbDecision(String message) {
- super(message);
- }
-
- @Override
- public int getHttpStatus() {
- return Globals.HTTPSTATUS_DECISION;
- }
-}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionMapper.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionMapper.java
index 4ff1ba3..a54432b 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionMapper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionMapper.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.elogbook.common.JsonGeneratorBase;
import org.eclipse.openk.elogbook.viewmodel.ErrorReturn;
import org.eclipse.openk.elogbook.viewmodel.GeneralReturnItem;
@@ -11,7 +11,7 @@
public static String unknownErrorToJson() {
ErrorReturn er = new ErrorReturn();
er.setErrorText("Unknown Error");
- er.setErrorCode(Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR);
+ er.setErrorCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
return JsonGeneratorBase.getGson().toJson(er);
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbForbidden.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbForbidden.java
index ccc222d..74f52eb 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbForbidden.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbForbidden.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbForbidden extends BtbException {
public BtbForbidden() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_FORBIDDEN;
+ return HttpStatus.SC_FORBIDDEN;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbGone.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbGone.java
index 79dd57c..522ef7f 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbGone.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbGone.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbGone extends BtbException {
public BtbGone() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_GONE;
+ return HttpStatus.SC_GONE;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbInternalServerError.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbInternalServerError.java
index e226923..8b8743d 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbInternalServerError.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbInternalServerError.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbInternalServerError extends BtbException {
public BtbInternalServerError(String message) {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR;
+ return HttpStatus.SC_INTERNAL_SERVER_ERROR;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbLocked.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbLocked.java
index c10a3ce..2e5ed05 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbLocked.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbLocked.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbLocked extends BtbException {
public BtbLocked() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_LOCKED;
+ return HttpStatus.SC_LOCKED;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbNotFound.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbNotFound.java
index 4f496fe..f1c8984 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbNotFound.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbNotFound.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbNotFound extends BtbException {
public BtbNotFound() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_NOT_FOUND;
+ return HttpStatus.SC_NOT_FOUND;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbPolicyNotFulfilled.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbPolicyNotFulfilled.java
index dd40245..0eeaf98 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbPolicyNotFulfilled.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbPolicyNotFulfilled.java
@@ -1,7 +1,7 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbPolicyNotFulfilled extends BtbException {
public BtbPolicyNotFulfilled() {
@@ -14,7 +14,7 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_POLICY_NOT_FULFILLED;
+ return HttpStatus.SC_METHOD_FAILURE;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbServiceUnavailable.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbServiceUnavailable.java
index ad99408..f5c2393 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbServiceUnavailable.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbServiceUnavailable.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbServiceUnavailable extends BtbException {
public BtbServiceUnavailable() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_NOT_AVAILABLE;
+ return HttpStatus.SC_SERVICE_UNAVAILABLE;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbUnauthorized.java b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbUnauthorized.java
index d8d346b..a5001ed 100644
--- a/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbUnauthorized.java
+++ b/src/main/java/org/eclipse/openk/elogbook/exceptions/BtbUnauthorized.java
@@ -1,6 +1,6 @@
package org.eclipse.openk.elogbook.exceptions;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
public class BtbUnauthorized extends BtbException {
public BtbUnauthorized() {
@@ -13,6 +13,6 @@
@Override
public int getHttpStatus() {
- return Globals.HTTPSTATUS_UNAUTHORIZED;
+ return HttpStatus.SC_UNAUTHORIZED;
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/rest/BackendRestService.java b/src/main/java/org/eclipse/openk/elogbook/rest/BackendRestService.java
index 598d5b6..0154c94 100644
--- a/src/main/java/org/eclipse/openk/elogbook/rest/BackendRestService.java
+++ b/src/main/java/org/eclipse/openk/elogbook/rest/BackendRestService.java
@@ -1,30 +1,14 @@
package org.eclipse.openk.elogbook.rest;
+import org.apache.http.HttpStatus;
import org.apache.log4j.Logger;
import org.eclipse.openk.elogbook.common.Globals;
-import org.eclipse.openk.elogbook.controller.BackendControllerNotification;
-import org.eclipse.openk.elogbook.controller.BackendControllerNotificationFile;
-import org.eclipse.openk.elogbook.controller.BackendControllerRefInfo;
-import org.eclipse.openk.elogbook.controller.BackendControllerResponsibility;
-import org.eclipse.openk.elogbook.controller.BackendControllerUser;
-import org.eclipse.openk.elogbook.controller.BackendControllerVersionInfo;
-import org.eclipse.openk.elogbook.controller.BaseWebService;
-import org.eclipse.openk.elogbook.controller.ControllerImplementations;
+import org.eclipse.openk.elogbook.controller.*;
import org.eclipse.openk.elogbook.controller.ControllerImplementations.GetCurrentResponsibilities;
-import org.eclipse.openk.elogbook.controller.ResponseBuilderWrapper;
-import org.eclipse.openk.elogbook.controller.TokenManager;
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.eclipse.openk.elogbook.exceptions.BtbExceptionMapper;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
@@ -313,7 +297,7 @@
return Response.status(errcode).entity(retJson).build();
} else {
logger.error("Unexpected exception", e);
- return Response.status(Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR)
+ return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
.entity(BtbExceptionMapper.getGeneralErrorJson()).build();
}
}
diff --git a/src/test/java/org/eclipse/openk/elogbook/controller/BaseWebServiceTest.java b/src/test/java/org/eclipse/openk/elogbook/controller/BaseWebServiceTest.java
index 128f20c..91ba639 100644
--- a/src/test/java/org/eclipse/openk/elogbook/controller/BaseWebServiceTest.java
+++ b/src/test/java/org/eclipse/openk/elogbook/controller/BaseWebServiceTest.java
@@ -1,24 +1,7 @@
package org.eclipse.openk.elogbook.controller;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.annotation.Annotation;
-import java.net.URI;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import javax.ws.rs.core.EntityTag;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.elogbook.auth2.model.JwtToken;
-import org.eclipse.openk.elogbook.common.Globals;
import org.eclipse.openk.elogbook.common.JsonGeneratorBase;
import org.eclipse.openk.elogbook.common.util.ResourceLoaderBase;
import org.eclipse.openk.elogbook.controller.BaseWebService.SecureType;
@@ -28,6 +11,16 @@
import org.junit.Assert;
import org.junit.Test;
+import javax.ws.rs.core.*;
+import java.lang.annotation.Annotation;
+import java.net.URI;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
public class BaseWebServiceTest extends ResourceLoaderBase {
private static final org.apache.log4j.Logger EMPTYLOGGER = org.apache.log4j.Logger
.getLogger(BaseWebServiceTest.class.getName());
@@ -81,7 +74,7 @@
ti.exceptionToThrow = new BtbBadRequest();
Response ret = tws.invoke(jwtToken.getAccessToken(), BaseWebService.SecureType.NORMAL, ti);
- Assert.assertEquals(ret.getStatus(), Globals.HTTPSTATUS_BAD_REQUEST);
+ Assert.assertEquals(ret.getStatus(), HttpStatus.SC_BAD_REQUEST);
}
@Test
@@ -91,7 +84,7 @@
ti.throwRuntime = true;
Response ret = tws.invoke(jwtToken.getAccessToken(), BaseWebService.SecureType.NORMAL, ti);
- assertEquals(ret.getStatus(), Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR);
+ assertEquals(ret.getStatus(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
}
@Test
@@ -100,7 +93,7 @@
TestInvokable ti = new TestInvokable();
tws.throwUnauthException = true;
Response ret = tws.invoke(jwtToken.getAccessToken(), BaseWebService.SecureType.NORMAL, ti);
- assertEquals(ret.getStatus(), Globals.HTTPSTATUS_UNAUTHORIZED);
+ assertEquals(ret.getStatus(), HttpStatus.SC_UNAUTHORIZED);
}
@Test
diff --git a/src/test/java/org/eclipse/openk/elogbook/controller/ControllerImplementationsTest.java b/src/test/java/org/eclipse/openk/elogbook/controller/ControllerImplementationsTest.java
index 1cc5b86..8c324b8 100644
--- a/src/test/java/org/eclipse/openk/elogbook/controller/ControllerImplementationsTest.java
+++ b/src/test/java/org/eclipse/openk/elogbook/controller/ControllerImplementationsTest.java
@@ -3,7 +3,7 @@
//TODO create Mock for ControllerImplementations (must not use BackendController)
import junit.framework.TestCase;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.elogbook.common.util.ResourceLoaderBase;
import org.eclipse.openk.elogbook.controller.ControllerImplementations.GetAllResponsibilities;
import org.eclipse.openk.elogbook.controller.ControllerImplementations.GetCurrentResponsibilities;
@@ -61,7 +61,7 @@
expect(beMockResponsibility.getCurrentResponsibilities("modUserTest" )).andReturn(emptyList);
PowerMock.replay(beMockResponsibility);
- TestCase.assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ TestCase.assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -73,7 +73,7 @@
expect(beMockResponsibility.getPlannedResponsibilities("modUserTest" )).andReturn(emptyList);
PowerMock.replay(beMockResponsibility);
- TestCase.assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ TestCase.assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -84,7 +84,7 @@
expect(beMockResponsibility.getAllResponsibilities()).andReturn(allResponsibilitiesList);
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -97,7 +97,7 @@
expect(beMockResponsibility.getHistoricalResponsibilitiesByTransactionId(anyObject())).andReturn(territoryResponsibilities);
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -109,7 +109,7 @@
expect(beMockNotification.getSearchResults(anyObject())).andReturn(notifications);
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -121,7 +121,7 @@
controllerImpl.setUserId(1);
expect(beMockNotification.getNotifications(Notification.ListType.OPEN, null)).andReturn(emptyList);
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
assertEquals(controllerImpl.getUserId(), 1);
}
@@ -137,7 +137,7 @@
expect(beMockNotification.getNotificationsWithReminder(null)).andReturn(notificationsWithReminderList);
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
assertEquals(controllerImpl.getUserId(), 1);
}
@@ -154,7 +154,7 @@
expect(beMockResponsibility.getHistoricalShiftChanges(null)).andReturn(historicalShiftChanges);
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
assertEquals(controllerImpl.getUserId(), 1);
}
@@ -168,7 +168,7 @@
expect(beMockResponsibility.getIsObserver("modUserTest")).andReturn(isObserver);
PowerMock.replay(beMockResponsibility);
Response resp = controllerImpl.invoke();
- assertEquals(resp.getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(resp.getStatus(), HttpStatus.SC_OK);
assertEquals(resp.hasEntity(), true);
assertEquals(controllerImpl.getModUser(), "modUserTest");
}
@@ -197,7 +197,7 @@
expect(beMockResponsibility.planResponsibilities(territoryResponsibilityList, "modUser")).andReturn(null);
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
}
@@ -211,7 +211,7 @@
expect(beMockResponsibility.planResponsibilities(anyObject(), anyString())).andReturn(new ArrayList<>());
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
}
@@ -225,7 +225,7 @@
expect(beMockResponsibility.confirmResponsibilities(territoryResponsiblityList, "modUser")).andReturn(null);
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
}
@@ -238,7 +238,7 @@
expect(beMockResponsibility.confirmResponsibilities(anyObject(), anyString())).andReturn(new ArrayList<>());
PowerMock.replay(beMockResponsibility);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
assertEquals(controllerImpl.getModUser(), "EgalUser");
}
@@ -251,7 +251,7 @@
expect(beMockVersionInfo.getVersionInfo()).andReturn(vi);
PowerMock.replay(beMockVersionInfo);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -264,7 +264,7 @@
expect(beMockRefInfo.getBranches()).andReturn(rbList);
PowerMock.replay(beMockRefInfo);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -277,7 +277,7 @@
expect(beMockRefInfo.getGridTerritories()).andReturn(gridTerritories);
PowerMock.replay(beMockRefInfo);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -290,7 +290,7 @@
expect(beMockRefInfo.getNotificationStatuses()).andReturn(nsList);
PowerMock.replay(beMockRefInfo);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@@ -303,7 +303,7 @@
expect(beMockNotification.createNotification(anyObject(), anyObject())).andReturn(new Notification());
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test(expected = BtbBadRequest.class)
@@ -313,7 +313,7 @@
expect(beMockNotification.createNotification(anyObject(), anyObject())).andReturn(new Notification());
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -324,7 +324,7 @@
expect(beMockNotification.getNotificationById(anyObject())).andReturn(new Notification());
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -335,7 +335,7 @@
expect(beMockNotification.getActiveNotifications()).andReturn(new ArrayList<>());
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -346,7 +346,7 @@
expect(beMockNotification.getNotificationByIncidentId(anyInt())).andReturn(new ArrayList<>());
PowerMock.replay(beMockNotification);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -357,7 +357,7 @@
expect(beMockUser.getAssignedUserSuggestions()).andReturn(assignedUserSuggestionsList);
PowerMock.replay(beMockUser);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -368,7 +368,7 @@
expect(beMockNotificationFile.getNotificationsFiles("getImportFiles")).andReturn(new ArrayList<>());
PowerMock.replay(beMockNotificationFile);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -380,7 +380,7 @@
expect(beMockNotificationFile.deleteImportedFile(fileName)).andReturn(true);
PowerMock.replay(beMockNotificationFile);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -391,7 +391,7 @@
expect(beMockNotificationFile.getNotificationsFiles("importFile")).andReturn(new ArrayList<>());
PowerMock.replay(beMockNotificationFile);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
@Test
@@ -403,6 +403,6 @@
expect(beMockBackendControllerUser.getUsers(token)).andReturn(new ArrayList<>());
PowerMock.replay(beMockBackendControllerUser);
- assertEquals(controllerImpl.invoke().getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals(controllerImpl.invoke().getStatus(), HttpStatus.SC_OK);
}
}
diff --git a/src/test/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapperTest.java b/src/test/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapperTest.java
index 180a87d..ecba703 100644
--- a/src/test/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapperTest.java
+++ b/src/test/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapperTest.java
@@ -1,14 +1,15 @@
package org.eclipse.openk.elogbook.controller;
-import static org.junit.Assert.assertEquals;
-
-import javax.ws.rs.core.Response;
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
import org.junit.Test;
+import javax.ws.rs.core.Response;
+
+import static org.junit.Assert.assertEquals;
+
public class ResponseBuilderWrapperTest {
@Test
@@ -16,17 +17,17 @@
String json = "{ 'ret' : 'OK' }";
Response.ResponseBuilder rb = ResponseBuilderWrapper.INSTANCE.getResponseBuilder( json );
Response resp = rb.build();
- assertEquals(resp.getStatus(), Globals.HTTPSTATUS_OK );
+ assertEquals(resp.getStatus(), HttpStatus.SC_OK );
}
@Test
public void testBuildOkResponse() throws BtbException {
String json = "{ 'test' : 'Value' }";
Response resp = ResponseBuilderWrapper.INSTANCE.buildOKResponse( json );
- assertEquals( resp.getStatus(), Globals.HTTPSTATUS_OK );
+ assertEquals( resp.getStatus(), HttpStatus.SC_OK );
resp = ResponseBuilderWrapper.INSTANCE.buildOKResponse(json, "ssess");
- assertEquals( resp.getStatus(), Globals.HTTPSTATUS_OK);
+ assertEquals( resp.getStatus(), HttpStatus.SC_OK);
}
/*
@Test( expected = BtbInternalServerError.class)
diff --git a/src/test/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionsTest.java b/src/test/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionsTest.java
index e1cda6e..76132fd 100644
--- a/src/test/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionsTest.java
+++ b/src/test/java/org/eclipse/openk/elogbook/exceptions/BtbExceptionsTest.java
@@ -1,26 +1,25 @@
package org.eclipse.openk.elogbook.exceptions;
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.openk.elogbook.common.Globals;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.elogbook.viewmodel.ErrorReturn;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class BtbExceptionsTest {
@Test
public void testConstructors() {
- assertEquals(new BtbBadRequest().getHttpStatus(), Globals.HTTPSTATUS_BAD_REQUEST);
- assertEquals(new BtbConflict().getHttpStatus(), Globals.HTTPSTATUS_CONFLICT);
- assertEquals(new BtbDecision().getHttpStatus(), Globals.HTTPSTATUS_DECISION);
- assertEquals(new BtbForbidden().getHttpStatus(), Globals.HTTPSTATUS_FORBIDDEN);
- assertEquals(new BtbGone().getHttpStatus(), Globals.HTTPSTATUS_GONE);
- assertEquals(new BtbInternalServerError(null, null).getHttpStatus(), Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR);
- assertEquals(new BtbLocked().getHttpStatus(), Globals.HTTPSTATUS_LOCKED);
- assertEquals(new BtbNotFound().getHttpStatus(), Globals.HTTPSTATUS_NOT_FOUND);
- assertEquals(new BtbPolicyNotFulfilled().getHttpStatus(), Globals.HTTPSTATUS_POLICY_NOT_FULFILLED);
- assertEquals(new BtbServiceUnavailable().getHttpStatus(), Globals.HTTPSTATUS_NOT_AVAILABLE);
- assertEquals(new BtbUnauthorized().getHttpStatus(), Globals.HTTPSTATUS_UNAUTHORIZED);
+ assertEquals(new BtbBadRequest().getHttpStatus(), HttpStatus.SC_BAD_REQUEST);
+ assertEquals(new BtbConflict().getHttpStatus(), HttpStatus.SC_CONFLICT);
+ assertEquals(new BtbForbidden().getHttpStatus(), HttpStatus.SC_FORBIDDEN);
+ assertEquals(new BtbGone().getHttpStatus(), HttpStatus.SC_GONE);
+ assertEquals(new BtbInternalServerError(null, null).getHttpStatus(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
+ assertEquals(new BtbLocked().getHttpStatus(), HttpStatus.SC_LOCKED);
+ assertEquals(new BtbNotFound().getHttpStatus(), HttpStatus.SC_NOT_FOUND);
+ assertEquals(new BtbPolicyNotFulfilled().getHttpStatus(), HttpStatus.SC_METHOD_FAILURE);
+ assertEquals(new BtbServiceUnavailable().getHttpStatus(), HttpStatus.SC_SERVICE_UNAVAILABLE);
+ assertEquals(new BtbUnauthorized().getHttpStatus(), HttpStatus.SC_UNAUTHORIZED);
}
@@ -29,7 +28,6 @@
final String extext = "ExText";
assertEquals(new BtbBadRequest(extext).getMessage(), extext);
assertEquals(new BtbConflict(extext).getMessage(), extext);
- assertEquals(new BtbDecision(extext).getMessage(), extext);
assertEquals(new BtbForbidden(extext).getMessage(), extext);
assertEquals(new BtbGone(extext).getMessage(), extext);
assertEquals(new BtbInternalServerError(extext).getMessage(), extext);
