m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin <marcin.j.chrzanowski@gmail.com>2019-11-27 17:22:13 +0100
committerGitHub <noreply@github.com>2019-11-27 17:22:13 +0100
commit6d27310b2cdbd6f412157eee25cc68df9486db14 (patch)
treeb7ebab7fa715b194509eee9cb6ee4984ba3db840 /src
parent97589d8380ca12fa0a75163a6f5bd79a7e1039fa (diff)
Parametrize RMI host (#43)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java3
-rw-r--r--src/main/resources/application.properties1
-rw-r--r--src/main/resources/pl/edu/mimuw/cloudatlas/client/application.properties2
-rw-r--r--src/main/resources/pl/edu/mimuw/cloudatlas/fetcher/fetcher.policy3
-rw-r--r--src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java2
5 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java
index 557ba39..db9c09f 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java
@@ -34,7 +34,8 @@ public class ClientController {
ClientController() {
try {
- Registry registry = LocateRegistry.getRegistry("localhost");
+ String hostname = System.getProperty("agent_hostname");
+ Registry registry = LocateRegistry.getRegistry(hostname);
this.api = (Api) registry.lookup("Api");
} catch (Exception e) {
System.err.println("Client exception:");
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 9cbc2e8..bb48ff5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+server.port=0
spring.application.name=CloudAtlas Client
spring.thymeleaf.cache=false
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/application.properties b/src/main/resources/pl/edu/mimuw/cloudatlas/client/application.properties
deleted file mode 100644
index 5d26214..0000000
--- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-server.port=8081
-spring.application.name=CloudAtlas Client
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/fetcher/fetcher.policy b/src/main/resources/pl/edu/mimuw/cloudatlas/fetcher/fetcher.policy
deleted file mode 100644
index 5d74bde..0000000
--- a/src/main/resources/pl/edu/mimuw/cloudatlas/fetcher/fetcher.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
- permission java.security.AllPermission;
-}; \ No newline at end of file
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java
index 1d7a2c5..33fb56f 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java
@@ -45,7 +45,7 @@ public class AgentIntegrationTest {
public static void bindApi() throws Exception {
registryProcess = Runtime.getRuntime().exec("./scripts/registry");
Thread.sleep(10000);
- agentProcess = Runtime.getRuntime().exec("./gradlew runAgent");
+ agentProcess = Runtime.getRuntime().exec("./gradlew runAgent -Dhostname=localhost");
Thread.sleep(10000);
registry = LocateRegistry.getRegistry("localhost");