Commit b7e7cb53 authored by Gonzalo Fabian Cameto Hernandez's avatar Gonzalo Fabian Cameto Hernandez
Browse files

Nuevo deploy, war actualizado, foco en figuras, pequeños bugs corregidos

parent 13280cfb
export const SERVER = 'https://matefun.mybluemix.net';
export const GHCI_URL = 'wss://matefun.mybluemix.net/endpoint';
//export const SERVER = 'https://matefun.mybluemix.net';
//export const GHCI_URL = 'wss://matefun.mybluemix.net/endpoint';
//export const SERVER = 'http://localhost:9090';
//export const GHCI_URL = 'ws://localhost:9090/endpoint';
export const SERVER = 'http://localhost:9090';
export const GHCI_URL = 'ws://localhost:9090/endpoint';
//Configuracion dinamica pensando en servidor con ip dinamica
//export const SERVER = window.location.protocol + '//' + window.location.host;//'http://localhost:9090';
......
......@@ -23,6 +23,6 @@
<div class="loading-bar"></div>
</div>
</app-root>
<script type="text/javascript" src="inline.279f5b7805393c592cc1.bundle.js"></script><script type="text/javascript" src="polyfills.fea873d1973cf1b50182.bundle.js"></script><script type="text/javascript" src="scripts.a7d4f6c9be340f14a0bf.bundle.js"></script><script type="text/javascript" src="vendor.d0fc90766e2861f3dcab.bundle.js"></script><script type="text/javascript" src="main.9fe31bcc272dfa1c22a9.bundle.js"></script></body>
<script type="text/javascript" src="inline.c090ab38b6b424e6649f.bundle.js"></script><script type="text/javascript" src="polyfills.fea873d1973cf1b50182.bundle.js"></script><script type="text/javascript" src="scripts.32b570002eddbb8f9caa.bundle.js"></script><script type="text/javascript" src="vendor.d0fc90766e2861f3dcab.bundle.js"></script><script type="text/javascript" src="main.62e4789477e889acbf3c.bundle.js"></script></body>
</html>
!function(e){function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}var n=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var f,u,i,d=0,l=[];d<t.length;d++)u=t[d],o[u]&&l.push(o[u][0]),o[u]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(t,c,a);l.length;)l.shift()();if(a)for(d=0;d<a.length;d++)i=r(r.s=a[d]);return i};var t={},o={11:0};r.e=function(e){function n(){c.onerror=c.onload=null,clearTimeout(a);var r=o[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}if(0===o[e])return Promise.resolve();if(o[e])return o[e][2];var t=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,r.nc&&c.setAttribute("nonce",r.nc),c.src=r.p+""+e+"."+{0:"dc6434ff3256e44e98cd",1:"24510bb18bce50ca445e",2:"aa7a113194139244bcd7",3:"821ca9fa4df43d12527a",4:"7ede62d57efe63f4f564",5:"0033f4b2d892007ff8d0",6:"fea873d1973cf1b50182",7:"9fe31bcc272dfa1c22a9",8:"e974ab90bd7f8fb6b551",9:"a7d4f6c9be340f14a0bf"}[e]+".chunk.js";var a=setTimeout(n,12e4);c.onerror=c.onload=n;var f=new Promise(function(r,n){o[e]=[r,n]});return o[e][2]=f,t.appendChild(c),f},r.m=e,r.c=t,r.i=function(e){return e},r.d=function(e,n,t){r.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},r.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(n,"a",n),n},r.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}var n=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var u,f,i,d=0,b=[];d<t.length;d++)f=t[d],o[f]&&b.push(o[f][0]),o[f]=0;for(u in c)Object.prototype.hasOwnProperty.call(c,u)&&(e[u]=c[u]);for(n&&n(t,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)i=r(r.s=a[d]);return i};var t={},o={11:0};r.e=function(e){function n(){c.onerror=c.onload=null,clearTimeout(a);var r=o[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}if(0===o[e])return Promise.resolve();if(o[e])return o[e][2];var t=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,r.nc&&c.setAttribute("nonce",r.nc),c.src=r.p+""+e+"."+{0:"dddfc681213dbab6ce18",1:"7ea0d46b0fe76a112ce3",2:"32fdccb32de98ae16ca7",3:"80867ddf12cea7698e2c",4:"d5e575db2c249cfd8253",5:"cb397b371eb202b127b6",6:"fea873d1973cf1b50182",7:"62e4789477e889acbf3c",8:"e974ab90bd7f8fb6b551",9:"32b570002eddbb8f9caa"}[e]+".chunk.js";var a=setTimeout(n,12e4);c.onerror=c.onload=n;var u=new Promise(function(r,n){o[e]=[r,n]});return o[e][2]=u,t.appendChild(c),u},r.m=e,r.c=t,r.i=function(e){return e},r.d=function(e,n,t){r.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},r.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(n,"a",n),n},r.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
......@@ -52,6 +52,13 @@
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
<build>
......
......@@ -5,6 +5,7 @@
*/
package edu.proygrado.ejb;
import java.io.FileReader;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
......@@ -17,12 +18,12 @@ import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ResponseProcessingException;
import javax.ws.rs.core.GenericType;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import edu.proygrado.dto.MoodleCourseDTO;
import edu.proygrado.dto.MoodleCoursesInfoDTO;
import edu.proygrado.dto.MoodleRoleDTO;
......@@ -31,7 +32,6 @@ import edu.proygrado.dto.MoodleUserInfoDTO;
import edu.proygrado.dto.UsuarioDTO;
import edu.proygrado.matefun.MatefunException;
import edu.proygrado.matefun.MatefunForbiddenException;
import edu.proygrado.matefun.MatefunUnauthorizedException;
import edu.proygrado.modelo.Alumno;
import edu.proygrado.modelo.Archivo;
import edu.proygrado.modelo.Configuracion;
......@@ -52,7 +52,7 @@ public class LoginEJB {
public static String moodleGroup = null;
public LoginEJB() {
super();
//leo archivo de configuración.
JSONParser parser = new JSONParser();
try {
String currentPath = System.getProperty("user.dir");
......@@ -63,7 +63,10 @@ public class LoginEJB {
LoginEJB.moodleApiEndpoint = (String) jsonObject.get("endpoint");
LoginEJB.moodleGroup = (String) jsonObject.get("group");
} catch (Exception e) {
e.printStackTrace();
// Para hacer deploy en BLUEMIX se utiliza esta configuración.
LoginEJB.moodleApiEndpoint = "https://tics.moodlecloud.com";
LoginEJB.moodleGroup = "Piloto";
e.printStackTrace();
System.out.print("No se ha podido cargar el archivo: /standalone/deployments/matefun.war/WEB-INF/config.json");
}
}
......
File added
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment