R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switching docker network

Browse Source
This commit is contained in:
Szakalakamaka
2020-10-08 10:20:28 +02:00
parent 463fed842a
commit 2c5cddb93e
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
.idea/workspace.xml generated
View File

@@ -24,8 +24,9 @@
<component name="ChangeListManager">
<list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/EventControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/EventControllerTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/data-access.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/data-access.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/EventControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/EventControllerTest.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -110,7 +111,7 @@
<recent name="com.release11.klaus.service" />
</key>
</component>
<component name="RunManager" selected="JUnit.KlausMvcControllerTest">
<component name="RunManager" selected="Application.KlausApplication">
<configuration name="KlausApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<envs>
<env name="-Dspring.profiles.active" value="test" />
@@ -244,10 +245,10 @@
</list>
<recent_temporary>
<list>
<item itemvalue="Application.KlausApplication" />
<item itemvalue="JUnit.KlausMvcControllerTest" />
<item itemvalue="JUnit.KlausControllerTest" />
<item itemvalue="JUnit.EventControllerTest" />
<item itemvalue="Application.KlausApplication" />
<item itemvalue="JUnit.KlausMvcControllerTest.addHeader" />
</list>
</recent_temporary>
@@ -264,20 +265,6 @@
<option name="presentableId" value="Default" />
<updated>1598862102028</updated>
</task>
<task id="LOCAL-00050" summary="testing jenkins docker">
<created>1601286141133</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1601286141137</updated>
</task>
<task id="LOCAL-00051" summary="testing jenkins docker">
<created>1601287462400</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1601287462400</updated>
</task>
<task id="LOCAL-00052" summary="testing jenkins docker">
<created>1601287668529</created>
<option name="number" value="00052" />
@@ -607,7 +594,21 @@
<option name="project" value="LOCAL" />
<updated>1602101590240</updated>
</task>
<option name="localTasksCounter" value="99" />
<task id="LOCAL-00099" summary="cleaning">
<created>1602139983754</created>
<option name="number" value="00099" />
<option name="presentableId" value="LOCAL-00099" />
<option name="project" value="LOCAL" />
<updated>1602139983755</updated>
</task>
<task id="LOCAL-00100" summary="cleaning">
<created>1602140028044</created>
<option name="number" value="00100" />
<option name="presentableId" value="LOCAL-00100" />
<option name="project" value="LOCAL" />
<updated>1602140028044</updated>
</task>
<option name="localTasksCounter" value="101" />
<servers />
</component>
<component name="UnknownFeatures">
@@ -627,7 +628,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="solved problem with binding lists between thymeleaf and controller&#10;added id filter for event searcher" />
<MESSAGE value="adding &quot;new message&quot; button" />
<MESSAGE value="etrack" />
<MESSAGE value="new buttons" />
@@ -652,7 +652,8 @@
<MESSAGE value="name network" />
<MESSAGE value="adding new spring profiles" />
<MESSAGE value="changing module settings,&#10;adding unit testing for controllers" />
<option name="LAST_COMMIT_MESSAGE" value="changing module settings,&#10;adding unit testing for controllers" />
<MESSAGE value="cleaning" />
<option name="LAST_COMMIT_MESSAGE" value="cleaning" />
</component>
<component name="WindowStateProjectService">
<state x="904" y="236" key="#Notifications" timestamp="1600868491636">
@@ -694,34 +695,34 @@
</state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602062761111" />
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1601990587478" />
<state width="1493" height="217" key="GridCell.Tab.0.bottom" timestamp="1602139577657">
<state width="1493" height="217" key="GridCell.Tab.0.bottom" timestamp="1602140137399">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602075476021" />
<state width="1877" height="265" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602101613148" />
<state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602139577657" />
<state width="1493" height="217" key="GridCell.Tab.0.center" timestamp="1602139577656">
<state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602140137399" />
<state width="1493" height="217" key="GridCell.Tab.0.center" timestamp="1602140137398">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="261" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602075476021" />
<state width="1877" height="265" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602101613147" />
<state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602139577656" />
<state width="1493" height="217" key="GridCell.Tab.0.left" timestamp="1602139577656">
<state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602140137398" />
<state width="1493" height="217" key="GridCell.Tab.0.left" timestamp="1602140137398">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="261" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602075476020" />
<state width="1877" height="265" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602101613146" />
<state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602139577656" />
<state width="1493" height="217" key="GridCell.Tab.0.right" timestamp="1602139577656">
<state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602140137398" />
<state width="1493" height="217" key="GridCell.Tab.0.right" timestamp="1602140137399">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="261" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602075476021" />
<state width="1877" height="265" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602101613147" />
<state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602139577656" />
<state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602140137399" />
<state width="1877" height="261" key="GridCell.Tab.1.bottom" timestamp="1602080974055">
<screen x="1920" y="0" width="1920" height="1040" />
</state>
@@ -764,13 +765,13 @@
</state>
<state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
<state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
<state x="2371" y="183" key="Vcs.Push.Dialog.v2" timestamp="1602101594045">
<screen x="1920" y="0" width="1920" height="1040" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1602140029487">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
<state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602101594045" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601566390520" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602140029487" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
<screen x="1920" y="0" width="1920" height="1040" />
</state>

4
docker-compose.yml
View File

@@ -1,6 +1,6 @@
version: '3'
services:
redis-server:
redis:
image: 'redis'
restart: "no"
klaus:
@@ -12,7 +12,7 @@ services:
ports:
- "8097:8097"
depends_on:
- redis-server
- redis
networks:
default:
external:

BIN
target/test-classes/com/release11/klaus/controller/EventControllerTest.class
View File

Binary file not shown.

BIN
target/test-classes/com/release11/klaus/controller/KlausControllerTest.class
View File

Binary file not shown.