diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java index e2152f1..c10a105 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java @@ -267,7 +267,7 @@ public class TaskUtil { try { htc.startTask(tid); } catch (Exception e) { - throw new BPMException("BPM501", "NO SE HA PODIDO INICIAR LA TAREA {0} ", e, tid); + throw new BPMException("BPM501",String.format("NO SE HA PODIDO INICIAR LA TAREA {0} %s ", e.toString()) , e, tid); } } @@ -281,7 +281,7 @@ public class TaskUtil { try { htc.claimTask(tid, pUser); } catch (Exception e) { - throw new BPMException("BPM500", "NO SE HA PODIDO RESERVAR LA TAREA {0} PARA EL USUARIO {1}", e, tid, pUser); + throw new BPMException("BPM500", String.format("NO SE HA PODIDO RESERVAR LA TAREA {0} PARA EL USUARIO {1} %s", e.toString()), e, tid, pUser); } } diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index b8b3895..1627429 100644 Binary files a/base/bpm/bpmlib/target/bpmlib-2.1.jar and b/base/bpm/bpmlib/target/bpmlib-2.1.jar differ diff --git a/base/bpm/bpmlib/target/classes/.netbeans_automatic_build b/base/bpm/bpmlib/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/TaskUtil.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/TaskUtil.class index 0299b60..5c25ecb 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/TaskUtil.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/TaskUtil.class differ diff --git a/base/bpm/bpmlib/target/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 867f12d..9aa7cc5 100644 --- a/base/bpm/bpmlib/target/maven-archiver/pom.properties +++ b/base/bpm/bpmlib/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:38 ECT 2022 +#Thu Nov 24 14:07:13 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=bpmlib diff --git a/base/bpm/bpmlib/target/test-classes/.netbeans_automatic_build b/base/bpm/bpmlib/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/bpm/simple/target/maven-archiver/pom.properties b/base/bpm/simple/target/maven-archiver/pom.properties index abc85bd..1d2fe38 100644 --- a/base/bpm/simple/target/maven-archiver/pom.properties +++ b/base/bpm/simple/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:33 ECT 2022 +#Thu Nov 24 14:07:07 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=simple diff --git a/base/bpm/simple/target/simple-2.1.jar b/base/bpm/simple/target/simple-2.1.jar index bc83b1f..b73f115 100644 Binary files a/base/bpm/simple/target/simple-2.1.jar and b/base/bpm/simple/target/simple-2.1.jar differ diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index bbdb725..92cb00e 100644 Binary files a/base/business/armas/target/armas-2.1.jar and b/base/business/armas/target/armas-2.1.jar differ diff --git a/base/business/armas/target/classes/.netbeans_automatic_build b/base/business/armas/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 7a297bb..cd20a5d 100644 --- a/base/business/armas/target/maven-archiver/pom.properties +++ b/base/business/armas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:59 ECT 2022 +#Thu Nov 24 14:07:34 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=armas diff --git a/base/business/armas/target/test-classes/.netbeans_automatic_build b/base/business/armas/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/business/general/target/general-2.1.jar b/base/business/general/target/general-2.1.jar index a88db42..de10765 100644 Binary files a/base/business/general/target/general-2.1.jar and b/base/business/general/target/general-2.1.jar differ diff --git a/base/business/general/target/maven-archiver/pom.properties b/base/business/general/target/maven-archiver/pom.properties index 752573e..a372a2f 100644 --- a/base/business/general/target/maven-archiver/pom.properties +++ b/base/business/general/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:53 ECT 2022 +#Thu Nov 24 14:07:28 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=general diff --git a/base/business/log/target/log-2.1.jar b/base/business/log/target/log-2.1.jar index 1dab4c3..c6352bc 100644 Binary files a/base/business/log/target/log-2.1.jar and b/base/business/log/target/log-2.1.jar differ diff --git a/base/business/log/target/maven-archiver/pom.properties b/base/business/log/target/maven-archiver/pom.properties index fb6e8df..d9bf572 100644 --- a/base/business/log/target/maven-archiver/pom.properties +++ b/base/business/log/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:55 ECT 2022 +#Thu Nov 24 14:07:30 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=log diff --git a/base/business/person/target/maven-archiver/pom.properties b/base/business/person/target/maven-archiver/pom.properties index f290867..ca405c9 100644 --- a/base/business/person/target/maven-archiver/pom.properties +++ b/base/business/person/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:50 ECT 2022 +#Thu Nov 24 14:07:25 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=person diff --git a/base/business/person/target/person-2.1.jar b/base/business/person/target/person-2.1.jar index 8abd575..b31250c 100644 Binary files a/base/business/person/target/person-2.1.jar and b/base/business/person/target/person-2.1.jar differ diff --git a/base/business/report/target/maven-archiver/pom.properties b/base/business/report/target/maven-archiver/pom.properties index 609d9d9..cc1b4be 100644 --- a/base/business/report/target/maven-archiver/pom.properties +++ b/base/business/report/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:54 ECT 2022 +#Thu Nov 24 14:07:29 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=report diff --git a/base/business/report/target/report-2.1.jar b/base/business/report/target/report-2.1.jar index 91cd0fa..0acc66b 100644 Binary files a/base/business/report/target/report-2.1.jar and b/base/business/report/target/report-2.1.jar differ diff --git a/base/business/viaticos/target/maven-archiver/pom.properties b/base/business/viaticos/target/maven-archiver/pom.properties index 872e7f8..3d40af0 100644 --- a/base/business/viaticos/target/maven-archiver/pom.properties +++ b/base/business/viaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:56 ECT 2022 +#Thu Nov 24 14:07:32 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=viaticos diff --git a/base/business/viaticos/target/viaticos-2.1.jar b/base/business/viaticos/target/viaticos-2.1.jar index 083f5f8..c8e4faf 100644 Binary files a/base/business/viaticos/target/viaticos-2.1.jar and b/base/business/viaticos/target/viaticos-2.1.jar differ diff --git a/base/core/alfresco-client/src/main/resources/alfresco-api.properties b/base/core/alfresco-client/src/main/resources/alfresco-api.properties index ab6d83b..7bee032 100644 --- a/base/core/alfresco-client/src/main/resources/alfresco-api.properties +++ b/base/core/alfresco-client/src/main/resources/alfresco-api.properties @@ -1,7 +1,7 @@ #Configuracion APP -api.user=admin -api.password=admin -api.uri.base=http://172.17.26.75:8082/alfresco/service +api.user=jasperadmin +api.password=jasperadmin +api.uri.base=http://172.17.26.75:8081/alfresco/service api.uri.delete.general=/slingshot/doclib/action/file/node/ #Directorio base para las consultas api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary diff --git a/base/core/alfresco-client/target/alfresco-client-2.1.jar b/base/core/alfresco-client/target/alfresco-client-2.1.jar index 22c63a6..ccc3669 100644 Binary files a/base/core/alfresco-client/target/alfresco-client-2.1.jar and b/base/core/alfresco-client/target/alfresco-client-2.1.jar differ diff --git a/base/core/alfresco-client/target/classes/alfresco-api.properties b/base/core/alfresco-client/target/classes/alfresco-api.properties index ab6d83b..7bee032 100644 --- a/base/core/alfresco-client/target/classes/alfresco-api.properties +++ b/base/core/alfresco-client/target/classes/alfresco-api.properties @@ -1,7 +1,7 @@ #Configuracion APP -api.user=admin -api.password=admin -api.uri.base=http://172.17.26.75:8082/alfresco/service +api.user=jasperadmin +api.password=jasperadmin +api.uri.base=http://172.17.26.75:8081/alfresco/service api.uri.delete.general=/slingshot/doclib/action/file/node/ #Directorio base para las consultas api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary diff --git a/base/core/alfresco-client/target/maven-archiver/pom.properties b/base/core/alfresco-client/target/maven-archiver/pom.properties index 8942f37..92f52da 100644 --- a/base/core/alfresco-client/target/maven-archiver/pom.properties +++ b/base/core/alfresco-client/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:47 ECT 2022 +#Thu Nov 24 14:07:22 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=alfresco-client diff --git a/base/core/bpm/target/bpm-2.1.jar b/base/core/bpm/target/bpm-2.1.jar index f907a5f..253abca 100644 Binary files a/base/core/bpm/target/bpm-2.1.jar and b/base/core/bpm/target/bpm-2.1.jar differ diff --git a/base/core/bpm/target/maven-archiver/pom.properties b/base/core/bpm/target/maven-archiver/pom.properties index ecb7766..91acc22 100644 --- a/base/core/bpm/target/maven-archiver/pom.properties +++ b/base/core/bpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:35 ECT 2022 +#Thu Nov 24 14:07:09 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=bpm diff --git a/base/core/firmas/target/firmas-2.1.jar b/base/core/firmas/target/firmas-2.1.jar index d6139f4..63d4016 100644 Binary files a/base/core/firmas/target/firmas-2.1.jar and b/base/core/firmas/target/firmas-2.1.jar differ diff --git a/base/core/firmas/target/maven-archiver/pom.properties b/base/core/firmas/target/maven-archiver/pom.properties index fc37d12..3e74577 100644 --- a/base/core/firmas/target/maven-archiver/pom.properties +++ b/base/core/firmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:46 ECT 2022 +#Thu Nov 24 14:07:21 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=firmas diff --git a/base/dto/common/target/common-2.1.jar b/base/dto/common/target/common-2.1.jar index 9c4842c..ca873db 100644 Binary files a/base/dto/common/target/common-2.1.jar and b/base/dto/common/target/common-2.1.jar differ diff --git a/base/dto/common/target/maven-archiver/pom.properties b/base/dto/common/target/maven-archiver/pom.properties index 2add898..0dd7171 100644 --- a/base/dto/common/target/maven-archiver/pom.properties +++ b/base/dto/common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:20 ECT 2022 +#Thu Nov 24 14:06:54 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=common diff --git a/base/dto/dto/target/dto-2.1.jar b/base/dto/dto/target/dto-2.1.jar index 6d7ead4..9b7d8cc 100644 Binary files a/base/dto/dto/target/dto-2.1.jar and b/base/dto/dto/target/dto-2.1.jar differ diff --git a/base/dto/dto/target/maven-archiver/pom.properties b/base/dto/dto/target/maven-archiver/pom.properties index 2be746d..9feae0f 100644 --- a/base/dto/dto/target/maven-archiver/pom.properties +++ b/base/dto/dto/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:18 ECT 2022 +#Thu Nov 24 14:06:52 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=dto diff --git a/base/facade/target/classes/.netbeans_automatic_build b/base/facade/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/facade/target/facade-2.1.jar b/base/facade/target/facade-2.1.jar index b077ea9..10d9f65 100644 Binary files a/base/facade/target/facade-2.1.jar and b/base/facade/target/facade-2.1.jar differ diff --git a/base/facade/target/maven-archiver/pom.properties b/base/facade/target/maven-archiver/pom.properties index 5ac2ad8..e9c1eab 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:01:01 ECT 2022 +#Thu Nov 24 14:07:36 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facade diff --git a/base/facade/target/test-classes/.netbeans_automatic_build b/base/facade/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/facadeclient/target/classes/.netbeans_automatic_build b/base/facadeclient/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/facadeclient/target/facadeclient-2.1.jar b/base/facadeclient/target/facadeclient-2.1.jar index e39cca0..cc2700d 100644 Binary files a/base/facadeclient/target/facadeclient-2.1.jar and b/base/facadeclient/target/facadeclient-2.1.jar differ diff --git a/base/facadeclient/target/maven-archiver/pom.properties b/base/facadeclient/target/maven-archiver/pom.properties index e934123..8a4e6ee 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:01:00 ECT 2022 +#Thu Nov 24 14:07:35 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facadeclient diff --git a/base/facadeclient/target/test-classes/.netbeans_automatic_build b/base/facadeclient/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/persistence/commondb/target/commondb-2.1.jar b/base/persistence/commondb/target/commondb-2.1.jar index 762abf5..5651d0c 100644 Binary files a/base/persistence/commondb/target/commondb-2.1.jar and b/base/persistence/commondb/target/commondb-2.1.jar differ diff --git a/base/persistence/commondb/target/maven-archiver/pom.properties b/base/persistence/commondb/target/maven-archiver/pom.properties index 114cf5c..6c2cc79 100644 --- a/base/persistence/commondb/target/maven-archiver/pom.properties +++ b/base/persistence/commondb/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:29 ECT 2022 +#Thu Nov 24 14:07:03 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/target/classes/.netbeans_automatic_build b/base/persistence/parmas/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index 4868609..d287475 100644 --- a/base/persistence/parmas/target/maven-archiver/pom.properties +++ b/base/persistence/parmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:44 ECT 2022 +#Thu Nov 24 14:07:20 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=parmas diff --git a/base/persistence/parmas/target/parmas-2.1.jar b/base/persistence/parmas/target/parmas-2.1.jar index aa5edae..9449ac0 100644 Binary files a/base/persistence/parmas/target/parmas-2.1.jar and b/base/persistence/parmas/target/parmas-2.1.jar differ diff --git a/base/persistence/parmas/target/test-classes/.netbeans_automatic_build b/base/persistence/parmas/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/persistence/pbpm/target/maven-archiver/pom.properties b/base/persistence/pbpm/target/maven-archiver/pom.properties index 1825286..8ebe65e 100644 --- a/base/persistence/pbpm/target/maven-archiver/pom.properties +++ b/base/persistence/pbpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:22 ECT 2022 +#Thu Nov 24 14:06:56 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pbpm diff --git a/base/persistence/pbpm/target/pbpm-2.1.jar b/base/persistence/pbpm/target/pbpm-2.1.jar index 11715b4..27f0399 100644 Binary files a/base/persistence/pbpm/target/pbpm-2.1.jar and b/base/persistence/pbpm/target/pbpm-2.1.jar differ diff --git a/base/persistence/pcustomer/target/maven-archiver/pom.properties b/base/persistence/pcustomer/target/maven-archiver/pom.properties index b4e9dad..1ffa82c 100644 --- a/base/persistence/pcustomer/target/maven-archiver/pom.properties +++ b/base/persistence/pcustomer/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:31 ECT 2022 +#Thu Nov 24 14:07:05 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pcustomer diff --git a/base/persistence/pcustomer/target/pcustomer-2.1.jar b/base/persistence/pcustomer/target/pcustomer-2.1.jar index fed0492..9bd9105 100644 Binary files a/base/persistence/pcustomer/target/pcustomer-2.1.jar and b/base/persistence/pcustomer/target/pcustomer-2.1.jar differ diff --git a/base/persistence/pfirmas/target/maven-archiver/pom.properties b/base/persistence/pfirmas/target/maven-archiver/pom.properties index abce7b0..aa25192 100644 --- a/base/persistence/pfirmas/target/maven-archiver/pom.properties +++ b/base/persistence/pfirmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:42 ECT 2022 +#Thu Nov 24 14:07:17 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pfirmas diff --git a/base/persistence/pfirmas/target/pfirmas-2.1.jar b/base/persistence/pfirmas/target/pfirmas-2.1.jar index e68e8b1..9b78221 100644 Binary files a/base/persistence/pfirmas/target/pfirmas-2.1.jar and b/base/persistence/pfirmas/target/pfirmas-2.1.jar differ diff --git a/base/persistence/pgeneral/target/classes/.netbeans_automatic_build b/base/persistence/pgeneral/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/persistence/pgeneral/target/maven-archiver/pom.properties b/base/persistence/pgeneral/target/maven-archiver/pom.properties index 0114763..db9fade 100644 --- a/base/persistence/pgeneral/target/maven-archiver/pom.properties +++ b/base/persistence/pgeneral/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:27 ECT 2022 +#Thu Nov 24 14:07:01 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pgeneral diff --git a/base/persistence/pgeneral/target/pgeneral-2.1.jar b/base/persistence/pgeneral/target/pgeneral-2.1.jar index 8956655..d9a91c9 100644 Binary files a/base/persistence/pgeneral/target/pgeneral-2.1.jar and b/base/persistence/pgeneral/target/pgeneral-2.1.jar differ diff --git a/base/persistence/pgeneral/target/test-classes/.netbeans_automatic_build b/base/persistence/pgeneral/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/base/persistence/plog/target/maven-archiver/pom.properties b/base/persistence/plog/target/maven-archiver/pom.properties index ccb7897..0fa32da 100644 --- a/base/persistence/plog/target/maven-archiver/pom.properties +++ b/base/persistence/plog/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:39 ECT 2022 +#Thu Nov 24 14:07:14 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=plog diff --git a/base/persistence/plog/target/plog-2.1.jar b/base/persistence/plog/target/plog-2.1.jar index f801530..96c25dd 100644 Binary files a/base/persistence/plog/target/plog-2.1.jar and b/base/persistence/plog/target/plog-2.1.jar differ diff --git a/base/persistence/pviaticos/target/maven-archiver/pom.properties b/base/persistence/pviaticos/target/maven-archiver/pom.properties index 8409d4e..05a25a0 100644 --- a/base/persistence/pviaticos/target/maven-archiver/pom.properties +++ b/base/persistence/pviaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:41 ECT 2022 +#Thu Nov 24 14:07:16 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pviaticos diff --git a/base/persistence/pviaticos/target/pviaticos-2.1.jar b/base/persistence/pviaticos/target/pviaticos-2.1.jar index 2a3f95c..d27cb6a 100644 Binary files a/base/persistence/pviaticos/target/pviaticos-2.1.jar and b/base/persistence/pviaticos/target/pviaticos-2.1.jar differ diff --git a/base/persistence/util/target/maven-archiver/pom.properties b/base/persistence/util/target/maven-archiver/pom.properties index 9582583..873ce6c 100644 --- a/base/persistence/util/target/maven-archiver/pom.properties +++ b/base/persistence/util/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:32 ECT 2022 +#Thu Nov 24 14:07:06 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=util diff --git a/base/persistence/util/target/util-2.1.jar b/base/persistence/util/target/util-2.1.jar index 94fb625..c636761 100644 Binary files a/base/persistence/util/target/util-2.1.jar and b/base/persistence/util/target/util-2.1.jar differ diff --git a/base/sessionbeans/target/maven-archiver/pom.properties b/base/sessionbeans/target/maven-archiver/pom.properties index 940db6d..1e5798c 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:00:48 ECT 2022 +#Thu Nov 24 14:07:23 ECT 2022 version=2.1 groupId=com.fp.base artifactId=sessionbeans diff --git a/base/sessionbeans/target/sessionbeans-2.1.jar b/base/sessionbeans/target/sessionbeans-2.1.jar index 81495eb..0aed3e3 100644 Binary files a/base/sessionbeans/target/sessionbeans-2.1.jar and b/base/sessionbeans/target/sessionbeans-2.1.jar differ diff --git a/clients/comaco/ear/target/classes/.netbeans_automatic_build b/clients/comaco/ear/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/clients/comaco/ear/target/maiaear-2.1.ear b/clients/comaco/ear/target/maiaear-2.1.ear index dd869d6..0355b80 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1.ear and b/clients/comaco/ear/target/maiaear-2.1.ear differ diff --git a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar index bbdb725..92cb00e 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar index f907a5f..253abca 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar index b8b3895..1627429 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar and b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar index 9c4842c..ca873db 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar index 762abf5..5651d0c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar index 6d7ead4..9b7d8cc 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar index 0a4eddc..9c134c4 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facade.jar b/clients/comaco/ear/target/maiaear-2.1/facade.jar index b077ea9..10d9f65 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facade.jar and b/clients/comaco/ear/target/maiaear-2.1/facade.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar index e39cca0..cc2700d 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar and b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar index d6139f4..63d4016 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar index a88db42..de10765 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar index 1dab4c3..c6352bc 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar index aa5edae..9449ac0 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar index 11715b4..27f0399 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar index fed0492..9bd9105 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar index 8abd575..b31250c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar index e68e8b1..9b78221 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar index 8956655..d9a91c9 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar index f801530..96c25dd 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar index 91cd0fa..0acc66b 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar index 81495eb..0aed3e3 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar and b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar index bc83b1f..b73f115 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar index 94fb625..c636761 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar differ diff --git a/clients/comaco/ear/target/maven-archiver/pom.properties b/clients/comaco/ear/target/maven-archiver/pom.properties index 81639b9..acf7a59 100644 --- a/clients/comaco/ear/target/maven-archiver/pom.properties +++ b/clients/comaco/ear/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:01:01 ECT 2022 +#Thu Nov 24 14:07:37 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear diff --git a/clients/comaco/ear/target/test-classes/.netbeans_automatic_build b/clients/comaco/ear/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/clients/comaco/ear/target/test-classes/com/fp/clients/maia/AppTest.class b/clients/comaco/ear/target/test-classes/com/fp/clients/maia/AppTest.class deleted file mode 100644 index a8133d4..0000000 Binary files a/clients/comaco/ear/target/test-classes/com/fp/clients/maia/AppTest.class and /dev/null differ diff --git a/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml b/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml index 5eefa91..fb39ebb 100644 --- a/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml @@ -65,10 +65,14 @@ - + + + + + diff --git a/clients/comaco/environment-eap6/target/classes/.netbeans_automatic_build b/clients/comaco/environment-eap6/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml index 4b6aaac..fb39ebb 100644 --- a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml @@ -65,8 +65,16 @@ - + + + + + + diff --git a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar index 0a4eddc..9c134c4 100644 Binary files a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar and b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar differ diff --git a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties index d353418..278a427 100644 --- a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties +++ b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:01:01 ECT 2022 +#Thu Nov 24 14:07:36 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/clients/comaco/environment-eap6/target/test-classes/.netbeans_automatic_build b/clients/comaco/environment-eap6/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java index e4c1510..139642a 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java @@ -686,7 +686,6 @@ private String descategoria; MessageHelper.setMessageError(e); } } - @Override public void update() throws Exception { System.out.println(" Estamos en la matrix"); @@ -2337,9 +2336,10 @@ private String descategoria; * Ejecucion para mostrar el arma que se va a definir como perdida robada */ public void loadAlertLose(){ + verificaArmaExplosivo = Boolean.FALSE; record.getModifiedData().put("estado", CatalogDetailController.findCatalogo("ESTADOARMA", "RPER").getDescription()); record.setEstadocodigo("ESTADOARMA"); - record.setEstado("RPER"); + record.setEstado("RPER"); record.getModifiedData().put("provincia", ProvinceController.getDescProvByCodigo(record.getCountrycode(), record.getProvincecode())); @@ -2379,8 +2379,16 @@ private String descategoria; /** * de consultaArmasController */ + /** + * DECLARAR ARMA PERDIDA ACTUALIZANDO ESTADO + */ + public void declararArmaPerdida() throws Exception{ + update(); + save(); + } + public void setUsoActividad(String usoActividad) { this.usoActividad = usoActividad; } diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.java index a3e0fbb..dec19a0 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.java @@ -83,6 +83,9 @@ public class PermisosAutorizacionesController extends AbstractController - + + + diff --git a/frontend/src/main/webapp/pages/general/permisosAutorizaciones.xhtml b/frontend/src/main/webapp/pages/general/permisosAutorizaciones.xhtml index bd82c39..254e5a0 100644 --- a/frontend/src/main/webapp/pages/general/permisosAutorizaciones.xhtml +++ b/frontend/src/main/webapp/pages/general/permisosAutorizaciones.xhtml @@ -62,7 +62,7 @@ - + @@ -74,7 +74,6 @@ - @@ -89,7 +88,9 @@ - + + + diff --git a/frontend/target/classes/.netbeans_automatic_build b/frontend/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class index 2cb43f5..2b5b22b 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class index c84bf72..87dd929 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class differ diff --git a/frontend/target/classes/jasper.properties b/frontend/target/classes/jasper.properties index b91f9f6..8854a88 100644 --- a/frontend/target/classes/jasper.properties +++ b/frontend/target/classes/jasper.properties @@ -1,7 +1,7 @@ #http://172.17.26.185:8084/jasperserver/flow.html?_flowId=searchFlow&lastMode=true #http\://172.17.26.185\:8084/jasperserver/services/repository #produccion -jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository +jasperserver.repository=http\://172.17.26.75\:8081/jasperserver/services/repository jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler #desarrollo #jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository diff --git a/frontend/target/maia.war b/frontend/target/maia.war index aae4de3..8f94eab 100644 Binary files a/frontend/target/maia.war and b/frontend/target/maia.war differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class index 2cb43f5..2b5b22b 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class index c84bf72..87dd929 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/jasper.properties b/frontend/target/maia/WEB-INF/classes/jasper.properties index b91f9f6..8854a88 100644 --- a/frontend/target/maia/WEB-INF/classes/jasper.properties +++ b/frontend/target/maia/WEB-INF/classes/jasper.properties @@ -1,7 +1,7 @@ #http://172.17.26.185:8084/jasperserver/flow.html?_flowId=searchFlow&lastMode=true #http\://172.17.26.185\:8084/jasperserver/services/repository #produccion -jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository +jasperserver.repository=http\://172.17.26.75\:8081/jasperserver/services/repository jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler #desarrollo #jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository diff --git a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar index f907a5f..253abca 100644 Binary files a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/common-2.1.jar b/frontend/target/maia/WEB-INF/lib/common-2.1.jar index 9c4842c..ca873db 100644 Binary files a/frontend/target/maia/WEB-INF/lib/common-2.1.jar and b/frontend/target/maia/WEB-INF/lib/common-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar index 762abf5..5651d0c 100644 Binary files a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar and b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar index 6d7ead4..9b7d8cc 100644 Binary files a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar and b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar index e39cca0..cc2700d 100644 Binary files a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar and b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar index d6139f4..63d4016 100644 Binary files a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar index aa5edae..9449ac0 100644 Binary files a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar index 11715b4..27f0399 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar index fed0492..9bd9105 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar index e68e8b1..9b78221 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar index 8956655..d9a91c9 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar index bc83b1f..b73f115 100644 Binary files a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar and b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/util-2.1.jar b/frontend/target/maia/WEB-INF/lib/util-2.1.jar index 94fb625..c636761 100644 Binary files a/frontend/target/maia/WEB-INF/lib/util-2.1.jar and b/frontend/target/maia/WEB-INF/lib/util-2.1.jar differ diff --git a/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml b/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml index e17b832..61a1c4d 100644 --- a/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml +++ b/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml @@ -116,7 +116,6 @@ - + + + diff --git a/frontend/target/maia/pages/general/permisosAutorizaciones.xhtml b/frontend/target/maia/pages/general/permisosAutorizaciones.xhtml index bd82c39..254e5a0 100644 --- a/frontend/target/maia/pages/general/permisosAutorizaciones.xhtml +++ b/frontend/target/maia/pages/general/permisosAutorizaciones.xhtml @@ -62,7 +62,7 @@ - + @@ -74,7 +74,6 @@ - @@ -89,7 +88,9 @@ - + + + diff --git a/frontend/target/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index 719f207..bd8996c 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 22 17:01:17 ECT 2022 +#Thu Nov 24 14:07:52 ECT 2022 version=2.1 groupId=com.fp artifactId=frontend diff --git a/frontend/target/test-classes/.netbeans_automatic_build b/frontend/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000