upgrade to Cesium v0.2.1

duniter4j-core-client/src/main/resources/i18n/duniter4j-core-client_en_GB.properties

@@ -3,7 +3,7 @@ duniter4j.client.core.connect=Could not connect to Duniter node [%s]
 duniter4j.client.core.emptyResponse=
 duniter4j.client.core.invalidResponse=
 duniter4j.client.core.timeout=
-duniter4j.client.status=Http request error: %s
+duniter4j.client.status=Http request error\: %s
 duniter4j.config=
 duniter4j.config.option.basedir.description=
 duniter4j.config.option.cache.directory.description=

duniter4j-core-client/src/main/resources/i18n/duniter4j-core-client_fr_FR.properties

@@ -3,7 +3,7 @@ duniter4j.client.core.connect=Echec de la connection au noeud Duniter [%s]
 duniter4j.client.core.emptyResponse=
 duniter4j.client.core.invalidResponse=
 duniter4j.client.core.timeout=
-duniter4j.client.status=Echec de requete HTTP : %s
+duniter4j.client.status=Echec de requete HTTP \: %s
 duniter4j.config=
 duniter4j.config.option.basedir.description=
 duniter4j.config.option.cache.directory.description=

duniter4j-elasticsearch/pom.xml

@@ -305,13 +305,14 @@
                 </goals>
                 <configuration>
                   <target>
-                    <!--<chmod perm="ug+rw">
-                      <fileset dir="${es.home}/lib" />
-                    </chmod>-->
                     <ac:if xmlns:ac="antlib:net.sf.antcontrib">
                       <istrue value="${assembly.skip}" />
+                      <!-- reuse standalone files -->
                       <then>
-                        <copy todir="${run.es.home}/plugins/${project.artifactId}">
+                        <delete failonerror="false">
+                          <fileset dir="${run.es.home}/plugins/${project.artifactId}" includes="${project.artifactId}-*.jar" />
+                        </delete>
+                        <copy todir="${run.es.home}/plugins/${project.artifactId}" overwrite="true">
                           <fileset dir="${project.build.directory}" includes="*.jar">
                           </fileset>
                         </copy>

duniter4j-elasticsearch/src/main/java/org/duniter/elasticsearch/action/site/RestCesiumConfigAction.java

@@ -100,33 +100,32 @@ public class RestCesiumConfigAction extends RestFilter {
             return configJsContent;
         }
 
-        // Compute the ES node address
-        String esNode = "localhost:9200";
+        // Get ES node address
         BoundTransportAddress host = transport.boundAddress();
-        if (host != null) {
-            TransportAddress address = host.publishAddress();
-            if (address != null) {
-                esNode = address.toString();
-            }
-        }
-
-        // Compute the Duniter node address
-        String duniterNode = String.format("%s:%s",
-                pluginSettings.getNodeBmaHost(),
-                pluginSettings.getNodeBmaPort());
+        TransportAddress esNodeAddress = host.publishAddress();
 
         // Compute the config file content
         configJsContent = String.format("angular.module(\"cesium.config\", [])\n" +
-                ".constant(\"APP_CONFIG\", {\n" +
-                "                \"DUNITER_NODE\": \"%s\",\n" +
-                "                \"DUNITER_NODE_ES\": \"%s\",\n" +
-                "                \"NEW_ISSUE_LINK\": \"https://github.com/duniter/cesium/issues/new?labels=bug\",\n" +
-                "                \"TIMEOUT\": 4000,\n" +
-                "                \"DEBUG\": false,\n" +
-                "                \"VERSION\": \"0.1.28\",\n" +
-                "                \"BUILD_DATE\": \"2016-08-18T16:45:31.702Z\"});",
-                duniterNode,
-                esNode
+                        ".constant(\"csConfig\", {\n" +
+                        "                \"node\": {\n" +
+                        "                    \"host\": \"%s\",\n" +
+                        "                    \"port\": \"%s\"\n" +
+                        "                },\n" +
+                        "                \"plugins\": {\n" +
+                        "                  \"es\": {\n" +
+                        "                    \"enable\": \"true\",\n" +
+                        "                    \"host\": \"%s\",\n" +
+                        "                    \"port\": \"%s\"\n" +
+                        "                  },\n" +
+                        "                },\n" +
+                        "                \"newIssueUrl\": \"https://github.com/duniter/cesium/issues/new?labels=bug\",\n" +
+                        "                \"time\": 4000,\n" +
+                        "                \"version\": \"0.2.1\",\n" +
+                        "             });",
+                pluginSettings.getNodeBmaHost(),
+                pluginSettings.getNodeBmaPort(),
+                esNodeAddress.getHost(),
+                esNodeAddress.getPort()
                 );
 
         return configJsContent;

pom.xml

@@ -27,7 +27,7 @@
     <jna.version>4.1.0</jna.version>
     <tyrus.version>1.12</tyrus.version>
 
-    <cesium.version>0.1.28</cesium.version>
+    <cesium.version>0.2.1</cesium.version>
 
     <nuitonConfigVersion>3.0-rc-4</nuitonConfigVersion>
     <nuitonI18nVersion>3.5</nuitonI18nVersion>