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 57e5b2b77dc9037a7867cce2b80c9ab7e0a4b1cd..119d7a015a35cac6a0f7866101dbb865098e5931 100644 (file)
--- 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 8db55f65bf2bc861ff42ecda41ae84d8302aa74e..dade9ede757b88896ca3c499b088837e255d9449 100644 (file)
--- 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 a505f163d7c4665113e9d40339517ecf11394f67..5357149c81e4dc5d3ec859ca5a2c925afef8559e 100644 (file)
--- 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 a772f14f43ad17c920d79be78c474a0f9a6a0db3..7c1ba6d78a1944797e504e963ca0c056e2777c75 100644 (file)
--- 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>