Commit a93a17b1f4bd561e356b2f2ed96939190352e413

Authored by mfcb
1 parent 2be96953

Neue Rasa-Entities eingebaut.

BeuthBot.ipr
@@ -581,8 +581,8 @@ @@ -581,8 +581,8 @@
581 <element id="artifact" artifact-name="Gradle : BeuthBot.services : telegram.war (exploded)" /> 581 <element id="artifact" artifact-name="Gradle : BeuthBot.services : telegram.war (exploded)" />
582 </root> 582 </root>
583 </artifact> 583 </artifact>
584 - <artifact type="exploded-war" name="Gradle : BeuthBot.services : scheduler.war (exploded)">  
585 - <output-path>$PROJECT_DIR$/docker/wildfly/volumes/deployments/exploded/scheduler.war</output-path> 584 + <artifact type="exploded-war" name="Gradle : BeuthBot.services : jsonrequester.war (exploded)">
  585 + <output-path>$PROJECT_DIR$/docker/wildfly/volumes/deployments/exploded/jsonrequester.war</output-path>
586 <properties id="gradle-properties"> 586 <properties id="gradle-properties">
587 <options external-project-path="$PROJECT_DIR$"> 587 <options external-project-path="$PROJECT_DIR$">
588 <manifest>TWFuaWZlc3QtVmVyc2lvbjogMS4wDQoNCg==</manifest> 588 <manifest>TWFuaWZlc3QtVmVyc2lvbjogMS4wDQoNCg==</manifest>
@@ -590,13 +590,13 @@ @@ -590,13 +590,13 @@
590 </properties> 590 </properties>
591 <root id="root"> 591 <root id="root">
592 <element id="directory" name="META-INF"> 592 <element id="directory" name="META-INF">
593 - <element id="file-copy" path="$PROJECT_DIR$/docker/wildfly/volumes/deployments/exploded/scheduler.war/META-INF/MANIFEST.MF" /> 593 + <element id="file-copy" path="$PROJECT_DIR$/docker/wildfly/volumes/deployments/exploded/jsonrequester.war/META-INF/MANIFEST.MF" />
594 </element> 594 </element>
595 - <element id="javaee-facet-resources" facet="Scheduler_main/web/Web Gradle : scheduler.war" /> 595 + <element id="javaee-facet-resources" facet="JSONRequester_main/web/Web Gradle : jsonrequester.war" />
596 <element id="directory" name="WEB-INF"> 596 <element id="directory" name="WEB-INF">
597 <element id="directory" name="classes"> 597 <element id="directory" name="classes">
598 - <element id="module-output" name="Scheduler_main" />  
599 - <element id="dir-copy" path="$PROJECT_DIR$/services/Scheduler/out/production/resources" /> 598 + <element id="module-output" name="JSONRequester_main" />
  599 + <element id="dir-copy" path="$PROJECT_DIR$/services/JSONRequester/out/production/resources" />
600 </element> 600 </element>
601 <element id="directory" name="lib"> 601 <element id="directory" name="lib">
602 <element id="archive" name="BeuthBot.services-Common.jar"> 602 <element id="archive" name="BeuthBot.services-Common.jar">
@@ -633,18 +633,19 @@ @@ -633,18 +633,19 @@
633 <element id="library" level="project" name="Gradle: javax.interceptor:javax.interceptor-api:1.2" /> 633 <element id="library" level="project" name="Gradle: javax.interceptor:javax.interceptor-api:1.2" />
634 <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" /> 634 <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" />
635 <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpmime:4.3.1" /> 635 <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpmime:4.3.1" />
  636 + <element id="library" level="project" name="Gradle: org.json:json:20160810" />
636 <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" /> 637 <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" />
637 </element> 638 </element>
638 </element> 639 </element>
639 </root> 640 </root>
640 </artifact> 641 </artifact>
641 - <artifact type="war" name="Gradle : BeuthBot.services : scheduler.war"> 642 + <artifact type="war" name="Gradle : BeuthBot.services : jsonrequester.war">
642 <output-path>$PROJECT_DIR$/docker/wildfly/volumes/deployments</output-path> 643 <output-path>$PROJECT_DIR$/docker/wildfly/volumes/deployments</output-path>
643 <properties id="gradle-properties"> 644 <properties id="gradle-properties">
644 <options external-project-path="$PROJECT_DIR$" /> 645 <options external-project-path="$PROJECT_DIR$" />
645 </properties> 646 </properties>
646 - <root id="archive" name="scheduler.war">  
647 - <element id="artifact" artifact-name="Gradle : BeuthBot.services : scheduler.war (exploded)" /> 647 + <root id="archive" name="jsonrequester.war">
  648 + <element id="artifact" artifact-name="Gradle : BeuthBot.services : jsonrequester.war (exploded)" />
