Merge branch 'master' into queue-api

ggallotti · web-flow · commit 569bffeca5c9 · 2022-06-17T10:05:54.000-03:00
diff --git a/android/pom.xml b/android/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxandroid</artifactId>
diff --git a/androidreports/pom.xml b/androidreports/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxandroidreports</artifactId>
diff --git a/apacheandroid/pom.xml b/apacheandroid/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>apacheandroid</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxcommon</artifactId>
diff --git a/common/src/main/java/com/genexus/GXRuntime.java b/common/src/main/java/com/genexus/GXRuntime.java
@@ -1,5 +1,8 @@
 package com.genexus;
 
+import com.genexus.util.*;
+import java.util.Map;
+
 public class GXRuntime {
   static public short getEnvironment() {
     return 1; // RuntimeEnvironment.Server
@@ -17,4 +20,30 @@ static public void setExitCode(int value) {
   static public int getExitCode() {
     return exitCode; 
   }
+
+  public static String GetEnvironmentVariable(String key) {
+  	String value = "";
+  	if (key != null && key.length() > 0){
+		value = System.getenv(key);
+	}
+  		return value;
+  }
+  public static GXProperties GetEnvironmentVariables() {
+
+	  Map<String, String> env = System.getenv();
+	  GXProperties gxProperties = new GXProperties();
+	  for (String envName : env.keySet()) {
+		  gxProperties.add(envName,env.get(envName) );
+	  }
+	  return gxProperties;
+	}
+
+  public static boolean HasEnvironmentVariable(String key) {
+  	if (key != null && key.length() > 0){
+  		String value = System.getenv(key);
+  		if (value != null && value.length() > 0)
+  			return true;
+  	}
+  	return false;
+  }
 }
diff --git a/common/src/main/java/com/genexus/ModelContext.java b/common/src/main/java/com/genexus/ModelContext.java
@@ -94,6 +94,9 @@ public ModelContext(Class packageClass)
         }
 
         SpecificImplementation.Application.setContextClassName(this.packageClass);
+
+		if (threadModelContext.get() == null)
+			threadModelContext.set(this);
         try
         {
             this.staticContentBase = getClientPreferences().getWEB_IMAGE_DIR();
@@ -106,8 +109,6 @@ public ModelContext(Class packageClass)
         }
         if (httpContext != null)
             httpContext.setStaticContentBase(staticContentBase);
-        if (threadModelContext.get() == null)
-            threadModelContext.set(this);
     }
 
     public ModelContext(ModelContext modelContext)
