Removed socket timeout for the showcase
Change-Id: Ibbd23bc56220007f01cf428e3c06615254508e3e
Signed-off-by: Dirk Fauth <Dirk.Fauth@de.bosch.com>
diff --git a/manager/src/main/java/org/eclipse/app4mc/cloud/manager/App4McCloudManagerApplication.java b/manager/src/main/java/org/eclipse/app4mc/cloud/manager/App4McCloudManagerApplication.java
index d4399b6..7569953 100644
--- a/manager/src/main/java/org/eclipse/app4mc/cloud/manager/App4McCloudManagerApplication.java
+++ b/manager/src/main/java/org/eclipse/app4mc/cloud/manager/App4McCloudManagerApplication.java
@@ -30,9 +30,13 @@
if (!StringUtils.isEmpty(proxyHost) && !StringUtils.isEmpty(proxyPort)) {
if (!StringUtils.isEmpty(proxyUser) && !StringUtils.isEmpty(proxyPwd)) {
- Unirest.config().proxy(proxyHost, Integer.valueOf(proxyPort), proxyUser, proxyPwd);
+ Unirest.config()
+ .socketTimeout(0)
+ .proxy(proxyHost, Integer.valueOf(proxyPort), proxyUser, proxyPwd);
} else {
- Unirest.config().proxy(proxyHost, Integer.valueOf(proxyPort));
+ Unirest.config()
+ .socketTimeout(0)
+ .proxy(proxyHost, Integer.valueOf(proxyPort));
}
}
diff --git a/manager/src/main/java/org/eclipse/app4mc/cloud/manager/WorkflowController.java b/manager/src/main/java/org/eclipse/app4mc/cloud/manager/WorkflowController.java
index d972248..76507b2 100644
--- a/manager/src/main/java/org/eclipse/app4mc/cloud/manager/WorkflowController.java
+++ b/manager/src/main/java/org/eclipse/app4mc/cloud/manager/WorkflowController.java
@@ -297,8 +297,7 @@
// upload to service
MultipartBody multipartBody = Unirest.post(baseUrl)
- .field("file", Files.newInputStream(inputFile), originalFilename)
- .field("values", Arrays.asList("value1", "value2"));
+ .field("file", Files.newInputStream(inputFile), originalFilename);
ServiceConfiguration config = workflowStatus.getConfiguration(serviceName);
if (config != null) {
diff --git a/manager/src/main/java/org/eclipse/app4mc/cloud/manager/administration/AdminController.java b/manager/src/main/java/org/eclipse/app4mc/cloud/manager/administration/AdminController.java
index 908659d..4d1ea27 100644
--- a/manager/src/main/java/org/eclipse/app4mc/cloud/manager/administration/AdminController.java
+++ b/manager/src/main/java/org/eclipse/app4mc/cloud/manager/administration/AdminController.java
@@ -73,9 +73,9 @@
// TODO save to DB and load from DB in App4McCloudManagerApplication
Unirest.config().reset();
if (!StringUtils.isEmpty(proxyHost) && !StringUtils.isEmpty(proxyPort)) {
- Unirest.config().proxy(proxyHost, Integer.valueOf(proxyPort), proxyUser, proxyPwd);
+ Unirest.config().socketTimeout(0).proxy(proxyHost, Integer.valueOf(proxyPort), proxyUser, proxyPwd);
} else {
- Unirest.config().proxy(null);
+ Unirest.config().socketTimeout(0).proxy(null);
}
return "redirect:/admin";
diff --git a/manager/src/main/resources/services.txt b/manager/src/main/resources/services.txt
index 6c53903..7bc1d73 100644
--- a/manager/src/main/resources/services.txt
+++ b/manager/src/main/resources/services.txt
@@ -1,6 +1,13 @@
Migration;http://localhost:8080/app4mc/converter/;Model Migration Service
Validation;http://localhost:8181/app4mc/validation/;Model Validation Service
-INCHRON;https://am2inc.dev1.inchron.de/projects;INCHRON Transformation Service
RTC Analysis;http://localhost:8081/app4mc/analysis/;RTC Analysis Service
-Chart Interpreter;http://localhost:8082/app4mc/interpreter/;Chart Interpreter Service
-Chart Visualizer;http://localhost:8083/app4mc/visualization/barchart/;Chart Visualizer Service
\ No newline at end of file
+RTC Interpreter;http://localhost:8082/app4mc/interpreter/;RTC Interpreter Service
+Label per Core Interpreter;http://localhost:8084/app4mc/interpreter/label-per-core/;Label per Core Interpreter Service
+Label per Memory Interpreter;http://localhost:8084/app4mc/interpreter/label-per-memory/;Label per Memory Interpreter Service
+Label per Task Interpreter;http://localhost:8084/app4mc/interpreter/label-per-task/;Label per Task Interpreter Service
+Label Size Interpreter;http://localhost:8084/app4mc/interpreter/label-size/;Label Size Interpreter Service
+Chart Visualizer;http://localhost:8083/app4mc/visualization/barchart/;Chart Visualizer Service
+Amalthea 2 INCHRON;https://am2inc.dev1.inchron.de/projects;Amalthea to INCHRON Transformation Service
+Amalthea 2 SystemC;http://localhost:8282/app4mc/amlt2systemc/;Amalthea to SystemC Transformation Service
+APP4MC.Sim;http://139.30.201.40:2323/app4mc/simulation/;APP4MC SystemC Simulation Service
+INCHRON BTF Trace Visualization;https://trace.dev1.inchron.de/traces/;INCHRON BTF Trace Visualization Service
