From 1a2b73bfc9523229557ddda53c05542ab8690eef Mon Sep 17 00:00:00 2001 From: Alexandre Vanini <vanini.alexandre@gmail.com> Date: Fri, 3 May 2019 11:03:54 +0200 Subject: [PATCH] [LAST] --- .../app/ace-assert/ace-assert.component.ts | 7 +- .../src/app/ace/ace.component.ts | 6 +- .../server_rest/.idea/compiler.xml | 2 +- .../server_rest/.idea/workspace.xml | 66 +++++---- .../server_rest/src/main/java/app.java | 41 ++++-- .../server_rest/target/classes/app.class | Bin 3028 -> 3893 bytes .../serveur_compilation/.idea/uiDesigner.xml | 124 +++++++++++++++++ .../serveur_compilation/.idea/workspace.xml | 126 +++++++++++------- .../share_docker_file/Main.class | Bin 440 -> 0 bytes .../__pycache__/sample.cpython-34.pyc | Bin 0 -> 349 bytes .../share_docker_file/kata.class | Bin 324 -> 0 bytes ...ompilation.java => DockerCompilation.java} | 6 +- .../src/main/java/HostCompilation.java | 2 + .../src/main/java/app.java | 2 +- .../target/classes/compilation.class | Bin 5458 -> 5494 bytes 15 files changed, 281 insertions(+), 101 deletions(-) create mode 100644 tests/serveur_compilation/serveur_compilation/.idea/uiDesigner.xml delete mode 100644 tests/serveur_compilation/serveur_compilation/share_docker_file/Main.class create mode 100644 tests/serveur_compilation/serveur_compilation/share_docker_file/__pycache__/sample.cpython-34.pyc delete mode 100644 tests/serveur_compilation/serveur_compilation/share_docker_file/kata.class rename tests/serveur_compilation/serveur_compilation/src/main/java/{compilation.java => DockerCompilation.java} (95%) create mode 100644 tests/serveur_compilation/serveur_compilation/src/main/java/HostCompilation.java diff --git a/tests/serveur_compilation/front-end-compilation/src/app/ace-assert/ace-assert.component.ts b/tests/serveur_compilation/front-end-compilation/src/app/ace-assert/ace-assert.component.ts index de0e383..01f92fb 100644 --- a/tests/serveur_compilation/front-end-compilation/src/app/ace-assert/ace-assert.component.ts +++ b/tests/serveur_compilation/front-end-compilation/src/app/ace-assert/ace-assert.component.ts @@ -18,16 +18,17 @@ export class AceAssertComponent implements AfterViewInit { ngAfterViewInit() { this.editor.setTheme('dracula'); this.editor.getEditor().setOptions({ - enableBasicAutocompletion: true + enableBasicAutocompletion: true, + highlightActiveLine : false }); - +/* this.editor.getEditor().commands.addCommand({ name: 'showOtherCompletions', bindKey: 'Ctrl-.', exec(editor) { } - }); + });*/ } } diff --git a/tests/serveur_compilation/front-end-compilation/src/app/ace/ace.component.ts b/tests/serveur_compilation/front-end-compilation/src/app/ace/ace.component.ts index fd5548f..e431bcf 100644 --- a/tests/serveur_compilation/front-end-compilation/src/app/ace/ace.component.ts +++ b/tests/serveur_compilation/front-end-compilation/src/app/ace/ace.component.ts @@ -23,10 +23,10 @@ export class AceComponent implements AfterViewInit { ngAfterViewInit() { this.editor.setTheme('dracula'); - +/* this.editor.getEditor().setOptions({ - enableBasicAutocompletion: true - }); + + });*/ /* this.editor.getEditor().commands.addCommand({ diff --git a/tests/serveur_compilation/server_rest/.idea/compiler.xml b/tests/serveur_compilation/server_rest/.idea/compiler.xml index 14146fd..f8ea6ba 100644 --- a/tests/serveur_compilation/server_rest/.idea/compiler.xml +++ b/tests/serveur_compilation/server_rest/.idea/compiler.xml @@ -6,8 +6,8 @@ <sourceOutputDir name="target/generated-sources/annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <outputRelativeToContentRoot value="true" /> - <module name="server_rest_new" /> <module name="09" /> + <module name="server_rest_new" /> </profile> </annotationProcessing> </component> diff --git a/tests/serveur_compilation/server_rest/.idea/workspace.xml b/tests/serveur_compilation/server_rest/.idea/workspace.xml index d70dceb..a4fcd46 100644 --- a/tests/serveur_compilation/server_rest/.idea/workspace.xml +++ b/tests/serveur_compilation/server_rest/.idea/workspace.xml @@ -2,19 +2,19 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment=""> - <change afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/../serveur_compilation/.idea/uiDesigner.xml" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/HostCompilation.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/target/classes/app.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/app.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../serveur_compilation/docker/dockerfile" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/../serveur_compilation/share_docker_file/test.txt" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/../serveur_compilation/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/compilation.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../serveur_compilation/share_docker_file/Main.class" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/../serveur_compilation/share_docker_file/kata.class" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/../serveur_compilation/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/app.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../serveur_compilation/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/DockerCompilation.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/target/classes/compilation.class" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/target/classes/compilation.class" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/out/" /> @@ -30,20 +30,23 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="true"> + <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="300"> - <caret line="20" column="12" lean-forward="true" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> + <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> </state> </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> + <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="33" selection-start-line="33" selection-end-line="33" /> + <state relative-caret-position="387"> + <caret line="32" column="112" lean-forward="true" selection-start-line="32" selection-start-column="112" selection-end-line="32" selection-end-column="112" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> @@ -75,11 +78,10 @@ </list> </option> </component> - <component name="ProjectFrameBounds" extendedState="6" fullScreen="true"> - <option name="x" value="180" /> - <option name="y" value="112" /> - <option name="width" value="1080" /> - <option name="height" value="676" /> + <component name="ProjectFrameBounds" extendedState="1"> + <option name="y" value="23" /> + <option name="width" value="1920" /> + <option name="height" value="1121" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <ConfirmationsSetting value="1" id="Add" /> @@ -105,6 +107,7 @@ <property name="node.js.selected.package.eslint" value="(autodetect)" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" /> + <property name="restartRequiresConfirmation" value="false" /> </component> <component name="RecentsManager"> <key name="CopyFile.RECENT_KEYS"> @@ -166,14 +169,16 @@ <workItem from="1556827416534" duration="171000" /> <workItem from="1556827744217" duration="333000" /> <workItem from="1556829690737" duration="985000" /> + <workItem from="1556864771569" duration="1439000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="7523000" /> + <option name="totallyTimeSpent" value="8962000" /> </component> <component name="ToolWindowManager"> - <frame x="0" y="0" width="1440" height="900" extended-state="6" /> + <frame x="0" y="23" width="1920" height="1121" extended-state="1" /> + <editor active="true" /> <layout> <window_info content_ui="combo" id="Project" order="0" weight="0.2603834" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> @@ -184,7 +189,7 @@ <window_info id="Favorites" order="6" side_tool="true" /> <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="bottom" id="Run" order="2" weight="0.3" /> + <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.2993197" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> @@ -192,9 +197,9 @@ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Database Changes" order="9" /> - <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32891566" /> + <window_info anchor="bottom" id="Terminal" order="10" weight="0.3283186" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> - <window_info anchor="bottom" id="Messages" order="12" /> + <window_info anchor="bottom" id="Messages" order="12" weight="0.32944608" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> @@ -213,14 +218,17 @@ <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="300"> - <caret line="20" column="12" lean-forward="true" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> + <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="33" selection-start-line="33" selection-end-line="33" /> + <state relative-caret-position="387"> + <caret line="32" column="112" lean-forward="true" selection-start-line="32" selection-start-column="112" selection-end-line="32" selection-end-column="112" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> diff --git a/tests/serveur_compilation/server_rest/src/main/java/app.java b/tests/serveur_compilation/server_rest/src/main/java/app.java index 27b9c4e..19c6cb7 100644 --- a/tests/serveur_compilation/server_rest/src/main/java/app.java +++ b/tests/serveur_compilation/server_rest/src/main/java/app.java @@ -1,6 +1,7 @@ import io.javalin.Javalin; import java.io.*; +import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.URL; import org.apache.commons.lang.StringEscapeUtils; @@ -13,24 +14,38 @@ public class app { app.get("/run/", ctx -> { - - URL compilator = new URL("http://localhost:6999"); - HttpURLConnection connection = (HttpURLConnection) compilator.openConnection(); - - connection.setRequestMethod("POST"); - connection.setDoOutput(true); + HttpURLConnection connection = null; + try{ + URL compilator = new URL("http://localhost:6999"); + connection = (HttpURLConnection) compilator.openConnection(); + connection.setRequestMethod("POST"); + connection.setDoOutput(true); + }catch (ConnectException e){ + e.printStackTrace(); + } //Send request - DataOutputStream wr = new DataOutputStream (connection.getOutputStream()); String type = StringEscapeUtils.escapeJava(ctx.queryParams("language").get(0)); String code = StringEscapeUtils.escapeJava(ctx.queryParams("code").get(0)); String vassert = StringEscapeUtils.escapeJava(ctx.queryParams("test").get(0)); - wr.writeBytes("{\"language\":\""+type+"\",\"stream\":\""+code+"\",\"assert\":\""+vassert+"\"}"); + try(DataOutputStream wr = new DataOutputStream (connection.getOutputStream())){ + wr.writeBytes("{\"language\":\""+type+"\",\"stream\":\""+code+"\",\"assert\":\""+vassert+"\"}"); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + }catch (ConnectException e){ + e.printStackTrace(); + } - wr.close(); + try(BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))){ + String response = in.readLine(); + ctx.result(response); + } catch(IOException e){ + e.printStackTrace(); + } - BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); //String inputLine; //while ((inputLine = in.readLine()) != null) @@ -38,10 +53,10 @@ public class app { // For now, we can assume we will only need to fetch one response since the compilation // server does send one json object with all the required data. - String response = in.readLine(); - ctx.result(response); - in.close(); + + + }); } diff --git a/tests/serveur_compilation/server_rest/target/classes/app.class b/tests/serveur_compilation/server_rest/target/classes/app.class index 776ea7c957bad8508fffbceb8541fe9774c7aa7e..42f739678407485c85fb4bae067343b87f49dc1f 100644 GIT binary patch delta 2191 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 delta 1230 zcmdlgcSXGZ)W2Q(7#J8#7<O<m=rROwF$6LMfrwxb5yHU`D#XCR5C!5yvopkSFvM~( za4^Jyh<J8}1P+EoE(RWkBoL9z&X5A4Q@I!f7}7Wx(zzHi7&5sTvKX@28FIK7avAbC z7~DA+^4S>*xEQ1u0yr27x!f3}7>YO;ia8icI2cMn!et=s<shPhouQJQp$cSXH5Y>_ zLk$;$3PUZ3r~?^Y4`NlYGgz`SG)#PZY4Q;!g~^8)r6)gR(wY39QAwMnq_QBDkwM5O zE3qt5KPNFST|c;_C^IkJnvsDeIX@+pk%7G|vA8(3sAO^%lTtlLQEG8PeqM1ZBLkOf zMRICENoIatF*`#eBLi1(erZv1s#|7GDkB3&VnKl($V?svJqCSth9(|{W`-6XhE@>K z#?a2lz^Y$Vny1gmAmEgrUs7CBlvv=KT9T2UQq0fB&>_HJ!_UUh$-~ga(9Ofp!_dpf zzymUE@)~9(Zas!R9)^B~35*O<lRq#?2{JOU1o#Js@GwjSNlapxJUO04)^!TQRFK`% z7#TP~-YQK@Pi1GA&ciT+VJ17nERdnI85smXh9Y~Lona0S!(4`Wj0`L#sl_FeTUd0M z=QAvryqQIncOk<f9)`srJC-o$Pj+WD*Idf53}nZ05V3-XVI@exDu&f4=K3dPr6y0l z#M;BLhG8uigAT*G$!TmiCJS(QOg_LWI@zE7z~l&yg2|sbW^=FSVc5X1g@?hK!DjMI zPE*Ehlh1R$WZBNhpgK98OLp>2E}Z}!23-aaU}j(h1uO$2g8>5rgFXWz10w?i1FP0{ z2F8sH3=B*Rh71f0Y+yl71|tRr1|Be*mBE<7gn@y9lfjh145WE-D7SV!NG%@&GguWb z10RDVgFaY~7y}an1A`QUIfDfQ0|PGuFM}n66$7IH7s!PSOdzWnOBh%gI2jli4((>( zh!o=7&cNlPy^VqU00WP&ju7uQ20k5@Z4CUo83ZDAwlN59XAtt!5)$6VAi}(pL6nK% z0E5^LhI(-;7A+wOR6%hoRxKe(bTKyF-3(HZ+Zm*VWVSKLO0sNYkQI^xu~<PYc@T>Y z#8TMCAiIr0aT|k@?luPH-3%&`yBSnLE>PRfpuU|!!-`#!eH(+O6^E82$F_O~t#A-m z8xeAL4EziX41x??3_=V-3?d8?45AFO3=#~Q43Z4C3{nh%4AKm#46+Q<7~~mdF(@*u zW6)&S%An1#he3zoAcGz_^kN|4!eGl_$H2hA#ju0Hp22~EkwJ)I1A`-j69W^2Cc{hy zX9kxn24)6ZhE@hw1~hCqfw26qNG23CethFAs<1~&#ahII@g44w>L4D1YB8F(4I z8Qd5+7<?EQ7+4q>8GIR-8T`Oe?$59pY!M^FMux2nn;0Y+!oX3=$PmuJ%n-p4$q)em D%fa!T diff --git a/tests/serveur_compilation/serveur_compilation/.idea/uiDesigner.xml b/tests/serveur_compilation/serveur_compilation/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/tests/serveur_compilation/serveur_compilation/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> +</project> \ No newline at end of file diff --git a/tests/serveur_compilation/serveur_compilation/.idea/workspace.xml b/tests/serveur_compilation/serveur_compilation/.idea/workspace.xml index 0d1cdec..5c2cc06 100644 --- a/tests/serveur_compilation/serveur_compilation/.idea/workspace.xml +++ b/tests/serveur_compilation/serveur_compilation/.idea/workspace.xml @@ -2,19 +2,19 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment=""> - <change afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/java/HostCompilation.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../server_rest/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/.idea/compiler.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../server_rest/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/src/main/java/app.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../server_rest/target/classes/app.class" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/target/classes/app.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/docker/dockerfile" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/share_docker_file/test.txt" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/compilation.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/share_docker_file/Main.class" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/share_docker_file/kata.class" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/DockerCompilation.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/compilation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/compilation.class" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/out/" /> @@ -40,10 +40,10 @@ </entry> </file> <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/compilation.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="315"> - <caret line="21" column="179" selection-start-line="21" selection-start-column="179" selection-end-line="21" selection-end-column="287" /> + <state relative-caret-position="225"> + <caret line="15" column="53" lean-forward="true" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -54,14 +54,30 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="165"> - <caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" /> + <state relative-caret-position="105"> + <caret line="8" column="19" lean-forward="true" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/HostCompilation.java"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="28" selection-start-column="28" selection-end-column="28" /> </state> </provider> </entry> </file> </leaf> </component> + <component name="FileTemplateManagerImpl"> + <option name="RECENT_TEMPLATES"> + <list> + <option value="Class" /> + </list> + </option> + </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." /> </component> @@ -71,6 +87,7 @@ <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/share_docker_file/Main.java" /> <option value="$PROJECT_DIR$/src/main/java/compilation.java" /> + <option value="$PROJECT_DIR$/src/main/java/Docker_compilation.java" /> </list> </option> </component> @@ -82,10 +99,9 @@ </option> </component> <component name="ProjectFrameBounds" fullScreen="true"> - <option name="x" value="180" /> - <option name="y" value="112" /> - <option name="width" value="1080" /> - <option name="height" value="676" /> + <option name="x" value="1920" /> + <option name="width" value="1920" /> + <option name="height" value="1200" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> @@ -93,8 +109,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> @@ -107,15 +121,41 @@ <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> <item name="docker" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> + <item name="docker" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + </path> <path> <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> <item name="share_docker_file" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + </path> </expand> <select /> </subPane> </pane> + <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -193,11 +233,12 @@ <workItem from="1556827413018" duration="173000" /> <workItem from="1556827741611" duration="619000" /> <workItem from="1556829689470" duration="1450000" /> + <workItem from="1556864756289" duration="5129000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="9235000" /> + <option name="totallyTimeSpent" value="14364000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -209,10 +250,10 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="0" width="1440" height="900" extended-state="0" /> + <frame x="1920" y="0" width="1920" height="1200" extended-state="0" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26824033" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27103302" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> @@ -221,8 +262,8 @@ <window_info id="Favorites" order="6" side_tool="true" /> <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32891566" /> - <window_info anchor="bottom" id="Run" order="2" weight="0.32891566" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info anchor="bottom" id="Run" order="2" weight="0.3283186" /> + <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.4" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32891566" /> @@ -246,20 +287,9 @@ <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="1" /> </component> - <component name="XDebuggerManager"> - <breakpoint-manager> - <breakpoints> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/compilation.java</url> - <line>47</line> - <properties /> - <option name="timeStamp" value="1" /> - </line-breakpoint> - </breakpoints> - </breakpoint-manager> - </component> <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/share_docker_file/test.txt" /> + <entry file="file://$PROJECT_DIR$/share_docker_file/Main.java" /> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="705"> @@ -267,24 +297,24 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/HostCompilation.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="165"> - <caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" /> + <state> + <caret column="28" selection-start-column="28" selection-end-column="28" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/share_docker_file/Main.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" /> + <state relative-caret-position="105"> + <caret line="8" column="19" lean-forward="true" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/compilation.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="315"> - <caret line="21" column="179" selection-start-line="21" selection-start-column="179" selection-end-line="21" selection-end-column="287" /> + <state relative-caret-position="225"> + <caret line="15" column="53" lean-forward="true" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" /> <folding> <element signature="imports" expanded="true" /> </folding> diff --git a/tests/serveur_compilation/serveur_compilation/share_docker_file/Main.class b/tests/serveur_compilation/serveur_compilation/share_docker_file/Main.class deleted file mode 100644 index 9d35e3f215771b81d68aa746f1598c6380db061d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmX^0Z`VEs1_omWX)Xp<20ktZeg*+920;cPb_QW~1`$REHk-`6%o00B24)S-Fh&Lz z=lqmZMh1SL%)C^;(%hufqL9R-oK!{zmfXb5JVpjFjcA{&#Ii*FoW#6z{os<K%)E4K zkVdZH{L-T2RJTl!Vou-0%sf4iIvxf#26lD^Q62^{261)<2_6PX1}R1c7LWo)1_6)~ zh*ADYS*gh-j0`N<i6x1Q46I3&CFS{y3~U<Fo|@5~j0^(#Md|ukrFoep`i{lLsYNA> z41$SZhGS7tVx?<gX<|+>BLllev}d%ZW*CDa0}BHy0|+oNFoGPxz{tSCz`!8Oz{tSJ zz`($&wVi=+BLf2iBLgP`0|OgakePv#fs26~s<e=S6)YOawudW{nbkj%h0Q;bmBW7r z0~1(;-9M5=03;;9<-dc087wBi0}@p7k7N}vfh!b{013K)1T#P?5!UiCFoP{uV_;_p RVBlb2WZ+?7U|?e41pxU0P~iXo diff --git a/tests/serveur_compilation/serveur_compilation/share_docker_file/__pycache__/sample.cpython-34.pyc b/tests/serveur_compilation/serveur_compilation/share_docker_file/__pycache__/sample.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c307a156cefae4a96b140b2be5cbfa9a640c3a5c GIT binary patch literal 349 zcmaFI!^?I2{plE81_p-53`l^9fq}t+fq|h|fPsM_g@GZ3k)efwA&P+^g^3|plR23Y zsuo0p)H;LI3WC%!f|Rr{Fw`(GxHL0@6#KzdgH*CGFfaszR7){1Fr<Uk#R@RgGBVUK zf-Dl5$iz^{#t^K@_!6XgC4(l@EhasKTa1}SAU>G*#iyT|SEgT_m|KvOs#j3?i_0b_ zv$!NVKexaRq^KA~a57ZMq$U<u=49rj>e=MvCnx3<+vy<`f=$w7yv3LYW<dy61_p*( r958Jl&w<TiU@YQbU|{gmgwPPRAWI-Dh%TGl{FKt1R6DRPQ1Ac%x&%G{ literal 0 HcmV?d00001 diff --git a/tests/serveur_compilation/serveur_compilation/share_docker_file/kata.class b/tests/serveur_compilation/serveur_compilation/share_docker_file/kata.class deleted file mode 100644 index 4f88cc83b4794d26f2a1d98c67e2a59a1e1e4a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmX^0Z`VEs1_omWAua}H20nHMes%@{Mg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;| zRKL>Pq|~C2#H5^5Mh4cT%98SYMg}&GXiv>(Peumb;F84TY~REJumW}lK}H6y;QZ2} z<W#pzkOt1|#F9k4ti-ZJ9tIW$Rz?OEkN_it07ytbCowNw-#;lUHMxY5fhpRPL6L!p zftdjWm>3vA8W<QE*cccXWEmJ47#SECShcn@Fm7aEU|?imXJBAp0}C=Ta58W(a6*-a zGq8Y-kk#6^hs%fARz_>zA_hTi87&z-)(rm^CdTFe-)nDRU|?VZ8zIKP%D@1&iH(7m nft^8=fsH|$frEjIfq{XCf$1*;J39k6<1Yqb21W)Rur6Kz{pU5$ diff --git a/tests/serveur_compilation/serveur_compilation/src/main/java/compilation.java b/tests/serveur_compilation/serveur_compilation/src/main/java/DockerCompilation.java similarity index 95% rename from tests/serveur_compilation/serveur_compilation/src/main/java/compilation.java rename to tests/serveur_compilation/serveur_compilation/src/main/java/DockerCompilation.java index 6706bfe..f989ccd 100644 --- a/tests/serveur_compilation/serveur_compilation/src/main/java/compilation.java +++ b/tests/serveur_compilation/serveur_compilation/src/main/java/DockerCompilation.java @@ -3,7 +3,7 @@ import org.json.JSONObject; import java.io.*; import java.util.HashMap; -public class compilation { +public class DockerCompilation { public HashMap<String, Object> execute_kata(JSONObject input) { @@ -93,9 +93,9 @@ public class compilation { switch (input.get("language").toString()){ case "java": - file = new File("Main.class"); + file = new File("share_docker_file/Main.class"); file.delete(); - file = new File("kata.class"); + file = new File("share_docker_file/kata.class"); file.delete(); break; } diff --git a/tests/serveur_compilation/serveur_compilation/src/main/java/HostCompilation.java b/tests/serveur_compilation/serveur_compilation/src/main/java/HostCompilation.java new file mode 100644 index 0000000..a6828f1 --- /dev/null +++ b/tests/serveur_compilation/serveur_compilation/src/main/java/HostCompilation.java @@ -0,0 +1,2 @@ +public class HostCompilation { +} diff --git a/tests/serveur_compilation/serveur_compilation/src/main/java/app.java b/tests/serveur_compilation/serveur_compilation/src/main/java/app.java index 3f62482..a7edb79 100644 --- a/tests/serveur_compilation/serveur_compilation/src/main/java/app.java +++ b/tests/serveur_compilation/serveur_compilation/src/main/java/app.java @@ -7,7 +7,7 @@ public class app { Javalin app = Javalin.create().enableCorsForAllOrigins().start(6999); app.post("/", ctx -> { - compilation cpl = new compilation(); + DockerCompilation cpl = new DockerCompilation(); ctx.json(cpl.execute_kata(new JSONObject(ctx.body()))); }); } diff --git a/tests/serveur_compilation/serveur_compilation/target/classes/compilation.class b/tests/serveur_compilation/serveur_compilation/target/classes/compilation.class index fb47885edf724fb107321d56c42e0a163ac90b5c..9cf5bafaff5fc88a86383db099a79eb571221bfe 100644 GIT binary patch delta 31 ncmcbl^-XKTWDZ7|$?I6fIg)b{i;Ec<WF}8w72mv!V+{`gvy=*T delta 27 jcmeySbxCW(WDY(q-^9#3z2uz4;$lVyuFXd|Hu3-fkUR;I -- GitLab