diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index e0c2f87..b8b2d11 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/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 91993b8..e3a7ab2 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 -#Wed Nov 30 16:44:14 ECT 2022 +#Fri Dec 02 15:10:43 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=bpmlib diff --git a/base/bpm/simple/target/maven-archiver/pom.properties b/base/bpm/simple/target/maven-archiver/pom.properties index 6492d70..b66fa06 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 -#Wed Nov 30 16:44:09 ECT 2022 +#Fri Dec 02 15:10:36 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 ea880f1..fee44fe 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 90cba14..e61e3f2 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/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 977faa8..d386c8d 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 -#Wed Nov 30 16:44:34 ECT 2022 +#Fri Dec 02 15:11:11 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=armas diff --git a/base/business/general/target/general-2.1.jar b/base/business/general/target/general-2.1.jar index dad9088..665250b 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 babd888..1ad56f5 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 -#Wed Nov 30 16:44:28 ECT 2022 +#Fri Dec 02 15:11:03 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 16fde1c..b9bddd7 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 3212795..08cf784 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 -#Wed Nov 30 16:44:30 ECT 2022 +#Fri Dec 02 15:11:06 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 132e6cc..5770354 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 -#Wed Nov 30 16:44:25 ECT 2022 +#Fri Dec 02 15:10:59 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 f6ddfa2..df4c53c 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 690dcbe..f0b0058 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 -#Wed Nov 30 16:44:29 ECT 2022 +#Fri Dec 02 15:11:04 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 1b52eb4..a5d4319 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 81d6386..dd75136 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 -#Wed Nov 30 16:44:31 ECT 2022 +#Fri Dec 02 15:11:07 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 a902b81..aef4b5d 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 01b649e..8033507 100644 --- a/base/core/alfresco-client/src/main/resources/alfresco-api.properties +++ b/base/core/alfresco-client/src/main/resources/alfresco-api.properties @@ -2,7 +2,7 @@ api.user=admin api.password=admin #api.uri.base=http://172.17.26.184:8080/alfresco/service -api.url.base=http://172.17.26.91:8082/alfresco/service +api.uri.base=http://172.17.26.91:8082/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 fc782a4..81028ff 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 01b649e..8033507 100644 --- a/base/core/alfresco-client/target/classes/alfresco-api.properties +++ b/base/core/alfresco-client/target/classes/alfresco-api.properties @@ -2,7 +2,7 @@ api.user=admin api.password=admin #api.uri.base=http://172.17.26.184:8080/alfresco/service -api.url.base=http://172.17.26.91:8082/alfresco/service +api.uri.base=http://172.17.26.91:8082/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 9c090b2..572eee8 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 -#Wed Nov 30 16:44:23 ECT 2022 +#Fri Dec 02 15:10:55 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 50d4522..f7310c1 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 b2cdf8e..d5272bf 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 -#Wed Nov 30 16:44:11 ECT 2022 +#Fri Dec 02 15:10:38 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 b5e82a8..93a7951 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 75fb82d..dde46e6 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 -#Wed Nov 30 16:44:21 ECT 2022 +#Fri Dec 02 15:10:54 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 59edc8c..00e8cde 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 b2ba532..437dcc3 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 -#Wed Nov 30 16:43:57 ECT 2022 +#Fri Dec 02 15:10:18 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 d7b818a..220135c 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 1ea6c84..a948fb8 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 -#Wed Nov 30 16:43:54 ECT 2022 +#Fri Dec 02 15:10:15 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=dto diff --git a/base/facade/target/facade-2.1.jar b/base/facade/target/facade-2.1.jar index ba3d63f..23fc3bd 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 03af98b..f327168 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 30 16:44:36 ECT 2022 +#Fri Dec 02 15:11:14 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facade diff --git a/base/facadeclient/target/facadeclient-2.1.jar b/base/facadeclient/target/facadeclient-2.1.jar index a8c9c30..d0a1ea2 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 499d1af..5a1eb85 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 30 16:44:35 ECT 2022 +#Fri Dec 02 15:11:12 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facadeclient diff --git a/base/persistence/commondb/target/commondb-2.1.jar b/base/persistence/commondb/target/commondb-2.1.jar index 612dffa..8f03acf 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 d6e3f68..0b22062 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 -#Wed Nov 30 16:44:05 ECT 2022 +#Fri Dec 02 15:10:30 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmArmas.java b/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmArmas.java index dc6b80d..f527328 100644 --- a/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmArmas.java +++ b/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmArmas.java @@ -305,7 +305,10 @@ public class TarmArmas extends com.fp.dto.AbstractDataTransport implements Seria @Column(name = "GENERACERTIFICADO", nullable = true) private String generacertificado; - + + @Column(name = "observacionmodificacion", nullable = true) + private String observacionmodificacion; + public int getValorAux() { return valorAux; } @@ -1059,4 +1062,12 @@ public class TarmArmas extends com.fp.dto.AbstractDataTransport implements Seria this.generacertificado = generacertificado; } + public String getObservacionmodificacion() { + return observacionmodificacion; + } + + public void setObservacionmodificacion(String observacionmodificacion) { + this.observacionmodificacion = observacionmodificacion; + } + } diff --git a/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmArmas.class b/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmArmas.class index 70efec6..d98cb53 100644 Binary files a/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmArmas.class and b/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmArmas.class differ diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index e0d95af..3669d20 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 -#Wed Nov 30 16:44:20 ECT 2022 +#Fri Dec 02 15:10:51 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 469d379..1551d8b 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/pbpm/target/maven-archiver/pom.properties b/base/persistence/pbpm/target/maven-archiver/pom.properties index b278603..2db74be 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 -#Wed Nov 30 16:43:58 ECT 2022 +#Fri Dec 02 15:10:20 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 d70c1b9..27c0c63 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 f06eb46..c0e248e 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 -#Wed Nov 30 16:44:07 ECT 2022 +#Fri Dec 02 15:10:34 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 94236dc..cfaee95 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 f80580f..d2e0c0d 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 -#Wed Nov 30 16:44:17 ECT 2022 +#Fri Dec 02 15:10:48 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 e7e965a..0245fdb 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/maven-archiver/pom.properties b/base/persistence/pgeneral/target/maven-archiver/pom.properties index a91f3c3..8fc3f7d 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 -#Wed Nov 30 16:44:03 ECT 2022 +#Fri Dec 02 15:10:28 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 164f7a9..29f1708 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/plog/target/maven-archiver/pom.properties b/base/persistence/plog/target/maven-archiver/pom.properties index 7b68162..a0535e4 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 -#Wed Nov 30 16:44:15 ECT 2022 +#Fri Dec 02 15:10:45 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 b422dd2..569a25d 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 394e55b..3a02246 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 -#Wed Nov 30 16:44:17 ECT 2022 +#Fri Dec 02 15:10:47 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 2744d3f..3a5f1fb 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 912a685..ae105fe 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 -#Wed Nov 30 16:44:08 ECT 2022 +#Fri Dec 02 15:10:35 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 49f25f9..d4fbaf3 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 41b9cf1..755c20d 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 30 16:44:24 ECT 2022 +#Fri Dec 02 15:10:57 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 2402bad..cfd15d2 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/maiaear-2.1.ear b/clients/comaco/ear/target/maiaear-2.1.ear index a764f7e..b73ba30 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 90cba14..e61e3f2 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 50d4522..f7310c1 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 e0c2f87..b8b2d11 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 59edc8c..00e8cde 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 612dffa..8f03acf 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 d7b818a..220135c 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 20e4c51..0333c5b 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 ba3d63f..23fc3bd 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 a8c9c30..d0a1ea2 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 b5e82a8..93a7951 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 dad9088..665250b 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 16fde1c..b9bddd7 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 469d379..1551d8b 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 d70c1b9..27c0c63 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 94236dc..cfaee95 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 f6ddfa2..df4c53c 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 e7e965a..0245fdb 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 164f7a9..29f1708 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 b422dd2..569a25d 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 1b52eb4..a5d4319 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 2402bad..cfd15d2 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 ea880f1..fee44fe 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 49f25f9..d4fbaf3 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 1aea710..2177d5c 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 -#Wed Nov 30 16:44:36 ECT 2022 +#Fri Dec 02 15:11:14 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear 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 20e4c51..0333c5b 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 6dfa8e8..89622a7 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 -#Wed Nov 30 16:44:36 ECT 2022 +#Fri Dec 02 15:11:14 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java b/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java index 000b8bc..1eaa674 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java @@ -26,17 +26,14 @@ import com.fp.persistence.pcustomer.gene.TcustPersonDetail; import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; import com.fp.persistence.pgeneral.gene.TgeneParameters; import com.fp.persistence.pgeneral.safe.TsafeUserDetail; -import com.fp.persistence.pgeneral.safe.TsafeUserDetailKey; import com.fp.persistence.pgeneral.safe.TsafeUserProfile; -import com.fp.persistence.pgeneral.safe.TsafeUserProfileKey; -import java.io.PrintStream; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.faces.application.Application; import javax.faces.application.NavigationHandler; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; diff --git a/frontend/src/main/resources/controlarmas_es.properties b/frontend/src/main/resources/controlarmas_es.properties index e294cce..3c6e41a 100644 --- a/frontend/src/main/resources/controlarmas_es.properties +++ b/frontend/src/main/resources/controlarmas_es.properties @@ -634,6 +634,8 @@ lbl_unidadcantidad=U. Medida Cantidad lbl_peso=Peso lbl_unidadpeso=U. Medida Peso htbl_detalledelmaterial=Detalle del Material +#Observacion +lbl_observacionmodificacion=Observaci\u00f3n tramite=Tr\u00e1mite lbl_dui=No. DUI diff --git a/frontend/src/main/webapp/pages/armas/armas.xhtml b/frontend/src/main/webapp/pages/armas/armas.xhtml index 0eae713..676be88 100644 --- a/frontend/src/main/webapp/pages/armas/armas.xhtml +++ b/frontend/src/main/webapp/pages/armas/armas.xhtml @@ -283,7 +283,11 @@ - + + + + + @@ -304,7 +308,9 @@ invalidSizeMessage="#{msg_armas.lbl_mensajearchivoinvalidom} #{msg_armas.lbl_1mb}" fileLimitMessage="#{msg_armas['msg_error_exedeelnumero']}" sizeLimit="#{msg_armas.lbl_archivounmega}" - /> + /> + + diff --git a/frontend/src/main/webapp/pages/armas/reporteAuditoriaAplicacion.xhtml b/frontend/src/main/webapp/pages/armas/reporteApp.xhtml similarity index 100% rename from frontend/src/main/webapp/pages/armas/reporteAuditoriaAplicacion.xhtml rename to frontend/src/main/webapp/pages/armas/reporteApp.xhtml diff --git a/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class b/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class index 11dac7c..9db5336 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class and b/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class differ diff --git a/frontend/target/classes/controlarmas_es.properties b/frontend/target/classes/controlarmas_es.properties index e294cce..3c6e41a 100644 --- a/frontend/target/classes/controlarmas_es.properties +++ b/frontend/target/classes/controlarmas_es.properties @@ -634,6 +634,8 @@ lbl_unidadcantidad=U. Medida Cantidad lbl_peso=Peso lbl_unidadpeso=U. Medida Peso htbl_detalledelmaterial=Detalle del Material +#Observacion +lbl_observacionmodificacion=Observaci\u00f3n tramite=Tr\u00e1mite lbl_dui=No. DUI diff --git a/frontend/target/maia.war b/frontend/target/maia.war index eebd4e7..4424d83 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/security/LoginController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class index 11dac7c..9db5336 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties b/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties index e294cce..3c6e41a 100644 --- a/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties +++ b/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties @@ -634,6 +634,8 @@ lbl_unidadcantidad=U. Medida Cantidad lbl_peso=Peso lbl_unidadpeso=U. Medida Peso htbl_detalledelmaterial=Detalle del Material +#Observacion +lbl_observacionmodificacion=Observaci\u00f3n tramite=Tr\u00e1mite lbl_dui=No. DUI 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 50d4522..f7310c1 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 59edc8c..00e8cde 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 612dffa..8f03acf 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 d7b818a..220135c 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 a8c9c30..d0a1ea2 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 b5e82a8..93a7951 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 469d379..1551d8b 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 d70c1b9..27c0c63 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 94236dc..cfaee95 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 e7e965a..0245fdb 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 164f7a9..29f1708 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 ea880f1..fee44fe 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 49f25f9..d4fbaf3 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/armas.xhtml b/frontend/target/maia/pages/armas/armas.xhtml index 0eae713..676be88 100644 --- a/frontend/target/maia/pages/armas/armas.xhtml +++ b/frontend/target/maia/pages/armas/armas.xhtml @@ -283,7 +283,11 @@ - + + + + + @@ -304,7 +308,9 @@ invalidSizeMessage="#{msg_armas.lbl_mensajearchivoinvalidom} #{msg_armas.lbl_1mb}" fileLimitMessage="#{msg_armas['msg_error_exedeelnumero']}" sizeLimit="#{msg_armas.lbl_archivounmega}" - /> + /> + + diff --git a/frontend/target/maia/pages/armas/reporteAuditoriaAplicacion.xhtml b/frontend/target/maia/pages/armas/reporteApp.xhtml similarity index 100% rename from frontend/target/maia/pages/armas/reporteAuditoriaAplicacion.xhtml rename to frontend/target/maia/pages/armas/reporteApp.xhtml diff --git a/frontend/target/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index 37f0105..ed46f37 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 30 16:44:51 ECT 2022 +#Fri Dec 02 15:11:30 ECT 2022 version=2.1 groupId=com.fp artifactId=frontend