648 </root> 649 </root>
649 </artifact> 650 </artifact>
650 </component> 651 </component>
@@ -691,10 +692,10 @@ @@ -691,10 +692,10 @@
691 <option value="$PROJECT_DIR$/services/Common" /> 692 <option value="$PROJECT_DIR$/services/Common" />
692 <option value="$PROJECT_DIR$/services/FaceBook" /> 693 <option value="$PROJECT_DIR$/services/FaceBook" />
693 <option value="$PROJECT_DIR$/services/Global" /> 694 <option value="$PROJECT_DIR$/services/Global" />
  695 + <option value="$PROJECT_DIR$/services/JSONRequester" />
694 <option value="$PROJECT_DIR$/services/LoggingStatistics" /> 696 <option value="$PROJECT_DIR$/services/LoggingStatistics" />
695 <option value="$PROJECT_DIR$/services/MainBot" /> 697 <option value="$PROJECT_DIR$/services/MainBot" />
696 <option value="$PROJECT_DIR$/services/Rasa" /> 698 <option value="$PROJECT_DIR$/services/Rasa" />
697 - <option value="$PROJECT_DIR$/services/Scheduler" />  
698 <option value="$PROJECT_DIR$/services/Telegram" /> 699 <option value="$PROJECT_DIR$/services/Telegram" />
699 </set> 700 </set>
700 </option> 701 </option>
@@ -855,6 +856,9 @@ @@ -855,6 +856,9 @@
855 <module fileurl="file://$PROJECT_DIR$/services/Global/Global.iml" filepath="$PROJECT_DIR$/services/Global/Global.iml" group="services/Global" /> 856 <module fileurl="file://$PROJECT_DIR$/services/Global/Global.iml" filepath="$PROJECT_DIR$/services/Global/Global.iml" group="services/Global" />
856 <module fileurl="file://$PROJECT_DIR$/services/Global/Global_main.iml" filepath="$PROJECT_DIR$/services/Global/Global_main.iml" group="services/Global" /> 857 <module fileurl="file://$PROJECT_DIR$/services/Global/Global_main.iml" filepath="$PROJECT_DIR$/services/Global/Global_main.iml" group="services/Global" />
857 <module fileurl="file://$PROJECT_DIR$/services/Global/Global_test.iml" filepath="$PROJECT_DIR$/services/Global/Global_test.iml" group="services/Global" /> 858 <module fileurl="file://$PROJECT_DIR$/services/Global/Global_test.iml" filepath="$PROJECT_DIR$/services/Global/Global_test.iml" group="services/Global" />
  859 + <module fileurl="file://$PROJECT_DIR$/services/JSONRequester/JSONRequester.iml" filepath="$PROJECT_DIR$/services/JSONRequester/JSONRequester.iml" group="services/JSONRequester" />
  860 + <module fileurl="file://$PROJECT_DIR$/services/JSONRequester/JSONRequester_main.iml" filepath="$PROJECT_DIR$/services/JSONRequester/JSONRequester_main.iml" group="services/JSONRequester" />
  861 + <module fileurl="file://$PROJECT_DIR$/services/JSONRequester/JSONRequester_test.iml" filepath="$PROJECT_DIR$/services/JSONRequester/JSONRequester_test.iml" group="services/JSONRequester" />
