From 7ab49d2f77f94c8aab4e9067ff78cb85dc0c4611 Mon Sep 17 00:00:00 2001
From: Ignacio Fagian <nachofagian@gmail.com>
Date: Sat, 24 Nov 2018 15:13:11 -0300
Subject: [PATCH] Se arregla referencia apache utils en pom.xml, se reutiliza
carpeta i18n del binario en java
---
Frontend Angular 4/src/app/shared/config.ts | 8 ++++----
Servidor JEE/pom.xml | 9 ++++-----
.../src/main/java/edu/proygrado/ejb/CommandsBean.java | 5 ++++-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts
index cf69c79..ea17a3b 100755
--- a/Frontend Angular 4/src/app/shared/config.ts
+++ b/Frontend Angular 4/src/app/shared/config.ts
@@ -17,8 +17,8 @@
// export const GHCI_URL = 'ws://192.168.129.3:9090/endpoint';
// Google cloud platform
-// export const SERVER = 'http://35.199.110.129:9090';
-// export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint';
+export const SERVER = 'http://35.199.110.129:9090';
+export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint';
-export const SERVER = 'http://localhost:8080';
-export const GHCI_URL = 'ws://localhost:8080/endpoint';
+// export const SERVER = 'http://localhost:8080';
+// export const GHCI_URL = 'ws://localhost:8080/endpoint';
diff --git a/Servidor JEE/pom.xml b/Servidor JEE/pom.xml
index 5d04865..0d85609 100644
--- a/Servidor JEE/pom.xml
+++ b/Servidor JEE/pom.xml
@@ -47,11 +47,10 @@
<version>2.9.0</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.0</version>
- </dependency>
-
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.4</version>
+ </dependency>
</dependencies>
<build>
diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java
index a944abd..ae467da 100644
--- a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java
+++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java
@@ -203,6 +203,7 @@ public class CommandsBean {
this.proceso.destroy();
}
+ String fullPathBinarios = context.getRealPath("/WEB-INF/classes/edu/proygrado/binarios");
String fullPathMatefun = context.getRealPath("/WEB-INF/classes/edu/proygrado/binarios/MateFun");
String fullPathMatefunTmp = context.getRealPath("/WEB-INF/classes/edu/proygrado/binarios/MateFunTmp")+"/";
@@ -225,7 +226,7 @@ public class CommandsBean {
}
if (this.i18n == null) {
- this.i18n = this.i18nEJB.getLanguage(context.getRealPath("/WEB-INF/classes/edu/proygrado/binarios/i18n"), userLang);
+ this.i18n = this.i18nEJB.getLanguage(context.getRealPath("/WEB-INF/classes/edu/proygrado/binarios/internationalization"), userLang);
}
if (config != null && config.isArgumentoI() && config.isArgumentoF()) {
@@ -247,6 +248,8 @@ public class CommandsBean {
}
this.latch = new CountDownLatch(2);
+
+ this.builder.directory(new File(fullPathBinarios));
Map<String, String> envs = this.builder.environment();
--
GitLab