From 0a9f12279ad5c01da3baa2a295b897e3710f1fcc Mon Sep 17 00:00:00 2001
From: Xabi <xaabi6@users.noreply.github.com>
Date: Tue, 12 Nov 2024 10:01:05 +0100
Subject: [PATCH 1/6] =?UTF-8?q?Redirecci=C3=B3n=20configurable=20en=20erro?=
 =?UTF-8?q?r=20de=20autenticaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Se configura mediante la propiedad xhr.redirectOnError para que ocurra una redirección cuando una petición XHR falle por no disponer de credenciales válidas.

También, mediante xhr.unauthorizedPage, se define redireccionar al origen desde el que se realizó la petición que falló.
---
 x21aConfig/x21a.properties                                  | 3 +++
 .../WebContent/3x/x21a/scripts/x21aApp/_layoutLoader.js     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/x21aConfig/x21a.properties b/x21aConfig/x21a.properties
index 349a63ab1..31c3469ca 100644
--- a/x21aConfig/x21a.properties
+++ b/x21aConfig/x21a.properties
@@ -4,6 +4,9 @@ xlnets.path=http://xlnets.servicios.jakina.ejiedes.net/n38a/N38LoginInicioServle
 
 rss.path=http://desarrollo.jakina.ejiedes.net:7001/x21aMantenimientosWar/jqGridUsuario/rssDetail/
 
+xhr.redirectOnError=true
+xhr.unauthorizedPage=referer
+
 #The System logs parameters
 log.path=c:/datos/x21a/log
 log.level.salidaEstandar=INFO
diff --git a/x21aStatics/WebContent/3x/x21a/scripts/x21aApp/_layoutLoader.js b/x21aStatics/WebContent/3x/x21a/scripts/x21aApp/_layoutLoader.js
index 307e11dad..f8d4379ad 100644
--- a/x21aStatics/WebContent/3x/x21a/scripts/x21aApp/_layoutLoader.js
+++ b/x21aStatics/WebContent/3x/x21a/scripts/x21aApp/_layoutLoader.js
@@ -254,4 +254,10 @@ jQuery(document).ready(function(){
 		jQuery("header").remove();
 		jQuery("footer").remove();
 	}
+	
+	$(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) {
+		if (jqXHR.status === 401 || jqXHR.status === 403) {
+			window.location.href = jqXHR.getResponseHeader("LOCATION");
+		}
+	});
 });
\ No newline at end of file

From bb7c3d3797bec4c6c18bfac8ebbda00c6306b356 Mon Sep 17 00:00:00 2001
From: Xabi <xaabi6@users.noreply.github.com>
Date: Tue, 12 Nov 2024 10:03:59 +0100
Subject: [PATCH 2/6] Actualizar groupId de jdbcdslog

---
 x21aEAR/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x21aEAR/pom.xml b/x21aEAR/pom.xml
index f19c61988..89bf26471 100644
--- a/x21aEAR/pom.xml
+++ b/x21aEAR/pom.xml
@@ -111,7 +111,7 @@
             </dependency>
 			<!-- Jdbcdslog -->
 			<dependency>
-				<groupId>org</groupId>
+				<groupId>com.googlecode.usc</groupId>
 				<artifactId>jdbcdslog</artifactId>
 				<version>1.0.5</version>
 			</dependency>

From f6f8bd8accad937965c0421816c4f59004c552f0 Mon Sep 17 00:00:00 2001
From: Xabi <xaabi6@users.noreply.github.com>
Date: Tue, 12 Nov 2024 10:04:28 +0100
Subject: [PATCH 3/6] Eliminar el uso de Archiva

---
 x21aEAR/pom.xml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/x21aEAR/pom.xml b/x21aEAR/pom.xml
index 89bf26471..50c8a71ff 100644
--- a/x21aEAR/pom.xml
+++ b/x21aEAR/pom.xml
@@ -612,27 +612,6 @@
 		<!-- FIN:PIF 1.4 EN APLICACION UDA -->
 
 	</dependencies>
-	<repositories>
-		<!-- 
-		<repository>
-			<id>ejie</id>
-			<name>ejie</name>
-			<url>http://www.otc.ejiedes.net/archiva/repository/repoEJIE</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		 -->
-		<repository>
-			<id>ejie</id>
-			<name>ejie</name>
-			<url>http://www.otc.ejiedes.net/archiva/repository/repoCACRep</url>
-			<snapshots>
-				<enabled>true</enabled>
-            	<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
 	<build>
 		<plugins>
 			<plugin>