diff --git a/common/src/main/java/com/genexus/db/BlobUpdateCursor.java b/common/src/main/java/com/genexus/db/BlobUpdateCursor.java
@@ -82,7 +82,7 @@ void postExecuteInsert(AbstractDataStoreProviderBase connectionProvider, Abstrac
 		IGXPreparedStatement selStmt = SentenceProvider.getPreparedStatement(connectionProvider, mCursorId + BLOB_SEL_ID, blobStmt2, false);
 		
 		// Seteo el argumento (el rowId) y ejecuto el select
-		String rowId = ((IGXCallableStatement)mPreparedStatement).getString(cantNoBlobParms + 1);
+		String rowId = ((IGXCallableStatement)mPreparedStatement).getString(cantNoBlobParms + 1).trim();
 		selStmt.setString(1, rowId);
 		IGXResultSet resultSet = (IGXResultSet)selStmt.executeQuery();
 		resultSet.next();
diff --git a/common/src/main/java/com/genexus/util/EnvVarReader.java b/common/src/main/java/com/genexus/util/EnvVarReader.java
@@ -1,5 +1,7 @@
 package com.genexus.util;
 
+import com.genexus.ModelContext;
+
 public class EnvVarReader {
 
     static String[] m_invalidChars = { ".", "|" };
@@ -12,15 +14,30 @@ public static String getEnvironmentVar(String section, String key, String mapped
 		}else{
 			String prefix = ENVVAR_PREFIX;
 			if (section != null && !section.isEmpty() && section != "Client") {
-				for (int i = 0; i < m_invalidChars.length; i++)
-					section = section.replace(m_invalidChars[i], "_");
+				section = replaceInvalidChars(section);
+				String realKey = key;
 				key = String.format("%s%s_%s", prefix, section.toUpperCase(), key.toUpperCase());
+				String envVar = System.getenv(key);
+				if (envVar != null)
+					return envVar;
+				if (ModelContext.getModelContext() != null) {
+					section = section.replace(replaceInvalidChars(ModelContext.getModelContext().getPackageName() + "|").toUpperCase(), "");
+					key = String.format("%s%s_%s", prefix, section.toUpperCase(), realKey.toUpperCase());
+				}
+				else
+					return null;
 			} else
 				key = String.format("%s%s", prefix, key.toUpperCase());
 			return System.getenv(key);
 		}
 	}
 
+	private static String replaceInvalidChars(String section) {
+		for (int i = 0; i < m_invalidChars.length; i++)
+			section = section.replace(m_invalidChars[i], "_");
+		return section;
+	}
+
     public static String getEnvironmentValue(String serviceType, String serviceName, String propertyName) {
         String envVarName = String.format("%s%s_%s", ENVVAR_PREFIX, serviceType.toUpperCase(), propertyName.toUpperCase());
         String value = System.getenv(envVarName);
diff --git a/gxandroidpublisher/pom.xml b/gxandroidpublisher/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxandroidpublisher</artifactId>
diff --git a/gxawsserverless/pom.xml b/gxawsserverless/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.genexus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.6-SNAPSHOT</version>
+        <version>2.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>gxawsserverless</artifactId>
@@ -25,6 +25,24 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxcommon</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxwrapperjavax</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxwrappercommon</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-jersey</artifactId>
diff --git a/gxawsserverless/src/test/java/com/genexus/serverless/proxy/test/jersey/GeneXusAppAwsProxyTest.java b/gxawsserverless/src/test/java/com/genexus/serverless/proxy/test/jersey/GeneXusAppAwsProxyTest.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.genexus.cloud.serverless.aws.LambdaHandler;
+import com.genexus.specific.java.Connect;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -45,6 +46,8 @@ public class GeneXusAppAwsProxyTest {
 
     @Before
     public void setUpStreams() {
+		Connect.init();
+
         try {
             System.setProperty("LAMBDA_TASK_ROOT", ".");
             l = new LambdaHandler();
diff --git a/gxawsserverless/src/test/java/com/genexus/serverless/proxy/test/jersey/JerseyAwsProxyTest.java b/gxawsserverless/src/test/java/com/genexus/serverless/proxy/test/jersey/JerseyAwsProxyTest.java
@@ -21,6 +21,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import com.genexus.specific.java.Connect;
 import com.genexus.webpanels.GXObjectUploadServices;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Test;
@@ -58,6 +59,8 @@ public class JerseyAwsProxyTest {
 
     @Before
     public void setUpStreams() {
+		Connect.init();
+
         try {
             System.setProperty("LAMBDA_TASK_ROOT", ".");
             l = new LambdaHandler();
diff --git a/gxcryptocommon/pom.xml b/gxcryptocommon/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxcryptocommon</artifactId>
diff --git a/gxexternalproviders/pom.xml b/gxexternalproviders/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxexternalproviders</artifactId>
diff --git a/gxgeospatial/pom.xml b/gxgeospatial/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxgeospatial</artifactId>
diff --git a/gxmail/pom.xml b/gxmail/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
     <artifactId>gxmail</artifactId>
     <name>GeneXus Mail</name>
diff --git a/gxmaps/pom.xml b/gxmaps/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxmaps</artifactId>
diff --git a/gxodata/pom.xml b/gxodata/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxodata</artifactId>
diff --git a/gxoffice/pom.xml b/gxoffice/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxoffice</artifactId>
diff --git a/gxsearch/pom.xml b/gxsearch/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxsearch</artifactId>
diff --git a/gxwebsocket/pom.xml b/gxwebsocket/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.genexus</groupId>
-        <version>2.6-SNAPSHOT</version>
+        <version>2.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>gxwebsocket</artifactId>
diff --git a/gxwebsocketjakarta/pom.xml b/gxwebsocketjakarta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.genexus</groupId>
-        <version>2.6-SNAPSHOT</version>
+        <version>2.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>gxwebsocketjakarta</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.6-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxclassR</artifactId>
@@ -265,6 +265,12 @@
 			<version>10.2.0.jre8</version>
 			<scope>runtime</scope>
 		</dependency>		
+    <dependency>
+			<groupId>com.dameng</groupId>
+			<artifactId>DmJdbcDriver18</artifactId>
+			<version>8.1.2.79</version>
+			<scope>runtime</scope>
+		</dependency>		
     </dependencies>
 	
 	<build>
diff --git a/java/src/main/java/com/genexus/db/Namespace.java b/java/src/main/java/com/genexus/db/Namespace.java
@@ -94,7 +94,7 @@ public Namespace(String name, IniFile iniFile)
 									iniFile.getProperty(section, "MULTI_JDBC_DATASOURCE_PROC", ""),
 									iniFile.getProperty(section, "JDBC_DATASOURCE", ""),
 									iniFile.getIntegerProperty(section, "MAX_CURSOR", "100"),
-									iniFile.getProperty(section, "ISOLATION_LEVEL", "CR").equals("CR")?1:0,
+									getIsolationLevel(iniFile, section),
 									iniFile.getProperty(section, "XBASE_TINT", "1").equals("1"),
 									iniFile.getProperty(section, "DBMS", "sqlserver"),
 									iniFile.getProperty(section, "CS_SCHEMA", ""),
@@ -159,6 +159,19 @@ public Namespace(String name, IniFile iniFile)
 			NamespaceJMX.CreateNamespaceJMX(this);
 	}
 
+	private int getIsolationLevel(IniFile iniFile, String section)
+	{
+		String isolationLevel = iniFile.getProperty(section, "ISOLATION_LEVEL", "CR");
+		switch (isolationLevel)
+		{
+			case "UR" : return 0;
+			case "CR" : return 1;
+			case "RR" : return 2;
+			case "SE"  : return 3;
+		}
+		return 0;
+	}
+
 	public static Namespace createNamespace(ModelContext context)
 	{
 		IniFile iniFile = context.getPreferences().getIniFile();
diff --git a/java/src/main/java/com/genexus/db/driver/DataSource.java b/java/src/main/java/com/genexus/db/driver/DataSource.java
@@ -589,6 +589,7 @@ public String[] concatOp()
 			case GXDBMS.DBMS_DB2:
 				return new String[]{"", " CONCAT ", ""};
 			case GXDBMS.DBMS_ORACLE:
+			case GXDBMS.DBMS_DAMENG:
 			case GXDBMS.DBMS_HANA:
 			case GXDBMS.DBMS_POSTGRESQL:
 			case GXDBMS.DBMS_SQLITE:
diff --git a/java/src/main/java/com/genexus/db/driver/GXCallableStatement.java b/java/src/main/java/com/genexus/db/driver/GXCallableStatement.java
@@ -79,7 +79,7 @@ public void setNotInUse()
 
 	public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException
 	{
-		if (con.getDBMS().getId() == GXDBMS.DBMS_ORACLE && sqlType == Types.BIT)
+		if ((con.getDBMS().getId() == GXDBMS.DBMS_ORACLE || con.getDBMS().getId() == GXDBMS.DBMS_DAMENG) && sqlType == Types.BIT)
 		{
 			sqlType = PLSQL_BOOLEAN;
 		}
diff --git a/java/src/main/java/com/genexus/db/driver/GXConnection.java b/java/src/main/java/com/genexus/db/driver/GXConnection.java
@@ -335,6 +335,10 @@ private int GXToJDBCIsolationLevel(int gxIL)
 					return Connection.TRANSACTION_READ_COMMITTED;
 				case 0:
 					return Connection.TRANSACTION_READ_UNCOMMITTED;
+				case 2:
+					return Connection.TRANSACTION_REPEATABLE_READ;
+				case 3:
+					return Connection.TRANSACTION_SERIALIZABLE;
 				default:
 					System.err.println("Invalid isolation level " + gxIL);
 					return Connection.TRANSACTION_NONE;
diff --git a/java/src/main/java/com/genexus/db/driver/GXDBMS.java b/java/src/main/java/com/genexus/db/driver/GXDBMS.java
@@ -20,6 +20,7 @@ public interface GXDBMS
 	public static final int DBMS_SQLITE = 9;
 	public static final int DBMS_HANA = 10;
 	public static final int DBMS_SERVICE = 11;
+	public static final int DBMS_DAMENG = 12;
 
 	boolean DataTruncation(SQLException e);
 	boolean useReadOnlyConnections();
diff --git a/java/src/main/java/com/genexus/db/driver/GXDBMSdameng.java b/java/src/main/java/com/genexus/db/driver/GXDBMSdameng.java
diff --git a/java/src/main/java/com/genexus/db/driver/GXPreparedStatement.java b/java/src/main/java/com/genexus/db/driver/GXPreparedStatement.java
diff --git a/java/src/main/java/com/genexus/specific/java/BatchUpdateCursor.java b/java/src/main/java/com/genexus/specific/java/BatchUpdateCursor.java
diff --git a/java/src/test/java/com/genexus/TestGxReadEnvVar.java b/java/src/test/java/com/genexus/TestGxReadEnvVar.java
diff --git a/javapns/pom.xml b/javapns/pom.xml
diff --git a/pom.xml b/pom.xml
diff --git a/wrappercommon/pom.xml b/wrappercommon/pom.xml
diff --git a/wrapperjakarta/pom.xml b/wrapperjakarta/pom.xml
diff --git a/wrapperjavax/pom.xml b/wrapperjavax/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ public ModelContext(Class packageClass)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`SpecificImplementation.Application.setContextClassName(this.packageClass);`
	`97`	`+`
	`98`	`+ if (threadModelContext.get() == null)`
	`99`	`+ threadModelContext.set(this);`
`97`	`100`	`try`
`98`	`101`	`{`
`99`	`102`	`this.staticContentBase = getClientPreferences().getWEB_IMAGE_DIR();`
`@@ -106,8 +109,6 @@ public ModelContext(Class packageClass)`
`106`	`109`	`}`
`107`	`110`	`if (httpContext != null)`
`108`	`111`	`httpContext.setStaticContentBase(staticContentBase);`
`109`		`- if (threadModelContext.get() == null)`
`110`		`- threadModelContext.set(this);`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`public ModelContext(ModelContext modelContext)`