Commit 1d14a303a61fa03e9b58c87717b745f1d1daf81d

Authored by mfcb
1 parent 593f3d06

Merge remote-tracking branch 'remotes/origin/development'

# Conflicts:
#	docu/project_documentation.md
.gitignore
... ... @@ -19,6 +19,7 @@ docker/wildfly/volumes/logs/
19 19 **/.DS_Store
20 20 .idea
21 21 .gradle
  22 +.ipr
22 23 bht-chatbot.iml
23 24 BeuthBot.iml
24 25 target/
... ...
docu/infrastructure.md
... ... @@ -24,6 +24,7 @@ To read the story behind a very nasty issue with global entity classes, see [Why
24 24 - Common - holding common classes used by all other subprojects
25 25 - [Drools](drools.md) - Business Rules Management System used to generate the right answer
26 26 - Global - global available services
  27 +- [Scheduler] (scheduler.md) - Scheduling EJB, used to create and handle reminders.
27 28  
28 29 ### Natural Language Processing
29 30  
... ...
docu/project_documentation.md deleted 100755 → 0
1   -# BHT-Chatbot Project
2   -The hole project is build by gradle and divided into a couple of subprojects (cf. [Subprojects section](#subprojects) ).
3   -Each module is loosely connected through a Java Message Service. The application is running on a Jboss Wildfly
4   -inside of a docker container. Another docker container is used for the Rasa backend.
5   -
6   -## Infrastructure
7   -- see [docker compose file](../docker/docker-compose.yml)
8   -
9   -The productive project is represented by a separate Git repository in absent of a continuous integration server.
10   -Pushing into this repository will automatically trigger a rebuild of the productive environment.
11   -- confer [post-receive](../scripts/post-receive) - Git hook for auto deploying the application
12   -
13   -### Subprojects
14   -
15   -#### MainBot
16   -- [Canteen Parser](canteenParser.md) - web crawler for collecting data of the beuth university canteen
17   -- Common - holding common classes used by all other subprojects
18   -- [Drools](drools.md) - Business Rules Management System used to generate the right answer
19   -- Global - global available services
20   -- [Scheduler] (scheduler.md) - Scheduling EJB, used to create and handle reminders.
21   -
22   -#### Natural Language Processing
23   -- [ApiAi](apiai.md) - simple RESTEasy client application calling googles Api.ai API
24   -- [Rasa](rasa.md) - simple RESTEasy client application calling the rasa backend rest API
25   -
26   -#### Messenger
27   -- [Facebook](facebook.md) - Facebook Messenger connector
28   -- [Telegram](telegram.md) - Telegram Messenger connector
29   -
30   -#### Text <-> Speech Processing
31   -- [Bing Speech](binspeechapi.md) - REST client for Microsofts Bing Speech API
32 0 \ No newline at end of file