From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Sep 2021 09:51:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.23~3
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=0346615633181e04be0bdac3dfb13e26cce0976f;hp=f479d346f8f826edc159b8240614844c7e01259b

Merge remote-tracking branch 'origin/master' into v2.x
---

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 57e5b2b..119d7a0 100644
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.1.16-SNAPSHOT</version>
+		<version>2.1.23-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
@@ -15,12 +15,60 @@
 	<dependencies>
 		<!-- Base Argeo platform distribution -->
 		<dependency>
-			<groupId>org.argeo.slc.rcp</groupId>
+			<groupId>org.argeo.commons.rcp</groupId>
 			<artifactId>org.argeo.dep.cms.e4.rcp</artifactId>
-			<version>${version.argeo-slc}</version>
+			<version>${version.argeo-rcp}</version>
 			<type>pom</type>
 		</dependency>
 
+		<!-- Jackson JSON processor -->
+		<dependency>
+			<groupId>org.argeo.tp.jackson</groupId>
+			<artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jackson</groupId>
+			<artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jackson</groupId>
+			<artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
+		</dependency>
+
+		<!-- POI requirements -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.math3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.collections4</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xml.security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xmlbeans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xalan</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xalan.serializer</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xml.resolver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xerces</artifactId>
+		</dependency>
+
 		<!-- Argeo TP Extras -->
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.tp.payment</groupId> -->
diff --git a/dep/pom.xml b/dep/pom.xml
index 8db55f6..dade9ed 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.suite</groupId>
diff --git a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
index a505f16..5357149 100644
--- a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
+++ b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
@@ -121,8 +121,8 @@ public class OpenLayersMap extends Composite {
 				sb.append("new ol.geom.Point(ol.proj.fromLonLat([");
 				sb.append(lng).append(',').append(lat);
 				sb.append("]))");
-				sb.append(",path:'").append(node.getPath()).append("'");
-				sb.append(",name:'").append(node.getName()).append("'");
+				sb.append(",path:\"").append(node.getPath()).append("\"");
+				sb.append(",name:\"").append(node.getName()).append("\"");
 				String entityType = null;
 				if (node.isNodeType(EntityType.local.get())) {
 					entityType = node.getProperty(EntityNames.ENTITY_TYPE).getString();
@@ -175,6 +175,7 @@ public class OpenLayersMap extends Composite {
 						+ ",name: '" + name + "'}));";
 				toExecute.append(toEvaluate);
 			}
+			System.out.println(toExecute);
 			browser.execute(toExecute.toString());
 		}
 	}
diff --git a/pom.xml b/pom.xml
index a772f14..7c1ba6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.maven</groupId>
@@ -16,6 +18,7 @@
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 		<version.argeo-commons>2.1.103</version.argeo-commons>
+		<!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
 		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
 
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>