858 <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics.iml" group="services/LoggingStatistics" /> 862 <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics.iml" group="services/LoggingStatistics" />
859 <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_main.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_main.iml" group="services/LoggingStatistics" /> 863 <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_main.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_main.iml" group="services/LoggingStatistics" />
860 <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_test.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_test.iml" group="services/LoggingStatistics" /> 864 <module fileurl="file://$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_test.iml" filepath="$PROJECT_DIR$/services/LoggingStatistics/LoggingStatistics_test.iml" group="services/LoggingStatistics" />
@@ -864,9 +868,6 @@ @@ -864,9 +868,6 @@
864 <module fileurl="file://$PROJECT_DIR$/services/Rasa/Rasa.iml" filepath="$PROJECT_DIR$/services/Rasa/Rasa.iml" group="services/Rasa" /> 868 <module fileurl="file://$PROJECT_DIR$/services/Rasa/Rasa.iml" filepath="$PROJECT_DIR$/services/Rasa/Rasa.iml" group="services/Rasa" />
865 <module fileurl="file://$PROJECT_DIR$/services/Rasa/Rasa_main.iml" filepath="$PROJECT_DIR$/services/Rasa/Rasa_main.iml" group="services/Rasa" /> 869 <module fileurl="file://$PROJECT_DIR$/services/Rasa/Rasa_main.iml" filepath="$PROJECT_DIR$/services/Rasa/Rasa_main.iml" group="services/Rasa" />
866 <module fileurl="file://$PROJECT_DIR$/services/Rasa/Rasa_test.iml" filepath="$PROJECT_DIR$/services/Rasa/Rasa_test.iml" group="services/Rasa" /> 870 <module fileurl="file://$PROJECT_DIR$/services/Rasa/Rasa_test.iml" filepath="$PROJECT_DIR$/services/Rasa/Rasa_test.iml" group="services/Rasa" />
867 - <module fileurl="file://$PROJECT_DIR$/services/Scheduler/Scheduler.iml" filepath="$PROJECT_DIR$/services/Scheduler/Scheduler.iml" group="services/Scheduler" />  
868 - <module fileurl="file://$PROJECT_DIR$/services/Scheduler/Scheduler_main.iml" filepath="$PROJECT_DIR$/services/Scheduler/Scheduler_main.iml" group="services/Scheduler" />  
869 - <module fileurl="file://$PROJECT_DIR$/services/Scheduler/Scheduler_test.iml" filepath="$PROJECT_DIR$/services/Scheduler/Scheduler_test.iml" group="services/Scheduler" />  
870 <module fileurl="file://$PROJECT_DIR$/services/Telegram/Telegram.iml" filepath="$PROJECT_DIR$/services/Telegram/Telegram.iml" group="services/Telegram" /> 871 <module fileurl="file://$PROJECT_DIR$/services/Telegram/Telegram.iml" filepath="$PROJECT_DIR$/services/Telegram/Telegram.iml" group="services/Telegram" />
871 <module fileurl="file://$PROJECT_DIR$/services/Telegram/Telegram_main.iml" filepath="$PROJECT_DIR$/services/Telegram/Telegram_main.iml" group="services/Telegram" /> 872 <module fileurl="file://$PROJECT_DIR$/services/Telegram/Telegram_main.iml" filepath="$PROJECT_DIR$/services/Telegram/Telegram_main.iml" group="services/Telegram" />
872 <module fileurl="file://$PROJECT_DIR$/services/Telegram/Telegram_test.iml" filepath="$PROJECT_DIR$/services/Telegram/Telegram_test.iml" group="services/Telegram" /> 873 <module fileurl="file://$PROJECT_DIR$/services/Telegram/Telegram_test.iml" filepath="$PROJECT_DIR$/services/Telegram/Telegram_test.iml" group="services/Telegram" />
services/Global/Global_test.iml
@@ -66,8 +66,8 @@ @@ -66,8 +66,8 @@
66 <orderEntry type="library" name="Gradle: org.jboss.shrinkwrap:shrinkwrap-api:1.2.6" level="project" /> 66 <orderEntry type="library" name="Gradle: org.jboss.shrinkwrap:shrinkwrap-api:1.2.6" level="project" />
67 <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-common:2.0.2.Final" level="project" /> 67 <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-common:2.0.2.Final" level="project" />
68 <orderEntry type="library" name="Gradle: org.jboss.arquillian.container:arquillian-container-spi:1.1.13.Final" level="project" /> 68 <orderEntry type="library" name="Gradle: org.jboss.arquillian.container:arquillian-container-spi:1.1.13.Final" level="project" />
69 - <orderEntry type="library" name="Gradle: org.jboss.arquillian.config:arquillian-config-api:1.1.13.Final" level="project" />  
70 <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-protocol-jmx:2.0.2.Final" level="project" /> 69 <orderEntry type="library" scope="RUNTIME" name="Gradle: org.wildfly.arquillian:wildfly-arquillian-protocol-jmx:2.0.2.Final" level="project" />
  70 + <orderEntry type="library" name="Gradle: org.jboss.arquillian.config:arquillian-config-api:1.1.13.Final" level="project" />
