Merge remote-tracking branch 'origin/develop-3.x' into support-3.x

UDA-EJIE · Nov 12, 2024 · 51b9bd5 · 51b9bd5
2 parents 13ee301 + f200757
commit 51b9bd5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 33 deletions.
diff --git 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/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">

diff --git a/x21aEAR/pom.xml b/x21aEAR/pom.xml
@@ -4,15 +4,15 @@
 	<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>
 		<org.springframework.version>3.2.17.RELEASE</org.springframework.version>
 		<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>
@@ -111,7 +111,7 @@
             </dependency>
 			<!-- Jdbcdslog -->
 			<dependency>
-				<groupId>org</groupId>
+				<groupId>com.googlecode.usc</groupId>
 				<artifactId>jdbcdslog</artifactId>
 				<version>1.0.5</version>
 			</dependency>
@@ -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>

diff --git 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");
+		}
+	});
 });