();
for (int i = 0; i < parameters.length; i = i + 2) {
parameterList.add(new BasicNameValuePair(parameters[i],
diff --git a/integration-tests/src/test/java/org/fao/unredd/functional/feedback/FeedbackTest.java b/integration-tests/src/test/java/org/fao/unredd/functional/feedback/FeedbackTest.java
index e7d5702..93ab213 100644
--- a/integration-tests/src/test/java/org/fao/unredd/functional/feedback/FeedbackTest.java
+++ b/integration-tests/src/test/java/org/fao/unredd/functional/feedback/FeedbackTest.java
@@ -15,7 +15,7 @@ public class FeedbackTest extends AbstractIntegrationTest {
@Test
public void testCommentAndVerify() throws Exception {
- String email = "fergonco@gmail.com";
+ String email = "onuredd@gmail.com";
String geometry = "POINT(0 1)";
String comment = "boh";
String layerName = "classification";
diff --git a/integration-tests/src/test/java/org/fao/unredd/functional/stats/StatsTest.java b/integration-tests/src/test/java/org/fao/unredd/functional/stats/StatsTest.java
index 3c1cf63..4b6e949 100644
--- a/integration-tests/src/test/java/org/fao/unredd/functional/stats/StatsTest.java
+++ b/integration-tests/src/test/java/org/fao/unredd/functional/stats/StatsTest.java
@@ -15,6 +15,7 @@
import org.apache.http.client.methods.CloseableHttpResponse;
import org.fao.unredd.functional.AbstractIntegrationTest;
import org.fao.unredd.functional.IntegrationTest;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -213,6 +214,7 @@ public void testStatsServiceDataTypes() throws Exception {
checkStatsServiceTest(root);
}
+ @Ignore
@Test
public void testCalculateStats() throws Exception {
String layerName = "unredd:provinces";
diff --git a/integration-tests/src/test/resources/org/fao/unredd/functional/functional-test.properties b/integration-tests/src/test/resources/org/fao/unredd/functional/functional-test.properties
index bcd3bf7..2d31881 100644
--- a/integration-tests/src/test/resources/org/fao/unredd/functional/functional-test.properties
+++ b/integration-tests/src/test/resources/org/fao/unredd/functional/functional-test.properties
@@ -1,4 +1,4 @@
-db-url=jdbc:postgresql://postgis.unredd:5432/spatialdata
-db-user=spatial_user
-db-password=unr3dd
+db-url=jdbc:postgresql://127.0.0.1:5432/spatialdata
+db-user=postgres
+db-password=
db-test-schema=integration_tests
diff --git a/integration-tests/test_config/layers.json b/integration-tests/test_config/layers.json
new file mode 100644
index 0000000..487317d
--- /dev/null
+++ b/integration-tests/test_config/layers.json
@@ -0,0 +1,265 @@
+{
+ "default-server" : "http://demo1.geo-solutions.it",
+ "wmsLayers" : [
+ {
+ "id" : "cycle-osm",
+ "type" : "osm",
+ "osmUrls" : [
+ "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
+ "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
+ "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
+ ]
+ }, {
+ "id" : "blue-marble",
+ "baseUrl" : "http://rdc-snsf.org/diss_geoserver/wms",
+ "wmsName" : "unredd:blue_marble",
+ "imageFormat" : "image/jpeg",
+ "visible" : true
+ }, {
+ "id" : "google-maps",
+ "type" : "gmaps",
+ "gmaps-type" : "SATELLITE",
+ "visible" : true
+ }, {
+ "id" : "nexrad",
+ "baseUrl" : "http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi?",
+ "wmsName" : "nexrad-n0r-wmst",
+ "imageFormat" : "image/png",
+ "visible" : true
+ }, {
+ "id" : "forestClassification",
+ "label" : "${facet_forest_classification}",
+ "baseUrl" : "/diss_geoserver/gwc/service/wms",
+ "wmsName" : "unredd:drc_forest_classification",
+ "imageFormat" : "image/png8",
+ "visible" : true,
+ "legend" : "forest_classification.png",
+ "sourceLink" : "http://osfac.net/facet.html",
+ "sourceLabel" : "FACET"
+ }, {
+ "id" : "forest_mask",
+ "label" : "${forest_mask}",
+ "legend" : "auto",
+ "baseUrl" : "/diss_geoserver/wms",
+ "wmsName" : "unredd:drc_forest_mask_mosaic",
+ "imageFormat" : "image/png8",
+ "visible" : true,
+ "sourceLink" : "http://osfac.net/facet.html",
+ "sourceLabel" : "FACET"
+ }, {
+ "id" : "forestClassification2",
+ "label" : "grouped facet forest classification",
+ "baseUrl" : "/diss_geoserver/unredd/wms",
+ "wmsName" : "drc_forest_classification",
+ "visible" : true,
+ "legend" : "forest_classification.png",
+ "sourceLink" : "http://osfac.net/facet.html",
+ "sourceLabel" : "FACET2"
+ }, {
+ "id" : "forest_mask2",
+ "label" : "Grouped forest mask",
+ "baseUrl" : "/diss_geoserver/unredd/wms",
+ "wmsName" : "drc_forest_mask_mosaic",
+ "visible" : true,
+ "legend" : "forest_mask.png",
+ "sourceLink" : "http://osfac.net/facet.html",
+ "sourceLabel" : "FACET2"
+ }, {
+ "id" : "countryBoundaries",
+ "baseUrl" : "/diss_geoserver/wms",
+ "wmsName" : "unredd:drc_boundary",
+ "imageFormat" : "image/png8",
+ "visible" : true,
+ "sourceLink" : "http://www.wri.org/publication/interactive-forest-atlas-democratic-republic-of-congo",
+ "sourceLabel" : "WRI"
+ }, {
+ "id" : "provinces",
+ "baseUrl" : "/diss_geoserver/wms",
+ "wmsName" : "unredd:drc_provinces",
+ "imageFormat" : "image/png8",
+ "visible" : true,
+ "sourceLink" : "http://www.wri.org/publication/interactive-forest-atlas-democratic-republic-of-congo",
+ "sourceLabel" : "WRI"
+ }, {
+ "id" : "incendios_wfsinfo",
+ "baseUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wms",
+ "wmsName" : "bosques_umsef_db:provincias_incendios",
+ "imageFormat" : "image/png8",
+ "legend" : "auto",
+ "visible" : true,
+ "queryType" : "wfs",
+ "queryUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wfs",
+ "queryGeomFieldName" : "geom",
+ "queryFieldNames" : [ "nprov", "anio_f" ],
+ "queryFieldAliases" : [ "ID", "fecha" ],
+ "queryTimeFieldName" : "anio_f"
+ }, {
+ "id" : "incendios_wmsinfo",
+ "baseUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wms",
+ "wmsName" : "bosques_umsef_db:provincias_incendios",
+ "imageFormat" : "image/png8",
+ "legend" : "auto",
+ "visible" : true,
+ "queryType" : "wms",
+ "queryHighlightBounds" : true,
+ "queryFieldNames" : [ "nprov", "anio_f" ],
+ "queryFieldAliases" : [ "Nombre", "Fecha" ],
+ }, {
+ "id" : "incendios_wmsinfo_default",
+ "baseUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wms",
+ "wmsName" : "bosques_umsef_db:provincias_incendios",
+ "imageFormat" : "image/png8",
+ "legend" : "auto",
+ "visible" : true,
+ "queryType" : "wms"
+ }, {
+ "id" : "provincias_demo",
+ "baseUrl" : "http://demo.geomati.co:8080/geoserver/bosques/wms",
+ "wmsName" : "bosques:provincias",
+ "imageFormat" : "image/png8",
+ "visible" : true,
+ "sourceLink" : "http://demo.geomati.co:8080/geoserver/web",
+ "sourceLabel" : "WRI",
+ "queryType" : "wms"
+ }, {
+ "baseUrl": "http://geo2.ambiente.gob.ar/portal/gs/gwc/service/wms",
+ "label": "L\u00edmites provinciales",
+ "visible": true,
+ "imageFormat": "image/png8",
+ "id": "limites_provinciales",
+ "wmsName": "bosques_umsef_db:limites_provinciales",
+ "legend": "lim_prov.png",
+ "queryType" : "wfs",
+ "queryUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wfs",
+ "queryGeomFieldName" : "geom",
+ "queryFieldNames" : [ "nprov", "cod_indec" ],
+ "queryFieldAliases" : [ "Nombre", "Codigo" ]
+ }
+ ],
+
+ "portalLayers" : [
+ {
+ "id" : "blue-marble",
+ "active" : true,
+ "label" : "Blue marble",
+ "layers" : [ "blue-marble" ]
+ },
+ {
+ "id" : "osm-layer",
+ "active" : false,
+ "label" : "Open Cycle Map",
+ "layers" : [ "cycle-osm" ]
+ },
+ {
+ "id" : "google-maps-context",
+ "active" : false,
+ "label" : "Google maps",
+ "layers" : [ "google-maps" ]
+ },
+ {
+ "id" : "forestClassification",
+ "active" : false,
+ "infoFile" : "forest_classification_def.html",
+ "label" : "${facet_forest_classification}",
+ "layers" : [ "forestClassification" ],
+ "feedback" : true
+ }, {
+ "id" : "forest_mask",
+ "label" : "${forest_mask}",
+ "layers" : [ "forest_mask" ],
+ "infoLink": "http://nfms4redd.org/",
+ "timeInstances" : "2000-01-01T00:00:00.000Z,2005-01-01T00:00:00.000Z,2010-01-01T00:00:00.000Z",
+ "feedback" : true
+ }, {
+ "id" : "countryBoundaries",
+ "active" : false,
+ "label" : "${country_boundaries}",
+ "layers" : [ "countryBoundaries" ],
+ "inlineLegendUrl" : "auto"
+ }, {
+ "id" : "provinces",
+ "active" : false,
+ "infoFile" : "provinces_def.html",
+ "label" : "${provinces}",
+ "layers" : [ "provinces" ],
+ "inlineLegendUrl" : "auto"
+ }, {
+ "id" : "forest",
+ "active" : false,
+ "label" : "All forestry layers",
+ "layers" : [ "forest_mask2", "forestClassification2" ]
+ }, {
+ "id" : "nexrad_layer",
+ "active" : false,
+ "label" : "Nexrad",
+ "timeInstances" : "2010-03-01T00:00,2010-03-02T00:00,2010-03-03T00:00",
+ "date-format" : "DD-MM-YYYY",
+ "layers" : [ "nexrad" ]
+ }, {
+ "id" : "provinces_title_placeholder",
+ "label" : "Provincias"
+ }, {
+ "active": true,
+ "layers": [
+ "limites_provinciales"
+ ],
+ "id": "limites_provinciales",
+ "infoFile": "ign.html",
+ "label": "L\u00edmites provinciales"
+ }, {
+ "id" : "incendios_wfsinfo",
+ "active" : true,
+ "label" : "Incendios por provincias (wfs info)",
+ "layers" : [ "incendios_wfsinfo" ],
+ "timeInstances" : "2012-01-01T00:00:00.000Z,2013-01-01T00:00:00.000Z",
+ "timeStyles" : "cantidad_incendios_2012,cantidad_incendios_2013"
+ }, {
+ "id" : "incendios_wmsinfo",
+ "active" : true,
+ "label" : "Incendios por provincias (wms info)",
+ "layers" : [ "incendios_wmsinfo" ],
+ "timeInstances" : "2012-01-01T00:00:00.000Z,2013-01-01T00:00:00.000Z",
+ "timeStyles" : "cantidad_incendios_2012,cantidad_incendios_2013"
+ }, {
+ "id" : "incendios_wmsinfo_default",
+ "active" : true,
+ "label" : "Incendios por provincias (default info)",
+ "layers" : [ "incendios_wmsinfo_default" ],
+ "timeInstances" : "2012-01-01T00:00:00.000Z,2013-01-01T00:00:00.000Z",
+ "timeStyles" : "cantidad_incendios_2012,cantidad_incendios_2013"
+ }, {
+ "id" : "demo_layers",
+ "active" : false,
+ "label" : "Provincias Estadísticas",
+ "layers" : [ "provincias_demo" ]
+ }
+ ],
+
+ "groups" : [
+ {
+ "id" : "base",
+ "label" : "${base_layers}",
+ "infoFile": "base_layers.html",
+ "items" : [
+ {
+ "id" : "innerbase",
+ "label" : "General purpose",
+ "items": ["blue-marble", "osm-layer", "google-maps-context"]
+ }, {
+ "id" : "innerforest",
+ "label" : "Forest classifications",
+ "items": [ "forestClassification" ]
+ }
+ ]
+ }, {
+ "id" : "admin",
+ "label" : "${admin_areas}",
+ "infoLink": "http://nfms4redd.org/",
+ "items" : [ "countryBoundaries", "provinces_title_placeholder", "provinces", "limites_provinciales", "incendios_wfsinfo", "incendios_wmsinfo", "incendios_wmsinfo_default", "demo_layers" ]
+ }, {
+ "id" : "landcover",
+ "label" : "${land_cover_maps}",
+ "items" : [ "forest_mask", "forest", "nexrad_layer" ]
+ }
+ ]
+}
diff --git a/integration-tests/test_config/messages/messages.properties b/integration-tests/test_config/messages/messages.properties
new file mode 100644
index 0000000..476b960
--- /dev/null
+++ b/integration-tests/test_config/messages/messages.properties
@@ -0,0 +1,78 @@
+# Java Resource Bundle
+# Modified by Zaval JRC Editor (C) Zaval CE Group
+# http://www.zaval.org/products/jrc-editor/
+#
+
+#Tue May 07 17:01:09 CEST 2013
+ajax_feedback_error=Error submitting feedback.
+ajax_feedback_ok=Feedback successfully sent.
+ajax_invalid_recaptcha=Invalid recaptcha. Please try again.
+ajax_invalid_parameter=Invalid service usage.
+ajax_read_error=Server couldn't read submitted content.
+ajax_storing_error=Server couldn't store submitted data.
+ajax_syntax_error=Submitted content has a bad syntax.
+base_layers=Base Layers
+cancel=Cancel
+chart=Chart
+data_source=Data source
+email=Email
+feedback=feedback
+feedback_addfeature_tooltip=Add Polygon
+feedback_button=Feedback
+feedback_deletepolygon_confirm=Deleting polygon, are you sure?
+feedback_drawing_tools=Drawing tools
+feedback_editfeature_tooltip=Edit Polygon
+feedback_info=Please click on the map to post feedback
+feedback_query_tooltip=Get features from the selected layer
+feedback_text=Use the tools to draw a geographic extent over the map.
+feedback_title=Send feedback on map contents
+feedback_year=Year
+invalid_email_text=Your e-mail address is not valid. Please use a valid e-mail address.
+invalid_email_title=Invalid e-mail
+info_dialog_title=Information
+layer=Layer
+layers=Layers
+layersjson_baseUrl_not_defined=attribute 'baseUrl' not defined
+layersjson_context_def_error=Error in context definition
+layersjson_context_group_error=Error in context group
+layersjson_context_id_not_defined=Error in context definition: attribute 'id' not defined
+layersjson_context_label_not_defined=attribute 'label' not defined
+layersjson_layer_def_error=Error in layer definition
+layersjson_layer_id_not_defined=Error in layer definition: attribute 'id' not defined
+layersjson_layer_label_not_defined=attribute 'label' should be present when 'legend' is defined
+layersjson_not_defined=not defined
+layersjson_source_label_not_defined=attribute 'sourceLabel' should be present when 'sourceLink' is defined
+layersjson_wmsName_not_defined=attribute 'wmsName' not defined
+legend_button=Legend
+months=['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'June', 'July', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Des.']
+name=Name
+selected_layers=Transparency
+statistics=Statistics
+statistics_button=Statistics
+statistics_info=Please click on the map to start drawing a polygon
+statistics_not_supported=Statistics are not supported in this version
+submit=Submit
+subtitle=Subtitle
+zoom_to_area=Zoom to area
+title=NFMS Sample Portal
+
+# BEGIN Feedback
+Feedback.all_parameters_mandatory=all parameters are mandatory:
+Feedback.error_sending_mail=Error sending mail:
+Feedback.the_message_has_been_validated=The comment has been validated.
+Feedback.comment_not_found=Cannot find any message with the code
+Feedback.mail-title=Comment on the UN-REDD portal
+Feedback.verify-mail-text=Please, visit http://localhost:8080/unredd-portal/verify-comment?lang=$lang&verificationCode=$code to confirm the comment.
+Feedback.validated-mail-text=The comment with verification code "$code", has been validated and can be accessed in the portal.
+Feedback.invalid-email-address=The specified e-mail address is not valid
+Feedback.no-geometries=At least one geometry must be drawn
+Feedback.wait=Wait for the feedback to be sent...
+Feedback.verify_mail_sent=An e-mail has been sent to the specified e-mail address in order to confirm the comment
+Feedback.submit_error=Error sending the comment
+Feedback.no_layer_visible=None of the layers enabled for feedback is active
+Feedback.no-layer-selected=No layer is selected
+# END Feedback
+
+footnote.text=This is a footnote
+
+layer_order=Layer Order
diff --git a/integration-tests/test_config/messages/messages_en.properties b/integration-tests/test_config/messages/messages_en.properties
new file mode 100644
index 0000000..c78229c
--- /dev/null
+++ b/integration-tests/test_config/messages/messages_en.properties
@@ -0,0 +1,78 @@
+# Java Resource Bundle
+# Modified by Zaval JRC Editor (C) Zaval CE Group
+# http://www.zaval.org/products/jrc-editor/
+#
+
+#Tue May 07 17:01:09 CEST 2013
+ajax_feedback_error=Error submitting feedback.
+ajax_feedback_ok=Feedback successfully sent.
+ajax_invalid_recaptcha=Invalid recaptcha. Please try again.
+ajax_invalid_parameter=Invalid service usage.
+ajax_read_error=Server couldn't read submitted content.
+ajax_storing_error=Server couldn't store submitted data.
+ajax_syntax_error=Submitted content has a bad syntax.
+base_layers=Base Layers
+cancel=Cancel
+chart=Chart
+data_source=Data source
+email=Email
+feedback=feedback
+feedback_addfeature_tooltip=Add Polygon
+feedback_button=Feedback
+feedback_deletepolygon_confirm=Deleting polygon, are you sure?
+feedback_drawing_tools=Drawing tools
+feedback_editfeature_tooltip=Edit Polygon
+feedback_info=Please click on the map to post feedback
+feedback_query_tooltip=Get features from the selected layer
+feedback_text=Use the tools to draw a geographic extent over the map.
+feedback_title=Send feedback on map contents
+feedback_year=Year
+invalid_email_text=Your e-mail address is not valid. Please use a valid e-mail address.
+invalid_email_title=Invalid e-mail
+info_dialog_title=Information
+layer=Layer
+layers=Layers
+layersjson_baseUrl_not_defined=attribute 'baseUrl' not defined
+layersjson_context_def_error=Error in context definition
+layersjson_context_group_error=Error in context group
+layersjson_context_id_not_defined=Error in context definition: attribute 'id' not defined
+layersjson_context_label_not_defined=attribute 'label' not defined
+layersjson_layer_def_error=Error in layer definition
+layersjson_layer_id_not_defined=Error in layer definition: attribute 'id' not defined
+layersjson_layer_label_not_defined=attribute 'label' should be present when 'legend' is defined
+layersjson_not_defined=not defined
+layersjson_source_label_not_defined=attribute 'sourceLabel' should be present when 'sourceLink' is defined
+layersjson_wmsName_not_defined=attribute 'wmsName' not defined
+legend_button=Legend
+months=['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'June', 'July', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Des.']
+name=Name
+selected_layers=Transparency
+statistics=Statistics
+statistics_button=Statistics
+statistics_info=Please click on the map to start drawing a polygon
+statistics_not_supported=Statistics are not supported in this version
+submit=Submit
+subtitle=Subtitle
+zoom_to_area=Zoom to area
+title=NFMS Sample Portal
+
+# BEGIN Feedback
+Feedback.all_parameters_mandatory=all parameters are mandatory:
+Feedback.error_sending_mail=Error sending mail:
+Feedback.the_message_has_been_validated=The comment has been validated.
+Feedback.comment_not_found=Cannot find any message with the code
+Feedback.mail-title=Comment on the UN-REDD portal
+Feedback.verify-mail-text=Please, visit http://localhost:8080/unredd-portal/verify-comment?lang=$lang&verificationCode=$code to confirm the comment.
+Feedback.validated-mail-text=The comment with verification code "$code", has been validated and can be accessed in the portal.
+Feedback.invalid-email-address=The specified e-mail address is not valid
+Feedback.no-geometries=At least one geometry must be drawn
+Feedback.wait=Wait for the feedback to be sent...
+Feedback.verify_mail_sent=An e-mail has been sent to the specified e-mail address in order to confirm the comment
+Feedback.submit_error=Error sending the comment
+Feedback.no_layer_visible=None of the layers enabled for feedback is active
+Feedback.no-layer-selected=No layer is selected
+# END Feedback
+
+footnote.text=This is an English footnote
+
+layer_order=Layer Order
diff --git a/integration-tests/test_config/messages/messages_es.properties b/integration-tests/test_config/messages/messages_es.properties
new file mode 100644
index 0000000..803ff99
--- /dev/null
+++ b/integration-tests/test_config/messages/messages_es.properties
@@ -0,0 +1,78 @@
+# Java Resource Bundle
+# Modified by Zaval JRC Editor (C) Zaval CE Group
+# http://www.zaval.org/products/jrc-editor/
+#
+
+#Tue May 07 17:01:09 CEST 2013
+ajax_feedback_error=Error enviando comentarios.
+ajax_feedback_ok=Comentarios enviados correctamente.
+ajax_invalid_recaptcha=Recaptcha incorrecto. Por favor, vuelva a intentarlo.
+ajax_invalid_parameter=Uso del servicio no v\u00e1lido.
+ajax_read_error=El servidor no pudo leer los datos enviados.
+ajax_storing_error=El servidor no pudo almacenar los datos enviados.
+ajax_syntax_error=Los datos enviados tienen una sintaxis incorrecta.
+base_layers=Capas Base
+cancel=Cancelar
+chart=Gr\u00e1fico
+data_source=Fuente de datos
+email=Correo electr\u00f3nico
+feedback=Comentarios
+feedback_addfeature_tooltip=A\u00f1adir pol\u00edgono
+feedback_button=Comentarios
+feedback_deletepolygon_confirm=Est\u00e1 a punto de suprimir el pol\u00edgono, \u00bfest\u00e1 seguro?
+feedback_drawing_tools=Herramientas de dibujo
+feedback_editfeature_tooltip=Editar pol\u00edgono
+feedback_info=Por favor haga click en el mapa para enviar los comentarios
+feedback_query_tooltip=Recuperar elementos de la capa seleccionada
+feedback_text=Utilice las herramientas para dibujar una extensi\u00f3n geogr\u00e1fica sobre el mapa.
+feedback_title=Enviar comentarios acerca de los contenidos del mapa
+feedback_year=A\u00f1o
+invalid_email_text=Su direcci\u00f3n de correo electr\u00f3nico no es v\u00e1lida. Por favor, introduzca una direcci\u00f3n de correo v\u00e1lida.
+invalid_email_title=E-mail incorrecto
+info_dialog_title=Informaci\u00f3n
+layer=Capa
+layers=Capas
+layersjson_baseUrl_not_defined=el atributo 'baseUrl' no ha sido definido
+layersjson_context_def_error=Error en la definici\u00f3n del contexto
+layersjson_context_group_error=Error en el grupo de contextos
+layersjson_context_id_not_defined=Error en la definici\u00f3n del contexto: el atributo 'id' no ha sido definido
+layersjson_context_label_not_defined=el atributo 'label' no ha sido definido
+layersjson_layer_def_error=Error en la definici\u00f3n de la capa
+layersjson_layer_id_not_defined=Error en la definici\u00f3n de la capa: el atributo 'id' no ha sido definido
+layersjson_layer_label_not_defined=el atributo 'label' deber\u00eda estar presente cuando se define 'legend'
+layersjson_not_defined=no definido
+layersjson_source_label_not_defined=el atributo 'sourceLabel' deber\u00eda estar presente cuando se define 'sourceLink'
+layersjson_wmsName_not_defined=el atributo 'wmsName' no ha sido definido
+legend_button=Leyenda
+months=['Ene.', 'Feb.', 'Mar.', 'Abr.', 'Mayo', 'Jun.', 'Jul.', 'Ago.', 'Sep.', 'Oct.', 'Nov.', 'Dic.']
+name=Nombre
+selected_layers=Transparencia
+statistics=Estad\u00edsticas
+statistics_button=Estad\u00edsticas
+statistics_info=Por favor haga click en el mapa para dibujar un pol\u00edgono
+statistics_not_supported=Las estad\u00edsticas no est\u00e1n soportadas en esta versi\u00f3n
+submit=Enviar
+subtitle=Subt\u00edtulo
+zoom_to_area=Zoom a la zona
+title=Ejemplo de portal NFMS
+
+# BEGIN Feedback
+Feedback.all_parameters_mandatory=Todos los par\u00e1metros son obligatorios:
+Feedback.error_sending_mail=Error enviando el correo:
+Feedback.the_message_has_been_validated=El comentario ha sido validado.
+Feedback.comment_not_found=No se encontr\u00f3 ning\u00fan comentario con el c\u00f3digo
+Feedback.mail-title=Comentario en el portal ONU-REDD
+Feedback.verify-mail-text=Por favor, visite http://localhost:8080/unredd-portal/verify-comment?lang=$lang&verificationCode=$code para confirmar el env\u00edo.
+Feedback.validated-mail-text=El comentario con c\u00f3digo de verificaci\u00f3n "$code", ha sido validado y puede consultarse en el portal.
+Feedback.invalid-email-address=La direcci\u00f3n de correo especificada no es v\u00e1lida
+Feedback.no-geometries=Al menos se debe dibujar una geometr\u00eda
+Feedback.wait=El mensaje de feedback est\u00e1 siendo enviado...
+Feedback.verify_mail_sent=Se ha enviado un mensaje a la direcci\u00f3n de correo especificada para confirmar el comentario.
+Feedback.submit_error=No se pudo realizar el env\u00edo.
+Feedback.no_layer_visible=Ninguna de las capas habilitadas para feedback est\u00e1 visible
+Feedback.no-layer-selected=No se ha seleccionado ninguna capa
+# END Feedback
+
+footnote.text=Esto es una nota a pie en espa\u00f1ol
+
+layer_order=Orden Capas
diff --git a/integration-tests/test_config/messages/messages_fr.properties b/integration-tests/test_config/messages/messages_fr.properties
new file mode 100644
index 0000000..b510cfe
--- /dev/null
+++ b/integration-tests/test_config/messages/messages_fr.properties
@@ -0,0 +1,74 @@
+# Java Resource Bundle
+# Modified by Zaval JRC Editor (C) Zaval CE Group
+# http://www.zaval.org/products/jrc-editor/
+#
+
+#Tue May 07 17:01:09 CEST 2013
+ajax_feedback_error=Erreur en envoyer les commentaires.
+ajax_feedback_ok=Commentaires correctement envoy\u00e9es.
+ajax_invalid_recaptcha=Recaptcha non valide. S'il vous pla\u00eet r\u00e9essayez.
+ajax_invalid_parameter=Utilisation du service invalide.
+ajax_read_error=Le server n'a pas pu lire le contenu soumis.
+ajax_storing_error=Le server n'a pas pu stocker les donn\u00e9es soumises.
+ajax_syntax_error=Le contenu a une syntaxe incorrecte.
+base_layers=Fond de la Carte
+cancel=Annuler
+chart=Chart
+data_source=Source des donn\u00e9es
+email=Courrier email
+feedback=Commentaires
+feedback_addfeature_tooltip=Ajouter un polygone
+feedback_button=Retour d'information
+feedback_deletepolygon_confirm=Sur le point de supprimer ce polygone, \u00eates-vous s\u00fbr?
+feedback_drawing_tools=Outils de dessin
+feedback_editfeature_tooltip=Modifier Polygone
+feedback_info=Cliquer sur la carte pour poster des commentaires
+feedback_query_tooltip=Obtenez des \u00e9l\u00e9ments de la couche s\u00e9lectionn\u00e9e
+feedback_text=Utilisez les outils pour dessiner une \u00e9tendue g\u00e9ographique sur la carte.
+feedback_title=Envoyez vos remarques sur le contenu de la carte
+feedback_year=Ann\u00e9e
+invalid_email_text=Votre adresse e-mail n'est pas valide. S'il vous pla\u00eet corriger votr adresse e-mail.
+invalid_email_title=E-mail invalid
+info_dialog_title=Information
+layer=Couche
+layers=Couches
+layersjson_baseUrl_not_defined=l'attribut 'baseUrl' n'a pas \u00e9t\u00e9 d\u00e9fini
+layersjson_context_def_error=Erreur dans la d\u00e9finition du context
+layersjson_context_group_error=Erreur dans le group de contextes
+layersjson_context_id_not_defined=Erreur dans la d\u00e9finition du context: l'attribut 'id' n'a pas \u00e9t\u00e9 d\u00e9fini
+layersjson_context_label_not_defined=l'attribut 'label' n'a pas \u00e9t\u00e9 d\u00e9fini
+layersjson_layer_def_error=Erreur dans la d\u00e9finition de la couche
+layersjson_layer_id_not_defined=Erreur dans la d\u00e9finition de la couche: l'attribut 'id' n'a pas \u00e9t\u00e9 d\u00e9fini
+layersjson_layer_label_not_defined=l'attribute 'label' doit \u00eatre d\u00e9fini lorsque 'legend' est d\u00e9fini
+layersjson_not_defined=pas d\u00e9fini
+layersjson_source_label_not_defined=l'attribute 'sourceLabel' doit \u00eatre d\u00e9fini lorsque 'sourceLink' est d\u00e9fini
+layersjson_wmsName_not_defined=l'attribut 'wmsName' n'a pas \u00e9t\u00e9 d\u00e9fini
+legend_button=L\u00e9gende
+months=['janv.', 'f\u00e9vr.', 'mars', 'avr.', 'may', 'juin', 'juill.', 'ao\u00fbt', 'sept.', 'oct.', 'nov.', 'd\u00e9c.']
+name=Nom
+selected_layers=Transparence
+statistics=Statistiques
+statistics_button=Statistiques
+statistics_info=S'il vous pla\u00eet cliquer sur la carte pour commencer \u00e0 dessiner un polygone
+statistics_not_supported=Les statistiques ne sont pas support\u00e9s dans cette version
+submit=Envoyer
+subtitle=Soustitre
+zoom_to_area=Zoom sur la zone
+title=Exemple du Portail NFMS
+
+# BEGIN Feedback
+Feedback.all_parameters_mandatory=tous les param\u00e8tres son obligatoires:
+Feedback.error_sending_mail=Erreur en envoyant le mail:
+Feedback.the_message_has_been_validated=Le commentaire a \u00e9t\u00e9 valid\u00e9.
+Feedback.comment_not_found=Aucun commentaire avec ce code
+Feedback.mail-title=Commentaire au portal ONU-REDD
+Feedback.verify-mail-text=S'il vous pla\u00eet, allez visiter http://localhost:8080/unredd-portal/verify-comment?lang=$lang&verificationCode=$code pour confirmer l'envoi.
+Feedback.validated-mail-text=Le commentaire avec code de v\u00e9rification "$code", a \u00e9t\u00e9 valid\u00e9 et peut se consulter au portail
+Feedback.invalid-email-address=L\u2019adresse de mail sp\u00e9cifi\u00e9 n'est pas valide
+Feedback.no-geometries=Aucune g\u00e9om\u00e9trie sp\u00e9cifi\u00e9
+Feedback.verify_mail_sent=A message a \u00e9t\u00e9 envoy\u00e9 a l\u2019adresse sp\u00e9cifi\u00e9 pour confirmer le commentaire.
+Feedback.submit_error=Le commentaire n'a pas \u00e9t\u00e9 envoy\u00e9.
+Feedback.submit_error=Le commentaire n'a pas \u00e9t\u00e9 envoy\u00e9.
+Feedback.no_layer_visible=Aucune des couches configur\u00e9es pour la fonctionnalit\u00e9 de feedback est visible
+Feedback.no-layer-selected=Aucune couche est s\u00e9lectionn\u00e9e
+# END Feedback
diff --git a/integration-tests/test_config/plugin-conf.json b/integration-tests/test_config/plugin-conf.json
new file mode 100644
index 0000000..2b197f1
--- /dev/null
+++ b/integration-tests/test_config/plugin-conf.json
@@ -0,0 +1,15 @@
+{
+ "default-conf" : {
+ "banner" : {
+ "hide" : false,
+ "show-flag" : true,
+ "show-logos" : true
+ },
+ "info-dialog" : {
+ "open-in-center" : false
+ },
+ "error-management" : {
+ "div-id" : null
+ }
+ }
+}
\ No newline at end of file
diff --git a/integration-tests/test_config/portal.properties b/integration-tests/test_config/portal.properties
new file mode 100644
index 0000000..43ab138
--- /dev/null
+++ b/integration-tests/test_config/portal.properties
@@ -0,0 +1,18 @@
+languages = {"en": "English", "fr": "Fran\u00e7ais", "es": "Espa\u00f1ol"}
+languages.default = en
+client.modules=
+map.centerLonLat=-58,-34
+map.initialZoomLevel=5
+
+#Schema where all the system tables are stored
+db-schema=integration_tests
+
+#Feedback
+feedback-mail-host=smtp.gmail.com
+feedback-mail-port=587
+feedback-mail-username=onuredd@gmail.com
+feedback-mail-password=$password
+feedback-admin-mail-title=Nuevo comentario en el portal REDD
+feedback-admin-mail-text=Se ha introducido un comentario en el portal de REDD con c\u00f3digo de verificaci\u00f3n "$code"
+feedback-validation-check-delay=1000
+
diff --git a/integration-tests/test_config/static/img/favicon.png b/integration-tests/test_config/static/img/favicon.png
new file mode 100644
index 0000000..25606c1
Binary files /dev/null and b/integration-tests/test_config/static/img/favicon.png differ
diff --git a/integration-tests/test_config/static/img/flag.png b/integration-tests/test_config/static/img/flag.png
new file mode 100644
index 0000000..ef8435e
Binary files /dev/null and b/integration-tests/test_config/static/img/flag.png differ
diff --git a/integration-tests/test_config/static/img/logos.png b/integration-tests/test_config/static/img/logos.png
new file mode 100644
index 0000000..5e216b6
Binary files /dev/null and b/integration-tests/test_config/static/img/logos.png differ
diff --git a/integration-tests/test_config/static/img/printer.png b/integration-tests/test_config/static/img/printer.png
new file mode 100644
index 0000000..c6250ee
Binary files /dev/null and b/integration-tests/test_config/static/img/printer.png differ
diff --git a/integration-tests/test_config/static/img/right.jpg b/integration-tests/test_config/static/img/right.jpg
new file mode 100644
index 0000000..8b10a3b
Binary files /dev/null and b/integration-tests/test_config/static/img/right.jpg differ
diff --git a/integration-tests/test_config/static/img/ui-elements.png b/integration-tests/test_config/static/img/ui-elements.png
new file mode 100644
index 0000000..0708b34
Binary files /dev/null and b/integration-tests/test_config/static/img/ui-elements.png differ
diff --git a/integration-tests/test_config/static/loc/en/html/forest_classification_def.html b/integration-tests/test_config/static/loc/en/html/forest_classification_def.html
new file mode 100644
index 0000000..2191568
--- /dev/null
+++ b/integration-tests/test_config/static/loc/en/html/forest_classification_def.html
@@ -0,0 +1,8 @@
+
+
Forest Classification
+
Based on: Atlas of forest cover and change 2000-2010 in the Democratic Republic of the Congo, FACET – Initiative for remote sensing forest monitoring in Central Africa. Prepared by: Observatoire satellital des forêts d’Afrique centrale (OSFAC), South Dakota State University (SDSU), University of Maryland (UMD), © OSFAC, 2010.
+
Source: FACET
+
+
+
+
diff --git a/integration-tests/test_config/static/loc/en/html/provinces_def.html b/integration-tests/test_config/static/loc/en/html/provinces_def.html
new file mode 100644
index 0000000..b2c0017
--- /dev/null
+++ b/integration-tests/test_config/static/loc/en/html/provinces_def.html
@@ -0,0 +1,4 @@
+
diff --git a/integration-tests/test_config/static/loc/en/images/forest_classification.png b/integration-tests/test_config/static/loc/en/images/forest_classification.png
new file mode 100644
index 0000000..c6826c1
Binary files /dev/null and b/integration-tests/test_config/static/loc/en/images/forest_classification.png differ
diff --git a/integration-tests/test_config/static/loc/en/images/forest_mask.png b/integration-tests/test_config/static/loc/en/images/forest_mask.png
new file mode 100644
index 0000000..47da49c
Binary files /dev/null and b/integration-tests/test_config/static/loc/en/images/forest_mask.png differ
diff --git a/integration-tests/test_config/static/loc/es/html/forest_classification_def.html b/integration-tests/test_config/static/loc/es/html/forest_classification_def.html
new file mode 100644
index 0000000..1fed93d
--- /dev/null
+++ b/integration-tests/test_config/static/loc/es/html/forest_classification_def.html
@@ -0,0 +1,5 @@
+
+
FACET Forest Classification
+
Based on: Atlas of forest cover and change 2000-2010 in the Democratic Republic of the Congo, FACET – Initiative for remote sensing forest monitoring in Central Africa. Prepared by: Observatoire satellital des forêts d’Afrique centrale (OSFAC), South Dakota State University (SDSU), University of Maryland (UMD), © OSFAC, 2010.
+
Source: FACET
+
diff --git a/integration-tests/test_config/static/loc/es/html/provinces_def.html b/integration-tests/test_config/static/loc/es/html/provinces_def.html
new file mode 100644
index 0000000..b73e266
--- /dev/null
+++ b/integration-tests/test_config/static/loc/es/html/provinces_def.html
@@ -0,0 +1,4 @@
+
diff --git a/integration-tests/test_config/static/loc/es/images/forest_classification.png b/integration-tests/test_config/static/loc/es/images/forest_classification.png
new file mode 100644
index 0000000..c6826c1
Binary files /dev/null and b/integration-tests/test_config/static/loc/es/images/forest_classification.png differ
diff --git a/integration-tests/test_config/static/loc/es/images/forest_mask.png b/integration-tests/test_config/static/loc/es/images/forest_mask.png
new file mode 100644
index 0000000..47da49c
Binary files /dev/null and b/integration-tests/test_config/static/loc/es/images/forest_mask.png differ
diff --git a/integration-tests/test_config/static/loc/fr/html/forest_classification_def.html b/integration-tests/test_config/static/loc/fr/html/forest_classification_def.html
new file mode 100644
index 0000000..44007e7
--- /dev/null
+++ b/integration-tests/test_config/static/loc/fr/html/forest_classification_def.html
@@ -0,0 +1,8 @@
+
+
Classification des forêts FACET
+
Basé sur: Atlas sur l’Étendue et perte du couvert forestier en République démocratique du Congo de 2000 à 2010, Forêts d’Afrique centrale évaluées par télédétection (FACET). Préparé par l’ Observatoire satellital des forêts d’Afrique centrale (OSFAC), l’université d’État du Dakota du Sud (SDSU), l’Université du Maryland (UMD), © OSFAC, 2010.
+
Source: FACET
+
+
+
+
diff --git a/integration-tests/test_config/static/loc/fr/html/provinces_def.html b/integration-tests/test_config/static/loc/fr/html/provinces_def.html
new file mode 100644
index 0000000..b2c0017
--- /dev/null
+++ b/integration-tests/test_config/static/loc/fr/html/provinces_def.html
@@ -0,0 +1,4 @@
+
diff --git a/integration-tests/test_config/static/loc/fr/images/forest_classification.png b/integration-tests/test_config/static/loc/fr/images/forest_classification.png
new file mode 100644
index 0000000..c6826c1
Binary files /dev/null and b/integration-tests/test_config/static/loc/fr/images/forest_classification.png differ
diff --git a/integration-tests/test_config/static/loc/fr/images/forest_mask.png b/integration-tests/test_config/static/loc/fr/images/forest_mask.png
new file mode 100644
index 0000000..47da49c
Binary files /dev/null and b/integration-tests/test_config/static/loc/fr/images/forest_mask.png differ
diff --git a/integration-tests/test_config/static/overrides.css b/integration-tests/test_config/static/overrides.css
new file mode 100644
index 0000000..c1e5f5a
--- /dev/null
+++ b/integration-tests/test_config/static/overrides.css
@@ -0,0 +1 @@
+/* Override styles in this file */
\ No newline at end of file
diff --git a/jwebclient-analyzer-maven-plugin/pom.xml b/jwebclient-analyzer-maven-plugin/pom.xml
index 63af202..ffe57f0 100644
--- a/jwebclient-analyzer-maven-plugin/pom.xml
+++ b/jwebclient-analyzer-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
jwebclient-analyzer-maven-plugin
maven-plugin
@@ -30,7 +30,7 @@
org.fao.unredd
jwebclient-analyzer
- 4.0.0
+ 4.0.1
diff --git a/jwebclient-analyzer/pom.xml b/jwebclient-analyzer/pom.xml
index d207bd7..2f2a83a 100644
--- a/jwebclient-analyzer/pom.xml
+++ b/jwebclient-analyzer/pom.xml
@@ -6,7 +6,7 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
jwebclient-analyzer
jwebclient-analyzer
diff --git a/language-buttons/pom.xml b/language-buttons/pom.xml
index 5c9ba2e..38e314c 100644
--- a/language-buttons/pom.xml
+++ b/language-buttons/pom.xml
@@ -6,7 +6,7 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
language-buttons
language-buttons
@@ -24,7 +24,7 @@
org.fao.unredd
base
- 4.0.0
+ 4.0.1
diff --git a/layer-order/pom.xml b/layer-order/pom.xml
index 664c02c..d5afcc1 100644
--- a/layer-order/pom.xml
+++ b/layer-order/pom.xml
@@ -5,7 +5,7 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
layer-order
layer-order
diff --git a/layer-time-sliders/pom.xml b/layer-time-sliders/pom.xml
index 6af64a2..b0b72d7 100644
--- a/layer-time-sliders/pom.xml
+++ b/layer-time-sliders/pom.xml
@@ -6,7 +6,7 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
layer-time-sliders
layer-time-sliders
diff --git a/pom.xml b/pom.xml
index c3dd111..921c031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
pom
UNREDD NFMS portal
diff --git a/time-slider/pom.xml b/time-slider/pom.xml
index bd96d11..1a3fd9c 100644
--- a/time-slider/pom.xml
+++ b/time-slider/pom.xml
@@ -6,7 +6,7 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
time-slider
time-slider
@@ -24,7 +24,7 @@
org.fao.unredd
base
- 4.0.0
+ 4.0.1
diff --git a/tour/pom.xml b/tour/pom.xml
index e2dec83..28e946b 100644
--- a/tour/pom.xml
+++ b/tour/pom.xml
@@ -5,11 +5,11 @@
org.fao.unredd
portal-root
- 4.0.0
+ 4.0.1
org.fao.unredd
tour
- 4.0.0
+ 4.0.1
tour
http://maven.apache.org