71 <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jboss.marshalling:jboss-marshalling-river:1.4.10.Final" level="project" /> 71 <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jboss.marshalling:jboss-marshalling-river:1.4.10.Final" level="project" />
72 <orderEntry type="library" name="Gradle: org.jboss.arquillian.config:arquillian-config-impl-base:1.1.13.Final" level="project" /> 72 <orderEntry type="library" name="Gradle: org.jboss.arquillian.config:arquillian-config-impl-base:1.1.13.Final" level="project" />
73 <orderEntry type="library" name="Gradle: org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:2.0.0-alpha-10" level="project" /> 73 <orderEntry type="library" name="Gradle: org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:2.0.0-alpha-10" level="project" />
services/Scheduler/Scheduler.iml renamed to services/JSONRequester/JSONRequester.iml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<module external.linked.project.id=":services:Scheduler" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="BeuthBot.services" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> 2 +<module external.linked.project.id=":services:JSONRequester" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="BeuthBot.services" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 <component name="NewModuleRootManager" inherit-compiler-output="true"> 3 <component name="NewModuleRootManager" inherit-compiler-output="true">
4 <exclude-output /> 4 <exclude-output />
5 <content url="file://$MODULE_DIR$"> 5 <content url="file://$MODULE_DIR$">
services/Scheduler/Scheduler_main.iml renamed to services/JSONRequester/JSONRequester_main.iml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<module external.linked.project.id=":services:Scheduler:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="BeuthBot.services" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> 2 +<module external.linked.project.id=":services:JSONRequester:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="BeuthBot.services" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 <component name="FacetManager"> 3 <component name="FacetManager">
4 - <facet type="web" name="Web Gradle : scheduler.war"> 4 + <facet type="web" name="Web Gradle : jsonrequester.war">
5 <configuration> 5 <configuration>
6 <webroots> 6 <webroots>
7 <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" /> 7 <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.httpcomponents:httpcore:4.4.4" level="project" /> 23 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
24 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" /> 24 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
25 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.3.1" level="project" /> 25 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.3.1" level="project" />
  26 + <orderEntry type="library" name="Gradle: org.json:json:20160810" level="project" />
26 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" /> 27 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
27 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jboss.resteasy:resteasy-client:3.1.3.Final" level="project" /> 28 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jboss.resteasy:resteasy-client:3.1.3.Final" level="project" />
28 <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.1" level="project" /> 29 <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.1" level="project" />
services/Scheduler/Scheduler_test.iml renamed to services/JSONRequester/JSONRequester_test.iml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<module external.linked.project.id=":services:Scheduler:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="BeuthBot.services" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> 2 +<module external.linked.project.id=":services:JSONRequester:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="BeuthBot.services" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> 3 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 <output-test url="file://$MODULE_DIR$/out/test/classes" /> 4 <output-test url="file://$MODULE_DIR$/out/test/classes" />
5 <exclude-output /> 5 <exclude-output />
@@ -9,12 +9,13 @@ @@ -9,12 +9,13 @@
9 </content> 9 </content>
10 <orderEntry type="inheritedJdk" /> 10 <orderEntry type="inheritedJdk" />
11 <orderEntry type="sourceFolder" forTests="false" /> 11 <orderEntry type="sourceFolder" forTests="false" />
12 - <orderEntry type="module" module-name="Scheduler_main" /> 12 + <orderEntry type="module" module-name="JSONRequester_main" />
13 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.httpcomponents:httpclient:4.5.2" level="project" /> 13 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
14 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.httpcomponents:httpcore:4.4.4" level="project" /> 14 <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
15 <orderEntry type="module" module-name="Common_main" /> 15 <orderEntry type="module" module-name="Common_main" />
16 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" /> 16 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
17 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.3.1" level="project" /> 17 <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.3.1" level="project" />
  18 + <orderEntry type="library" name="Gradle: org.json:json:20160810" level="project" />
18 <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" /> 19 <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
19 <orderEntry type="library" name="Gradle: org.jboss.resteasy:resteasy-client:3.1.3.Final" level="project" /> 20 <orderEntry type="library" name="Gradle: org.jboss.resteasy:resteasy-client:3.1.3.Final" level="project" />
20 <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.1" level="project" /> 21 <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.1" level="project" />
@@ -57,5 +58,5 @@ @@ -57,5 +58,5 @@
57 <orderEntry type="library" name="Gradle: javax.el:javax.el-api:3.0.0" level="project" /> 58 <orderEntry type="library" name="Gradle: javax.el:javax.el-api:3.0.0" level="project" />
58 <orderEntry type="library" name="Gradle: javax.interceptor:javax.interceptor-api:1.2" level="project" /> 59 <orderEntry type="library" name="Gradle: javax.interceptor:javax.interceptor-api:1.2" level="project" />
59 </component> 60 </component>
60 - <component name="TestModuleProperties" production-module="Scheduler_main" /> 61 + <component name="TestModuleProperties" production-module="JSONRequester_main" />
61 </module> 62 </module>
62 \ No newline at end of file 63 \ No newline at end of file
settings.gradle
@@ -8,7 +8,6 @@ include ( @@ -8,7 +8,6 @@ include (
8 'services:MainBot', 8 'services:MainBot',
9 'services:LoggingStatistics', 9 'services:LoggingStatistics',
10 'services:Telegram', 10 'services:Telegram',
11 - 'services:Scheduler',  
12 'services:JSONRequester' 11 'services:JSONRequester'
13 ) 12 )
14 //findProject(':services:Scheduler')?.name = 'Scheduler' 13 //findProject(':services:Scheduler')?.name = 'Scheduler'