Skip to content
Snippets Groups Projects
Commit 60de8eea authored by Gonzalo Fabian Cameto Hernandez's avatar Gonzalo Fabian Cameto Hernandez
Browse files

War regenerado

parent c5edc9ae
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 12 deletions
Frontend Angular 4/src/app/shared/config.ts
+ 4
− 4
View file @ 60de8eea
//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';
//export const GHCI_URL = window.location.protocol == 'http:'? 'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint';
export const SERVER = window.location.protocol + '//' + window.location.host;//'http://localhost:9090';
export const GHCI_URL = window.location.protocol == 'http:'? 'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint';
Servidor JEE/WebContent/0.1cf3c981b4810009465b.chunk.js deleted 100644 → 0
+ 0
− 1
View file @ c5edc9ae
This diff is collapsed.
Servidor JEE/WebContent/0.a2834ddcf91edfd3595a.chunk.js 0 → 100644
+ 1
− 0
View file @ 60de8eea
This diff is collapsed.
Servidor JEE/WebContent/1.41cb59b8f355e9241f05.chunk.js → Servidor JEE/WebContent/1.408372ca9caba82cfa85.chunk.js
+ 1
− 0
View file @ 60de8eea
source diff could not be displayed: it is too large. Options to address this: view the blob.
Servidor JEE/WebContent/3.75985c86a9a9f51d170e.chunk.js 0 → 100644
+ 1
− 0
View file @ 60de8eea
This diff is collapsed.
Servidor JEE/WebContent/3.cf1c44ac5f53ac78dbc0.chunk.js deleted 100644 → 0
+ 0
− 1
View file @ c5edc9ae
This diff is collapsed.
Servidor JEE/WebContent/index.html
+ 1
− 1
View file @ 60de8eea
<!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><link href="styles.aedd881417e13b7e91de.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.913a63f4ac14aae85d5b.bundle.js"></script><script type="text/javascript" src="polyfills.0ae3b4f3e37e6249952f.bundle.js"></script><script type="text/javascript" src="scripts.efaaeb35620859890388.bundle.js"></script><script type="text/javascript" src="vendor.28df4c379f8c8b804b36.bundle.js"></script><script type="text/javascript" src="main.b97df27904c57669405d.bundle.js"></script></body></html>
\ No newline at end of file
<!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><link href="styles.aedd881417e13b7e91de.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.02de299abe63337e65f5.bundle.js"></script><script type="text/javascript" src="polyfills.0ae3b4f3e37e6249952f.bundle.js"></script><script type="text/javascript" src="scripts.efaaeb35620859890388.bundle.js"></script><script type="text/javascript" src="vendor.28df4c379f8c8b804b36.bundle.js"></script><script type="text/javascript" src="main.b97df27904c57669405d.bundle.js"></script></body></html>
\ No newline at end of file
Servidor JEE/WebContent/inline.913a63f4ac14aae85d5b.bundle.js → Servidor JEE/WebContent/inline.02de299abe63337e65f5.bundle.js
+ 1
− 0
View file @ 60de8eea
!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={12:0};r.e=function(e){function n(){a.onerror=a.onload=null,clearTimeout(f);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=new Promise(function(r,n){o[e]=[r,n]});o[e][2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,r.nc&&a.setAttribute("nonce",r.nc),a.src=r.p+""+e+"."+{0:"1cf3c981b4810009465b",1:"41cb59b8f355e9241f05",2:"b856a7489ad17cab0edc",3:"cf1c44ac5f53ac78dbc0",4:"944819365f9d2d51724d",5:"59cc434c85d03332d50a",6:"bb496a10043de2a02b50",7:"0ae3b4f3e37e6249952f",8:"b97df27904c57669405d",9:"60839f966270b27d9f76",10:"efaaeb35620859890388"}[e]+".chunk.js";var f=setTimeout(n,12e4);return a.onerror=a.onload=n,c.appendChild(a),t},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,a,c){for(var u,f,i,d=0,l=[];d<t.length;d++)f=t[d],o[f]&&l.push(o[f][0]),o[f]=0;for(u in a)Object.prototype.hasOwnProperty.call(a,u)&&(e[u]=a[u]);for(n&&n(t,a,c);l.length;)l.shift()();if(c)for(d=0;d<c.length;d++)i=r(r.s=c[d]);return i};var t={},o={12:0};r.e=function(e){function n(){c.onerror=c.onload=null,clearTimeout(u);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=new Promise(function(r,n){o[e]=[r,n]});o[e][2]=t;var a=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:"a2834ddcf91edfd3595a",1:"408372ca9caba82cfa85",2:"b856a7489ad17cab0edc",3:"75985c86a9a9f51d170e",4:"944819365f9d2d51724d",5:"59cc434c85d03332d50a",6:"bb496a10043de2a02b50",7:"0ae3b4f3e37e6249952f",8:"b97df27904c57669405d",9:"60839f966270b27d9f76",10:"efaaeb35620859890388"}[e]+".chunk.js";var u=setTimeout(n,12e4);return c.onerror=c.onload=n,a.appendChild(c),t},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
Servidor JEE/src/main/java/edu/proygrado/matefun/AuthenticationFilter.java
+ 1
− 3
View file @ 60de8eea
......@@ -7,8 +7,6 @@ import javax.inject.Inject;
import javax.ws.rs.Priorities;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.ResourceInfo;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
......@@ -26,7 +24,7 @@ public class AuthenticationFilter implements ContainerRequestFilter {
@Override
public void filter(ContainerRequestContext context) throws IOException {
String path = context.getUriInfo().getPath();
if(path.equals("/login")){
if(path.contains("login")){
return;
}
......
Servidor JEE/src/main/resources/META-INF/persistence.xml
+ 2
− 2
View file @ 60de8eea
......@@ -36,9 +36,9 @@
<!-- <class>edu.proygrado.modelo.Liceo</class> -->
<!-- <class>edu.proygrado.modelo.LiceoPK</class> -->
<!-- <class>edu.proygrado.modelo.Usuario</class> -->
<!-- <class>edu.proygrado.modelo.Sesion</class> -->
<!-- <properties> -->
<!-- <property name="javax.persistence.schema-generation.database.action" -->
<!-- value="none" /> -->
<!-- <property name="javax.persistence.schema-generation.database.action" value="none" /> -->
<!-- <property name="hibernate.transaction.jta.platform" value="org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform"/> -->
<!-- </properties> -->
<!-- </persistence-unit> -->
......
matefun.war
+ 0
− 0
View file @ 60de8eea
No preview for this file type
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