diff --git a/.DS_Store b/.DS_Store old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/.angular-cli.json b/Frontend Angular 4/.angular-cli.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/.editorconfig b/Frontend Angular 4/.editorconfig old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/.gitignore b/Frontend Angular 4/.gitignore old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/custom codemirror/show-hint.js b/Frontend Angular 4/custom codemirror/show-hint.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/package-lock.json b/Frontend Angular 4/package-lock.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror/addons/functions_definition_EN.js b/Frontend Angular 4/src/app/layout/matefun/codemirror/addons/functions_definition_EN.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror/addons/functions_definition_ES.js b/Frontend Angular 4/src/app/layout/matefun/codemirror/addons/functions_definition_ES.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror/addons/hint_words.js b/Frontend Angular 4/src/app/layout/matefun/codemirror/addons/hint_words.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js b/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.html b/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.scss b/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.spec.ts b/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.ts b/Frontend Angular 4/src/app/layout/plotter/animation-control/animation-control.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.scss b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.html b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.scss b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.spec.ts b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.ts b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.module.ts b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/directives/closePopover.directive.ts b/Frontend Angular 4/src/app/shared/directives/closePopover.directive.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/directives/directives.module.ts b/Frontend Angular 4/src/app/shared/directives/directives.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/titlecase.module.ts b/Frontend Angular 4/src/app/shared/modules/titlecase.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/translate/i18n.module.ts b/Frontend Angular 4/src/app/shared/modules/translate/i18n.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/pipes/titlecase.pipe.ts b/Frontend Angular 4/src/app/shared/pipes/titlecase.pipe.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/assets/i18n/en.json b/Frontend Angular 4/src/assets/i18n/en.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/assets/i18n/es.json b/Frontend Angular 4/src/assets/i18n/es.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/hints.css b/Frontend Angular 4/src/styles/hints.css old mode 100644 new mode 100755 diff --git a/Servidor JEE/.factorypath b/Servidor JEE/.factorypath old mode 100644 new mode 100755 diff --git a/Servidor JEE/.gitignore b/Servidor JEE/.gitignore old mode 100644 new mode 100755 diff --git a/Servidor JEE/.metadata/WebContent/WEB-INF/faces-config.pageflow b/Servidor JEE/.metadata/WebContent/WEB-INF/faces-config.pageflow old mode 100644 new mode 100755 diff --git a/Servidor JEE/.metadata/ejbModule/WEB-INF/faces-config.pageflow b/Servidor JEE/.metadata/ejbModule/WEB-INF/faces-config.pageflow old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/.htaccess b/Servidor JEE/WebContent/.htaccess old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/0.chunk.js b/Servidor JEE/WebContent/0.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/0.chunk.js.map b/Servidor JEE/WebContent/0.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/1.chunk.js b/Servidor JEE/WebContent/1.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/1.chunk.js.map b/Servidor JEE/WebContent/1.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/2.chunk.js b/Servidor JEE/WebContent/2.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/2.chunk.js.map b/Servidor JEE/WebContent/2.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/3.chunk.js b/Servidor JEE/WebContent/3.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/3.chunk.js.map b/Servidor JEE/WebContent/3.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/3rdpartylicenses.txt b/Servidor JEE/WebContent/3rdpartylicenses.txt old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/4.chunk.js b/Servidor JEE/WebContent/4.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/4.chunk.js.map b/Servidor JEE/WebContent/4.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/5.chunk.js b/Servidor JEE/WebContent/5.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/5.chunk.js.map b/Servidor JEE/WebContent/5.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/6.chunk.js b/Servidor JEE/WebContent/6.chunk.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/6.chunk.js.map b/Servidor JEE/WebContent/6.chunk.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/META-INF/MANIFEST.MF b/Servidor JEE/WebContent/META-INF/MANIFEST.MF old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/faces-config.xml b/Servidor JEE/WebContent/WEB-INF/faces-config.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/jboss-web.xml b/Servidor JEE/WebContent/WEB-INF/jboss-web.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/lib/javamelody-core-1.68.1.jar b/Servidor JEE/WebContent/WEB-INF/lib/javamelody-core-1.68.1.jar old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/lib/jrobin-1.5.9.jar b/Servidor JEE/WebContent/WEB-INF/lib/jrobin-1.5.9.jar old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/lib/json-simple-1.1.1.jar b/Servidor JEE/WebContent/WEB-INF/lib/json-simple-1.1.1.jar old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/matefun.properties b/Servidor JEE/WebContent/WEB-INF/matefun.properties old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/WEB-INF/web.xml b/Servidor JEE/WebContent/WEB-INF/web.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/favicon.ico b/Servidor JEE/WebContent/favicon.ico old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/fontawesome-webfont.674f50d287a8c48dc19b.eot b/Servidor JEE/WebContent/fontawesome-webfont.674f50d287a8c48dc19b.eot old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/fontawesome-webfont.912ec66d7572ff821749.svg b/Servidor JEE/WebContent/fontawesome-webfont.912ec66d7572ff821749.svg old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/fontawesome-webfont.af7ae505a9eed503f8b8.woff2 b/Servidor JEE/WebContent/fontawesome-webfont.af7ae505a9eed503f8b8.woff2 old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/fontawesome-webfont.b06871f281fee6b241d6.ttf b/Servidor JEE/WebContent/fontawesome-webfont.b06871f281fee6b241d6.ttf old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/fontawesome-webfont.fee66e712a8a08eef580.woff b/Servidor JEE/WebContent/fontawesome-webfont.fee66e712a8a08eef580.woff old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/index.html b/Servidor JEE/WebContent/index.html old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/inline.bundle.js b/Servidor JEE/WebContent/inline.bundle.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/inline.bundle.js.map b/Servidor JEE/WebContent/inline.bundle.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/main.bundle.js b/Servidor JEE/WebContent/main.bundle.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/main.bundle.js.map b/Servidor JEE/WebContent/main.bundle.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/polyfills.bundle.js b/Servidor JEE/WebContent/polyfills.bundle.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/polyfills.bundle.js.map b/Servidor JEE/WebContent/polyfills.bundle.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/scripts.bundle.js b/Servidor JEE/WebContent/scripts.bundle.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/scripts.bundle.js.map b/Servidor JEE/WebContent/scripts.bundle.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/styles.bundle.js b/Servidor JEE/WebContent/styles.bundle.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/styles.bundle.js.map b/Servidor JEE/WebContent/styles.bundle.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/vendor.bundle.js b/Servidor JEE/WebContent/vendor.bundle.js old mode 100644 new mode 100755 diff --git a/Servidor JEE/WebContent/vendor.bundle.js.map b/Servidor JEE/WebContent/vendor.bundle.js.map old mode 100644 new mode 100755 diff --git a/Servidor JEE/bin/target/classes/edu/proygrado/binarios/MateFunTmp/3.mf b/Servidor JEE/bin/target/classes/edu/proygrado/binarios/MateFunTmp/3.mf old mode 100644 new mode 100755 diff --git a/Servidor JEE/dist/matefun.war b/Servidor JEE/dist/matefun.war old mode 100644 new mode 100755 diff --git a/Servidor JEE/ejbModule/META-INF/MANIFEST.MF b/Servidor JEE/ejbModule/META-INF/MANIFEST.MF old mode 100644 new mode 100755 diff --git a/Servidor JEE/ejbModule/META-INF/ejb-jar.xml b/Servidor JEE/ejbModule/META-INF/ejb-jar.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/ejbModule/WEB-INF/ejb-jar.xml b/Servidor JEE/ejbModule/WEB-INF/ejb-jar.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/ejbModule/WEB-INF/faces-config.xml b/Servidor JEE/ejbModule/WEB-INF/faces-config.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/lib/eclipselink.jar b/Servidor JEE/lib/eclipselink.jar old mode 100644 new mode 100755 diff --git a/Servidor JEE/lib/sqljdbc41.jar b/Servidor JEE/lib/sqljdbc41.jar old mode 100644 new mode 100755 diff --git a/Servidor JEE/pom.xml b/Servidor JEE/pom.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun index 7f916f8455c06362fe97caf948a94ad70e785d25..8c935bad9d661dbc2ecb0633553d2b2c46445fe1 100755 Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun differ diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/AlumnoDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/AlumnoDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/ArchivoDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/ArchivoDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/BackupAlumnoDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/BackupAlumnoDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/BackupDocenteDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/BackupDocenteDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/BackupUsuarioDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/BackupUsuarioDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/ConfiguracionDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/ConfiguracionDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/CredencialesDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/CredencialesDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/EvaluacionDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/EvaluacionDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/GrupoDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/GrupoDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleCourseDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleCourseDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleCoursesInfoDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleCoursesInfoDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleRoleDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleRoleDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleTokensDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleTokensDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleUserInfoDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/MoodleUserInfoDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/dto/UsuarioDTO.java b/Servidor JEE/src/main/java/edu/proygrado/dto/UsuarioDTO.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/ArchivosEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/ArchivosEJB.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java old mode 100644 new mode 100755 index 4d2eab67aabc944a5cbe954ae24bb0d6bc579696..07bf84aa83e37a44740c4b57330a8c15fb4df142 --- a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java +++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java @@ -326,8 +326,10 @@ public class CommandsBean { try { Scanner s = new Scanner(proceso.getInputStream()); latch.countDown(); - Pattern p = Pattern.compile(String.format("OUT%1$s:(%1$s:)*\\[\\]", _i18n.get("Figure"))); - Pattern p3d = Pattern.compile(String.format("OUT%1$s:(%1$s:)*\\[\\]",_i18n.get("3D Figure"))); + Pattern p = Pattern.compile(String.format("OUT\\[%1$s(,%1$s)*\\]", _i18n.get("Figure"))); + // Pattern.compile(String.format("OUT%1$s:(%1$s:)*\\[\\]", _i18n.get("Figure"))); + Pattern p3d = Pattern.compile(String.format("OUT\\[%1$s(,%1$s)*\\]",_i18n.get("3D Figure"))); + //Pattern.compile(String.format("OUT%1$s:(%1$s:)*\\[\\]",_i18n.get("3D Figure"))); String i18n_OUTFigure = String.format("OUT%s", _i18n.get("Figure")); String i18n_OUT3D_Figure = String.format("OUT%s", _i18n.get("3D Figure")); diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/GruposEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/GruposEJB.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/I18nEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/I18nEJB.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/InvitadoEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/InvitadoEJB.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/UsuarioEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/UsuarioEJB.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/ApplicationConfig.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/ApplicationConfig.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/AuthenticationFilter.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/AuthenticationFilter.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/CORSFilter.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/CORSFilter.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/DatosDePrueba.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/DatosDePrueba.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/InvitadoSesion.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/InvitadoSesion.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunException.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunException.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunExceptionMapper.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunExceptionMapper.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunForbiddenException.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunForbiddenException.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunUnauthorizedException.java b/Servidor JEE/src/main/java/edu/proygrado/matefun/MatefunUnauthorizedException.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Alumno.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Alumno.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Archivo.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Archivo.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Configuracion.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Configuracion.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Docente.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Docente.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/EstadoArchivo.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/EstadoArchivo.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Evaluacion.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Evaluacion.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Grupo.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Grupo.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/GrupoPK.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/GrupoPK.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Liceo.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Liceo.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/LiceoPK.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/LiceoPK.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Sesion.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Sesion.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/modelo/Usuario.java b/Servidor JEE/src/main/java/edu/proygrado/modelo/Usuario.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/servicios/archivos/ArchivosRS.java b/Servidor JEE/src/main/java/edu/proygrado/servicios/archivos/ArchivosRS.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/servicios/ghci/WebSocketEndpoint.java b/Servidor JEE/src/main/java/edu/proygrado/servicios/ghci/WebSocketEndpoint.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/servicios/grupos/GruposRS.java b/Servidor JEE/src/main/java/edu/proygrado/servicios/grupos/GruposRS.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/servicios/login/LoginRS.java b/Servidor JEE/src/main/java/edu/proygrado/servicios/login/LoginRS.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/servicios/usuario/UsuarioRS.java b/Servidor JEE/src/main/java/edu/proygrado/servicios/usuario/UsuarioRS.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/java/edu/proygrado/test/Test.java b/Servidor JEE/src/main/java/edu/proygrado/test/Test.java old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/resources/META-INF/persistence.xml b/Servidor JEE/src/main/resources/META-INF/persistence.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/webapp/WEB-INF/web.xml b/Servidor JEE/src/main/webapp/WEB-INF/web.xml old mode 100644 new mode 100755 diff --git a/Servidor JEE/src/main/webapp/index.jsp b/Servidor JEE/src/main/webapp/index.jsp old mode 100644 new mode 100755 diff --git a/addToGrupo.sh b/addToGrupo.sh old mode 100644 new mode 100755 index 8e90e7af5efeb6a19903238fe3392a113c7fcb54..1dbd57ee855b099858fb9f2d3e208685aadf9443 --- a/addToGrupo.sh +++ b/addToGrupo.sh @@ -2,7 +2,7 @@ # csv: user,liceo,anio,grupo,grado # todas las filas tienen que terminar con enter -INPUT=grupos-javier.csv +INPUT=grupos-referentes.csv SERVER=https://www.fing.edu.uy/proyectos/matefun/servicios #http:/localhost:8080/servicios diff --git a/addUsers.sh b/addUsers.sh old mode 100644 new mode 100755 diff --git a/generate-war.sh b/generate-war.sh old mode 100644 new mode 100755 diff --git a/matefun.war b/matefun.war old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755