From 5612f394a1f3c6666d8d29c526a8a4bea7033270 Mon Sep 17 00:00:00 2001
From: Xabi <xaabi6@users.noreply.github.com>
Date: Tue, 12 Nov 2024 10:08:41 +0100
Subject: [PATCH 4/6] =?UTF-8?q?Actualizar=20tarea=20de=20obtenci=C3=B3n=20?=
 =?UTF-8?q?de=20dependencias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 x21aEAR/build.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/x21aEAR/build.xml b/x21aEAR/build.xml
index 1a4d29014..3d97db8c8 100644
--- a/x21aEAR/build.xml
+++ b/x21aEAR/build.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE project>
-<project name="x21aEAR" default="mavenRunDependencies" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="x21aEAR" default="mavenRunDependencies">
 	
 	<!-- Permite el uso de variables de entorno -->
 	<property environment="env" />
+	<property name="outputDirectory" value="EarContent/APP-INF/lib/" />
+	<property name="mavenCommand" value="${env.M2_HOME}/bin/mvn.cmd" />
+	<property name="mavenSettings" value="${env.M2_HOME}/conf/settings.xml" />
 			
-	<!-- Obtener dependencias -->	
+	<!-- Obtener dependencias -->
 	<target name="mavenRunDependencies" description="Resuelve las dependencias del proyecto desde Maven">
-		<path id="maven-ant-tasks.classpath" path="${ant.home}/lib/maven-ant-tasks-2.1.1.jar" />
-		<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
-		<property environment="env" />
-		<artifact:dependencies settingsFile="${env.M2_HOME}/conf/settings.xml"/>
-		<artifact:mvn pom="pom.xml" mavenHome="${env.M2_HOME}" fork="true">
-			<arg value="package"/>
-		</artifact:mvn>			
+		<exec executable="${mavenCommand}">
+			<arg value="-s"/>
+			<arg value="${mavenSettings}"/>
+			<arg value="-f"/>
+			<arg value="pom.xml"/>
+			<arg value="dependency:copy-dependencies"/>
+			<arg value="-DoutputDirectory=${outputDirectory}"/>
+		</exec>
 	</target>
 	
 	<target name="echoAntHome" description="Genera directorio x21aPortalStatics para despliegue de en portal">

From 9b3425d5de9303c5b29b223dccd07b4f03852a8d Mon Sep 17 00:00:00 2001
From: Xabi <xaabi6@users.noreply.github.com>
Date: Tue, 12 Nov 2024 10:59:42 +0100
Subject: [PATCH 5/6] Actualizar dependencia de x38

---
 x21aEAR/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x21aEAR/pom.xml b/x21aEAR/pom.xml
index 50c8a71ff..f413fca18 100644
--- a/x21aEAR/pom.xml
+++ b/x21aEAR/pom.xml
@@ -12,7 +12,7 @@
 		<org.springframework.security.version>3.2.9.RELEASE</org.springframework.security.version>
 		<org.logback.version>1.1.7</org.logback.version>
 		<org.slf4j.version>1.7.21</org.slf4j.version>
-		<com.ejie.x38.version>3.7.1-RELEASE</com.ejie.x38.version>
+		<com.ejie.x38.version>3.9.0-RELEASE</com.ejie.x38.version>
 	</properties>
 	
 	<dependencies>

From f200757e84e6db83812ef103e4859ef10782d16b Mon Sep 17 00:00:00 2001
From: Xabi <xaabi6@users.noreply.github.com>
Date: Tue, 12 Nov 2024 11:00:43 +0100
Subject: [PATCH 6/6] =?UTF-8?q?Actualizar=20versi=C3=B3n=20de=20la=20aplic?=
 =?UTF-8?q?aci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 x21aEAR/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x21aEAR/pom.xml b/x21aEAR/pom.xml
index f413fca18..223f9cd5f 100644
--- a/x21aEAR/pom.xml
+++ b/x21aEAR/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>com.ejie.x21a</groupId>
 	<artifactId>x21aEAR</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0-SNAPSHOT</version>
+	<version>3.8.0-RELEASE</version>
 	<name>x21aEAR</name>
 	<url>http://maven.apache.org</url>
 	<properties>