diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java index 12f1ee4..835003d 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java @@ -45,17 +45,32 @@ import com.fp.persistence.commondb.PersistenceHelper; import com.fp.persistence.commondb.PersistenceManager; import com.fp.persistence.pbpm.gene.TbpmGroupsUsers; import com.fp.simple.dto.TaskInfo; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.jbpm.services.task.impl.model.DeadlinesImpl; +import org.jbpm.services.task.impl.model.DelegationImpl; +import org.jbpm.services.task.impl.model.PeopleAssignmentsImpl; +import org.jbpm.services.task.impl.model.TaskDataImpl; +import org.jbpm.services.task.impl.model.TaskImpl; +import org.kie.internal.task.api.model.AccessType; +import org.kie.internal.task.api.model.AllowedToDelegate; +import org.kie.internal.task.api.model.SubTasksStrategy; // /** * Class HumanTaskClient encargada de acceder al Servidor de Tareas. - * + * * @author Jvaca * @version 2.1 */ public class HumanTaskClient { - /** El valor de language. */ + /** + * El valor de language. + */ private String language = "en-UK"; private final TaskService taskService; @@ -64,7 +79,7 @@ public class HumanTaskClient { /** * Crea una nueva instancia de human task client. - * + * * @throws Exception la exception */ public HumanTaskClient() throws Exception { @@ -80,7 +95,7 @@ public class HumanTaskClient { /** * Adiciona listener, para el manejo del bam de tareas. - * + * * @param engine */ @SuppressWarnings("unchecked") @@ -101,7 +116,7 @@ public class HumanTaskClient { /** * Activate task. - * + * * @param pTask the task * @param pUserId the user id * @throws Exception la exception @@ -113,7 +128,7 @@ public class HumanTaskClient { /** * Claim task. - * + * * @param pTask the task * @param pUserId the user id * @throws Exception la exception @@ -125,7 +140,7 @@ public class HumanTaskClient { /** * Entrega lsita de grupos bpm al que pertenece el usuario. - * + * * @param pUser Codigo de usuario a buscar los grupos a los que pertenece. * @return List * @throws Exception la exception @@ -141,7 +156,7 @@ public class HumanTaskClient { /** * Close. - * + * * @throws Exception la exception */ public void close() throws Exception { @@ -150,7 +165,7 @@ public class HumanTaskClient { /** * Complete task. - * + * * @param pTask the task * @param pJournalId the journal id * @param data the data @@ -167,7 +182,6 @@ public class HumanTaskClient { ti.setResponse(pResultado); ti.setTaskId(pTask); ti.setJournalId(pJournalId); - System.out.println(pObs); if (ti.getUserId() == null && t.getTaskData().getActualOwner() != null) { ti.setUserId(t.getTaskData().getActualOwner().getId()); } @@ -183,7 +197,7 @@ public class HumanTaskClient { /** * Adiciona un comment. - * + * * @param pTask the task * @param pUserId the user id * @param pComment the comment @@ -201,7 +215,7 @@ public class HumanTaskClient { /** * Delegate task. - * + * * @param pTask the task * @param pUserId the user id * @param pTargetUserId the target user id @@ -214,7 +228,7 @@ public class HumanTaskClient { /** * Obtiene el valor de assigned tasks. - * + * * @return Valor de assigned tasks * @throws Exception la exception */ @@ -224,7 +238,7 @@ public class HumanTaskClient { /** * Obtiene el valor de assigned tasks. - * + * * @param pUserId the user id * @return Valor de assigned tasks * @throws Exception la exception @@ -236,7 +250,7 @@ public class HumanTaskClient { /** * Obtiene el valor de content by id. - * + * * @param pId the id * @return Valor de content by id * @throws Exception la exception @@ -247,7 +261,7 @@ public class HumanTaskClient { /** * Obtiene el valor de input data. - * + * * @param pTask the task * @return Valor de input data * @throws Exception la exception @@ -259,7 +273,7 @@ public class HumanTaskClient { /** * Obtiene el valor de output data. - * + * * @param pTask the task * @return Valor de output data * @throws Exception la exception @@ -271,7 +285,7 @@ public class HumanTaskClient { /** * Entrega el contenido asociado al workitem. - * + * * @param task Datos de la tarea * @return Map * @throws Exception @@ -288,7 +302,7 @@ public class HumanTaskClient { /** * Obtiene el valor de input data. - * + * * @param pTask the task * @return Valor de input data * @throws Exception la exception @@ -326,7 +340,7 @@ public class HumanTaskClient { /** * Obtiene el valor de task by id. - * + * * @param pId the id * @return Valor de task by id * @throws Exception la exception @@ -337,7 +351,7 @@ public class HumanTaskClient { /** * Obtiene el valor de task by work item id. - * + * * @param pWorkId the work id * @return Valor de task by work item id * @throws Exception la exception @@ -348,7 +362,7 @@ public class HumanTaskClient { /** * Obtiene el valor de task content input. - * + * * @param taskSum the task sum * @return Valor de task content input */ @@ -395,7 +409,7 @@ public class HumanTaskClient { /** * Obtiene el valor de task data. - * + * * @param pTask the task * @return Valor de task data * @throws Exception la exception @@ -407,7 +421,7 @@ public class HumanTaskClient { /** * Obtiene el listado de tareas Asignadas. - * + * * @param pUserCri the user cri * @param pCriteria the criteria * @param pPage the page @@ -423,13 +437,10 @@ public class HumanTaskClient { List list; try { list = taskService.getTasksOwnedByStatus(pUserCri, lestatus, "en-UK"); - Object o[] = null; - Task task = null; - Content c = null; for (TaskSummary obj : list) { - o = new Object[2]; - task = this.getTaskById(obj.getId()); - c = this.getContentById(task.getTaskData().getDocumentContentId()); + Object o[] = new Object[2]; + Task task = this.getTaskById(obj.getId()); + Content c = this.getContentById(task.getTaskData().getDocumentContentId()); o[0] = task; o[1] = c; lresp.add(o); @@ -442,7 +453,7 @@ public class HumanTaskClient { /** * Obtiene el valor de unfinished tasks. - * + * * @param pUserId the user id * @param pCri the cri * @return Valor de unfinished tasks @@ -453,16 +464,13 @@ public class HumanTaskClient { List lresp = new ArrayList<>(); lestatus.add(Status.Reserved); lestatus.add(Status.InProgress); - List list = new ArrayList<>(); + List list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK"); try { list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK"); - Object o[]; - Task task; - Content c; for (TaskSummary obj : list) { - o = new Object[2]; - task = this.getTaskById(obj.getId()); - c = this.getContentById(task.getTaskData().getDocumentContentId()); + Object o[] = new Object[2]; + Task task = this.getTaskById(obj.getId()); + Content c = this.getContentById(task.getTaskData().getDocumentContentId()); o[0] = task; o[1] = c; lresp.add(o); @@ -473,55 +481,26 @@ public class HumanTaskClient { return lresp; } - - /** - * QUERY NATIVO DE TAREAS NO COMPLETADAS - */ - private static final String TAREAS_GRUPO_NATIVO = "select\n" + - " taskimpl0_,\n"+ -" organizati1_.id\n" + -" from\n" + -" jbpm6.Task taskimpl0_ cross \n" + -" join\n" + -" jbpm6.OrganizationalEntity organizati1_ \n" + -" where\n" + -" (\n" + -" organizati1_.id in (\n" + -" :groupIds\n" + -" )\n" + -" ) \n" + -" and (\n" + -" organizati1_.id in (\n" + -" select\n" + -" potentialo2_.entity_id \n" + -" from\n" + -" jbpm6.PeopleAssignments_PotOwners potentialo2_ \n" + -" where\n" + -" taskimpl0_.id=potentialo2_.task_id\n" + -" )\n" + -" ) \n" + -" and taskimpl0_.archived=0 \n" + -" and (\n" + -" taskimpl0_.actualOwner_id is null\n" + -" ) \n" + -" and (\n" + -" taskimpl0_.status in (\n" + -" 'Created' , 'Ready' , 'Reserved' , 'InProgress' , 'Suspended'\n" + -" )\n" + -" )"; - - + /** * JPQL JPQL_TASK_NOT_COMPLETEBYGROUP */ - private static final String TAREAS_GRUPO = "select t, potentialOwners.id from TaskImpl t, OrganizationalEntityImpl potentialOwners " - + "where potentialOwners.id = :groupIds and potentialOwners in elements ( t.peopleAssignments.potentialOwners) and t.archived = 0 " - + "and t.taskData.actualOwner = null and t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') " - + "order by t.id desc"; +// private static final String TAREAS_GRUPO = "select t, potentialOwners.id from TaskImpl t, OrganizationalEntityImpl potentialOwners " +// + "where potentialOwners.id in (:groupIds) and potentialOwners in elements ( t.peopleAssignments.potentialOwners ) and t.archived = 0 " +// + "and t.taskData.actualOwner = null and t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended')"; + private static final String TAREAS_GRUPO = "SELECT t.id as taskId, t.archived , t.allowedtodelegate , t.description , t.formname , t.NAME , t.taskinitiator_id , " + + "t.priority , t.subtaskstrategy , t.subject , t.activationtime , t.actualowner_id , t.createdby_id , t.createdon , t.deploymentid , " + + "t.documentaccesstype , t.documentcontentid , t.documenttype , t.expirationtime , t.faultaccesstype , t.faultcontentid , t.faultname , " + + "t.faulttype , t.outputaccesstype , t.outputcontentid , t.outputtype , t.parentid , t.previousstatus , t.processid , t.processinstanceid , " + + "t.processsessionid , t.skipable , t.status , t.workitemid , t.tasktype , t.optlock , o.id as orgId " + + "FROM jbpm6.task t " + + "CROSS JOIN jbpm6.organizationalentity o " + + "INNER JOIN jbpm6.peopleassignments_potowners po ON po.task_id = t.id AND po.entity_id = o.id " + + "WHERE(o.id IN (:groupIds)) AND t.archived = 0 AND (t.actualowner_id IS NULL) AND (t.status IN ( 'Created', 'Ready', 'Reserved', 'InProgress','Suspended')) order by t.id"; /** * Obtiene el valor de unfinished tasks por Grupo. - * + * * @param pGroupId the user id * @param pCri the cri * @return Valor de unfinished tasks @@ -530,15 +509,22 @@ public class HumanTaskClient { @SuppressWarnings(Constant.WARN_UNCHECKED) public List getTasksByGroup(String pGroupId, String pCri) throws Exception { List ldatos = new ArrayList(); + TaskImpl t; + TaskDataImpl td; + EntityManager em = null; try { em = PersistenceManager.getInstance().getEntityManagerFactoryAuxiliar("org.jbpm.domain").createEntityManager(); - Query qry = em.createQuery(HumanTaskClient.TAREAS_GRUPO); - //Query qry = em.createNativeQuery(TAREAS_GRUPO_NATIVO); +// Query qry = em.createQuery(HumanTaskClient.TAREAS_GRUPO); + Query qry = em.createNativeQuery(HumanTaskClient.TAREAS_GRUPO); qry.setParameter("groupIds", pGroupId); - ldatos = qry.getResultList(); + List data = ejecutarConsultaNativaList(qry); + + for (Fila row : data) { + ldatos.add(new Object[]{mapTask(row), row.get(36)}); + } } catch (Exception e) { - throw new RuntimeException(e); + e.printStackTrace(System.err); } finally { if (em.isOpen()) { em.close(); @@ -547,9 +533,183 @@ public class HumanTaskClient { return ldatos; } + /** + * + * @param query + * @param consulta + * @return + */ + public List ejecutarConsultaNativaList(Query query) { + List resultado = new ArrayList<>(); + List datos = query.getResultList(); + if (datos == null || datos.isEmpty()) { + return resultado; + } + + for (Object row : datos) { + Fila fila = new Fila(); + if (row.getClass().isArray()) { + Object[] orow = (Object[]) row; + for (Object val : orow) { + fila.add(val); + } + } else { + fila.add(row); + } + resultado.add(fila); + } + return resultado; + } + + public TaskImpl mapTask(Fila row) { + TaskImpl ti = new TaskImpl(); + PeopleAssignmentsImpl pa = new PeopleAssignmentsImpl(); + DelegationImpl di = new DelegationImpl(); + TaskDataImpl tdi = new TaskDataImpl(); + DeadlinesImpl dli = new DeadlinesImpl(); + ti.setId(evalLong(row.get(0))); + ti.setArchived(evalInt(row.get(1)) == 1); + di.setAllowed(evaluateATD(row.get(2))); + ti.setDescription((String) row.get(3)); + ti.setFormName((String) row.get(4)); + ti.setName((String) row.get(5)); + pa.setTaskInitiator(new UserImpl((String) row.get(6))); + ti.setPriority(evalInt(row.get(7))); + ti.setSubTaskStrategy(evaluateSub(row.get(8))); + ti.setSubject((String) row.get(9)); + tdi.setActivationTime(evaluateDate(row.get(10))); + tdi.setActualOwner(new UserImpl((String) row.get(11))); + tdi.setCreatedBy(new UserImpl((String) row.get(12))); + tdi.setCreatedOn(evaluateDate(row.get(13))); + tdi.setDeploymentId((String) row.get(14)); + tdi.setDocumentAccessType(evaluateAT(row.get(15))); + tdi.setDocumentContentId(evalLong(row.get(16))); + tdi.setDocumentType((String) row.get(17)); + tdi.setExpirationTime(evaluateDate(row.get(18))); + tdi.setFaultAccessType(evaluateAT(row.get(19))); + tdi.setFaultContentId(evalLong(row.get(20))); + tdi.setFaultName((String) row.get(21)); + tdi.setFaultType((String) row.get(22)); + tdi.setOutputAccessType(evaluateAT(row.get(23))); + tdi.setOutputContentId(evalLong(row.get(24))); + tdi.setOutputType((String) row.get(25)); + tdi.setParentId(evalLong(row.get(26))); + tdi.setPreviousStatus(evaluateStatus(row.get(27))); + tdi.setProcessId((String) row.get(28)); + tdi.setProcessInstanceId(evalLong(row.get(29))); + tdi.setProcessSessionId(evalInt(row.get(30))); + tdi.setSkipable((Boolean)row.get(31)); + tdi.setStatus(evaluateStatus(row.get(32))); + tdi.setWorkItemId(evalLong(row.get(33))); + ti.setTaskType((String) row.get(34)); + + ti.setPeopleAssignments(pa); + ti.setDelegation(di); + ti.setTaskData(tdi); + ti.setDeadlines(dli); + return ti; + } + + public Integer evalInt(Object data) { + Integer result = null; + if (data != null) { + result = ((BigDecimal) data).intValue(); + } + return result; + } + + public Long evalLong(Object data) { + Long result = null; + if (data != null) { + result = ((BigDecimal) data).longValue(); + } + return result; + } + + public static Status evaluateStatus(Object data) { + Status at = null; + if (data != null) { + if (data instanceof Status) { + at = (Status) data; + } else { + try { + at = Status.valueOf(data.toString()); + } catch (RuntimeException ex) { + at = null; + } + } + } + return at; + } + + public static AccessType evaluateAT(Object data) { + AccessType at = null; + if (data != null) { + if (data instanceof AccessType) { + at = (AccessType) data; + } else { + try { + at = AccessType.valueOf(data.toString()); + } catch (RuntimeException ex) { + at = null; + } + } + } + return at; + } + + public static SubTasksStrategy evaluateSub(Object data) { + SubTasksStrategy st = null; + if (data != null) { + if (data instanceof SubTasksStrategy) { + st = (SubTasksStrategy) data; + } else { + try { + st = SubTasksStrategy.valueOf(data.toString()); + } catch (RuntimeException ex) { + st = null; + } + } + } + return st; + } + + public static AllowedToDelegate evaluateATD(Object data) { + AllowedToDelegate del = null; + if (data != null) { + if (data instanceof AllowedToDelegate) { + del = (AllowedToDelegate) data; + } else { + try { + del = AllowedToDelegate.valueOf(data.toString()); + } catch (RuntimeException ex) { + del = null; + } + } + } + return del; + } + + public static Date evaluateDate(Object date) { + DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + Date fecha = null; + if (date != null) { + if (date instanceof Date) { + fecha = (Date) date; + } else { + try { + fecha = df.parse(date.toString()); + } catch (ParseException ex) { + fecha = null; + } + } + } + return fecha; + } + /** * Release task. - * + * * @param pTask the task * @param pUserId the user id * @throws Exception la exception @@ -560,7 +720,7 @@ public class HumanTaskClient { /** * Resume task. - * + * * @param pTask the task * @param pUserId the user id * @throws Exception la exception @@ -571,14 +731,14 @@ public class HumanTaskClient { /** * Start task. - * + * * @param pTask the task * @throws Exception la exception */ public void startTask(long pTask) throws Exception { Task task = this.getTaskById(pTask); APPLogger.getLogger().debug("Starting task " + pTask); - Map input = this.getInputData(task); + Map input = this.getInputData(task); // com.fp.bpmlib.Process p = this.findProcess(task.getTaskData(), snapshot); // TaskInfo ti = (TaskInfo) input.get(ProcessUtil.TASK_METADATA); // ti.setTaskId(pTask); @@ -592,9 +752,7 @@ public class HumanTaskClient { // Elimina el content anterior y remplaza por un nuevo content. // its.deleteContent(pTask, task.getTaskData().getDocumentContentId()); // its.addContent(pTask, input); - // ***** LA FECHA DE CREACION E INICIO SE TOMA DE LA BAMTASKSUMMARY PARA PRESENTAR EN EL MONITOR. - taskService.start(pTask, task.getTaskData().getActualOwner().getId()); FlowActivitySave.actualizarActividadStart(pTask); APPLogger.getLogger().debug("Started task " + pTask); @@ -602,7 +760,7 @@ public class HumanTaskClient { /** * Stop task. - * + * * @param pTask the task * @param pUserId the user id * @throws Exception la exception @@ -613,7 +771,7 @@ public class HumanTaskClient { /** * Suspend task. - * + * * @param pTask the task * @param pUserId the user id * @throws Exception la exception @@ -622,4 +780,8 @@ public class HumanTaskClient { taskService.suspend(pTask, pUserId); } -} \ No newline at end of file + class Fila extends ArrayList { + + } + +} diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index e87e473..8235d4d 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/com/fp/bpmlib/task/client/HumanTaskClient$Fila.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient$Fila.class new file mode 100644 index 0000000..2fb453a Binary files /dev/null and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient$Fila.class differ diff --git a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class index e3164bc..ea0c488 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class differ diff --git a/base/bpm/bpmlib/target/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 533fbed..a9ee54f 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 -#Thu Feb 02 15:10:25 ECT 2023 +#Fri Feb 03 15:45:11 ECT 2023 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 b5c1860..e220188 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 -#Thu Feb 02 15:10:19 ECT 2023 +#Fri Feb 03 15:45:06 ECT 2023 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 ed8ac2c..7b13022 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/src/main/java/com/fp/armas/rules/query/solicitud/CashManagementQuery.java b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/CashManagementQuery.java index d4c9f74..5159fe6 100644 --- a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/CashManagementQuery.java +++ b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/CashManagementQuery.java @@ -40,7 +40,7 @@ public class CashManagementQuery extends QueryRule { + "left join tarmtramite tra on tra.ctramite = sol.ctramite " + "left join tgenecatalogdetail tipaut on tra.tipoautorizacion = tipaut.catalog and tra.tipoautorizacioncodigo = tipaut.catalogcode " + "where soltra.INCASHREPORT is null and soltra.numerocomprobante is null and soltra.estadotramite='REG' and soltra.valorapagar>0 " - + "and sol.fverificarequisitos >= to_date(':fechaInicialStr','DD/MM/RRRR') and sol.fverificarequisitos <= to_date(':fechaFinalStr','DD/MM/RRRR')"; + + "and sol.fverificarequisitos >= to_date(':fechaInicialStr','DD/MM/YYYY') and sol.fverificarequisitos <= to_date(':fechaFinalStr','DD/MM/YYYY')"; /** * Completa datos del arma diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index f4c8e55..db8c6b4 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/com/fp/armas/rules/query/solicitud/CashManagementQuery.class b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/CashManagementQuery.class index 85ebd0b..e4a25bf 100644 Binary files a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/CashManagementQuery.class and b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/CashManagementQuery.class differ diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 6331193..4d5d303 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 -#Thu Feb 02 15:10:46 ECT 2023 +#Fri Feb 03 15:45:32 ECT 2023 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 7aedc36..37b05e3 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 9e93f5d..e38c635 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 -#Thu Feb 02 15:10:40 ECT 2023 +#Fri Feb 03 15:45:25 ECT 2023 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 8570115..de1a104 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 b6e9944..a559b99 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 -#Thu Feb 02 15:10:42 ECT 2023 +#Fri Feb 03 15:45:27 ECT 2023 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 f5cc92b..622cc67 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 -#Thu Feb 02 15:10:37 ECT 2023 +#Fri Feb 03 15:45:22 ECT 2023 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 d572cc4..e9f98b1 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 6c5be3d..ad3fab2 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 -#Thu Feb 02 15:10:41 ECT 2023 +#Fri Feb 03 15:45:26 ECT 2023 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 d85babc..cb748e2 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 1de6686..62455ab 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 -#Thu Feb 02 15:10:43 ECT 2023 +#Fri Feb 03 15:45:29 ECT 2023 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 9a94924..5e165b9 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/target/alfresco-client-2.1.jar b/base/core/alfresco-client/target/alfresco-client-2.1.jar index ad25a7b..968871f 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/maven-archiver/pom.properties b/base/core/alfresco-client/target/maven-archiver/pom.properties index 79b6de0..6d0a281 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 -#Thu Feb 02 15:10:34 ECT 2023 +#Fri Feb 03 15:45:19 ECT 2023 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 3791d86..8f8f52e 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 06dcad7..2db1f86 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 -#Thu Feb 02 15:10:21 ECT 2023 +#Fri Feb 03 15:45:07 ECT 2023 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 237a7f8..9025836 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 56f2f2b..bacac90 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 -#Thu Feb 02 15:10:33 ECT 2023 +#Fri Feb 03 15:45:18 ECT 2023 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 7b8645d..4a2d6b8 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 b287c56..5745ecf 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 -#Thu Feb 02 15:10:07 ECT 2023 +#Fri Feb 03 15:44:52 ECT 2023 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 5fd2f1c..ef2379e 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 ad4c61e..9dd6794 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 -#Thu Feb 02 15:10:04 ECT 2023 +#Fri Feb 03 15:44:50 ECT 2023 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 68bb6d3..7a05c4a 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 d370727..8f0c41d 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Feb 02 15:10:48 ECT 2023 +#Fri Feb 03 15:45:33 ECT 2023 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 8329a97..8ce35ea 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 91e70c1..baba3dc 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Feb 02 15:10:47 ECT 2023 +#Fri Feb 03 15:45:32 ECT 2023 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 94113f4..e75528a 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 71c01ef..2e670a6 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 -#Thu Feb 02 15:10:15 ECT 2023 +#Fri Feb 03 15:45:01 ECT 2023 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index cba68e3..62a750c 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 -#Thu Feb 02 15:10:32 ECT 2023 +#Fri Feb 03 15:45:17 ECT 2023 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 a0cfb4b..c5f2720 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 19ebc9f..62b0ccb 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 -#Thu Feb 02 15:10:08 ECT 2023 +#Fri Feb 03 15:44:54 ECT 2023 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 58a0e04..8a85b52 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 7f26058..e6231d6 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 -#Thu Feb 02 15:10:17 ECT 2023 +#Fri Feb 03 15:45:04 ECT 2023 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 4eb6eee..c95c055 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 59fcc4c..7c7ea44 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 -#Thu Feb 02 15:10:29 ECT 2023 +#Fri Feb 03 15:45:14 ECT 2023 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 5f38f17..a99358c 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 bef3fa0..24604b8 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 -#Thu Feb 02 15:10:13 ECT 2023 +#Fri Feb 03 15:44:59 ECT 2023 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 dcd68e2..f97f279 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 274c4fa..64a7f7b 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 -#Thu Feb 02 15:10:26 ECT 2023 +#Fri Feb 03 15:45:12 ECT 2023 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 c12a66f..e52da7c 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 217687b..57bd1db 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 -#Thu Feb 02 15:10:28 ECT 2023 +#Fri Feb 03 15:45:13 ECT 2023 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 6f5b920..acf5f1c 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 99ef274..414367c 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 -#Thu Feb 02 15:10:18 ECT 2023 +#Fri Feb 03 15:45:05 ECT 2023 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 7a0d84b..1448a7e 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 ae4f9a8..9ef41d1 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Feb 02 15:10:35 ECT 2023 +#Fri Feb 03 15:45:20 ECT 2023 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 0706379..9a8b7a7 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 63a11b8..2f560d6 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 f4c8e55..db8c6b4 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 3791d86..8f8f52e 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 e87e473..8235d4d 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 7b8645d..4a2d6b8 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 94113f4..e75528a 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 5fd2f1c..ef2379e 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 2952307..0e7ed97 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 68bb6d3..7a05c4a 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 8329a97..8ce35ea 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 237a7f8..9025836 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 7aedc36..37b05e3 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 8570115..de1a104 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 a0cfb4b..c5f2720 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 58a0e04..8a85b52 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 4eb6eee..c95c055 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 d572cc4..e9f98b1 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 5f38f17..a99358c 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 dcd68e2..f97f279 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 c12a66f..e52da7c 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 d85babc..cb748e2 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 0706379..9a8b7a7 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 ed8ac2c..7b13022 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 7a0d84b..1448a7e 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 c1d8f5c..54d9de0 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 -#Thu Feb 02 15:10:49 ECT 2023 +#Fri Feb 03 15:45:34 ECT 2023 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 2952307..0e7ed97 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 16d4030..e329681 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 -#Thu Feb 02 15:10:48 ECT 2023 +#Fri Feb 03 15:45:33 ECT 2023 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/frontend/src/test/java/testFactura.java b/frontend/src/test/java/testFactura.java index 9ecbd99..eb8912e 100644 --- a/frontend/src/test/java/testFactura.java +++ b/frontend/src/test/java/testFactura.java @@ -11,8 +11,11 @@ import com.fp.frontend.controller.pcustomer.PersonPhoneController; import com.fp.frontend.controller.pgeneral.gene.CatalogDetailController; import com.fp.frontend.controller.pgeneral.gene.CityController; import com.fp.firma.common.CertificateUtils; +import com.fp.frontend.controller.armas.parametros.CashManagementHistoryController; import com.fp.frontend.controller.pgeneral.gene.ParametersController; +import com.fp.frontend.utility.Utilidades; +import com.fp.persistence.parmas.fun.TarmCashManagementHistory; import com.fp.persistence.parmas.param.TarmCentroControl; import com.fp.persistence.parmas.soli.TarmSolicitud; import com.fp.persistence.parmas.soli.TarmSolicitudTramite; @@ -23,6 +26,7 @@ import com.fp.persistence.pcustomer.gene.TcustPersonPhone; import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; import com.fp.persistence.pgeneral.gene.TgeneCity; import com.fp.persistence.pgeneral.gene.TgeneParameters; +import com.fp.persistence.pgeneral.safe.TsafeUserDetail; import com.itextpdf.text.DocumentException; import com.itextpdf.text.Font; import com.itextpdf.text.Rectangle; @@ -51,13 +55,16 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.cert.CertificateException; +import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Scanner; import java.util.logging.Level; import java.util.logging.Logger; +import javax.servlet.http.HttpServletResponse; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -284,6 +291,13 @@ public class testFactura { } } + /** + * Arma la petición al core para solicitar un número de + * secuencial para la solicitud antes de guardarla + * + * @throws Throwable + */ + public static void main(String[] args) { //correrClase(); Map sexo = new HashMap(); diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class index abd9924..4483e53 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class differ diff --git a/frontend/target/maia.war b/frontend/target/maia.war index 83acae7..b13c8e9 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/TramiteArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class index abd9924..4483e53 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class differ 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 3791d86..8f8f52e 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 7b8645d..4a2d6b8 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 94113f4..e75528a 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 5fd2f1c..ef2379e 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 8329a97..8ce35ea 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 237a7f8..9025836 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 a0cfb4b..c5f2720 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 58a0e04..8a85b52 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 4eb6eee..c95c055 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 5f38f17..a99358c 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 dcd68e2..f97f279 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 ed8ac2c..7b13022 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 7a0d84b..1448a7e 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/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index 29b48d9..d3e002d 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Feb 02 15:11:04 ECT 2023 +#Fri Feb 03 15:45:48 ECT 2023 version=2.1 groupId=com.fp artifactId=frontend diff --git a/frontend/target/test-classes/testFactura.class b/frontend/target/test-classes/testFactura.class index ed1ac56..319612e 100644 Binary files a/frontend/target/test-classes/testFactura.class and b/frontend/target/test-classes/testFactura.class differ