diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index b589d56..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7d3b3e8..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392f..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 49504ef..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 8306744..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 1d9414b..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "last_opened_file_path": "C:/Projects/Redes", - "project.structure.last.edited": "Modules", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.0" - } -} - - - - - - - - - - - - - - - - - - 1686760140487 - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f1ed22d..0000000 --- a/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id 'java' -} - -group = 'org.example' -version = '1.0-SNAPSHOT' - -repositories { - mavenCentral() -} - -dependencies { - testImplementation platform('org.junit:junit-bom:5.9.1') - testImplementation 'org.junit.jupiter:junit-jupiter' -} - -test { - useJUnitPlatform() -} diff --git a/client/build.gradle b/client/build.gradle new file mode 100644 index 0000000..bb9acc3 --- /dev/null +++ b/client/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'application' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'junit:junit:4.13.1' + implementation 'com.google.guava:guava:30.0-jre' +} + +tasks.named("jar") { + manifest { + attributes("Implementation-Title": rootProject.name, "Implementation-Version": project.version, "Main-Class": "com.example.redes.ClientApp") + } +} diff --git a/src/main/java/org/example/ClientApp.java b/client/src/main/java/com/example/redes/ClientApp.java similarity index 98% rename from src/main/java/org/example/ClientApp.java rename to client/src/main/java/com/example/redes/ClientApp.java index afde0a6..3edeca1 100644 --- a/src/main/java/org/example/ClientApp.java +++ b/client/src/main/java/com/example/redes/ClientApp.java @@ -1,4 +1,4 @@ -package org.example; +package com.example.redes; import javax.swing.*; import java.awt.*; @@ -13,7 +13,7 @@ import java.net.DatagramSocket; import java.net.Socket; public class ClientApp extends JFrame { - private static final String SERVER_IP = "localhost"; + private static final String SERVER_IP = "172.16.0.1"; private static final int SERVER_TCP_PORT = 5475; private static final int SERVER_UDP_PORT = 5565; diff --git a/scripts/build.ps1 b/scripts/build.ps1 new file mode 100644 index 0000000..940c3c9 --- /dev/null +++ b/scripts/build.ps1 @@ -0,0 +1,3 @@ +#!/usr/bin/pwsh + +.\gradlew jar diff --git a/scripts/client1.bat b/scripts/client1.bat new file mode 100644 index 0000000..155f1ac --- /dev/null +++ b/scripts/client1.bat @@ -0,0 +1,3 @@ +@echo off + +java -jar .\client\build\libs\client.jar Afonso diff --git a/scripts/client2.bat b/scripts/client2.bat new file mode 100644 index 0000000..155f1ac --- /dev/null +++ b/scripts/client2.bat @@ -0,0 +1,3 @@ +@echo off + +java -jar .\client\build\libs\client.jar Afonso diff --git a/scripts/client3.bat b/scripts/client3.bat new file mode 100644 index 0000000..155f1ac --- /dev/null +++ b/scripts/client3.bat @@ -0,0 +1,3 @@ +@echo off + +java -jar .\client\build\libs\client.jar Afonso diff --git a/scripts/client4.bat b/scripts/client4.bat new file mode 100644 index 0000000..155f1ac --- /dev/null +++ b/scripts/client4.bat @@ -0,0 +1,3 @@ +@echo off + +java -jar .\client\build\libs\client.jar Afonso diff --git a/scripts/server.bat b/scripts/server.bat new file mode 100644 index 0000000..01d2e15 --- /dev/null +++ b/scripts/server.bat @@ -0,0 +1,3 @@ +@echo off + +java -jar .\server\build\libs\server.jar diff --git a/server/build.gradle b/server/build.gradle new file mode 100644 index 0000000..56c1832 --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'application' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'junit:junit:4.13.1' + implementation 'com.google.guava:guava:30.0-jre' +} + +tasks.named("jar") { + manifest { + attributes("Implementation-Title": rootProject.name, "Implementation-Version": project.version, "Main-Class": "com.example.redes.ServerApp") + } +} diff --git a/src/main/java/org/example/ServerApp.java b/server/src/main/java/com/example/redes/ServerApp.java similarity index 99% rename from src/main/java/org/example/ServerApp.java rename to server/src/main/java/com/example/redes/ServerApp.java index 893acaf..d84d53c 100644 --- a/src/main/java/org/example/ServerApp.java +++ b/server/src/main/java/com/example/redes/ServerApp.java @@ -1,4 +1,4 @@ -package org.example; +package com.example.redes; import java.io.BufferedReader; import java.io.IOException; diff --git a/settings.gradle b/settings.gradle index 2fcfd68..f75074f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ -rootProject.name = 'redes' +rootProject.name = 'Redes' +include('client') +include('server')