Merge branch 'release-4.0.2'

.gitignore

@@ -1,3 +1,4 @@
+phantomjsdriver.log
 tmp/
 target/
 .project
@@ -14,4 +15,4 @@ commons/src/main/jaxb/
 *.iml
 velocity.log
 sample-areas.tiff
-.externalToolBuilders/
+.externalToolBuilders/

Dockerfile

@@ -0,0 +1,3 @@
+FROM tomcat:7.0
+ADD demo/target/unredd-portal.war /usr/local/tomcat/webapps/portal.war
+

argentina/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.fao.unredd</groupId>
 		<artifactId>portal-root</artifactId>
-		<version>4.0.1</version>
+		<version>4.0.2</version>
 	</parent>
 	<packaging>war</packaging>
 	<artifactId>argentina</artifactId>
@@ -22,32 +22,32 @@
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>core</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>base</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>feedback</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>layer-time-sliders</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>time-slider</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>tour</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>ec.gob.dnf.portal</groupId>
@@ -163,7 +163,7 @@
 					<plugin>
 						<groupId>org.fao.unredd</groupId>
 						<artifactId>jwebclient-analyzer-maven-plugin</artifactId>
-						<version>4.0.1</version>
+						<version>4.0.2</version>
 						<executions>
 							<execution>
 								<id>generate-buildconfig</id>

argentina/src/main/webapp/WEB-INF/default_config/layers.json

@@ -65,7 +65,7 @@
             "wmsName": "bosques_umsef_db:regfor2014_3857", 
             "legend": "regfor.png",
             "queryType" : "wfs",
-            "queryUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wfs",
+            "queryUrl" : "http://geo2.ambiente.gob.ar/geo-server/wfs",
    			"queryGeomFieldName" : "geom",
  			"queryFieldNames" : [ "stats_code", "regiones" ],
 			"queryFieldAliases" : [ "stats_code", "Regiones" ]
@@ -160,7 +160,7 @@
             "legend": "leyenda_niv1.png"
         }, 
         {
-            "baseUrl": "http://geo2.ambiente.gob.ar/portal/gs/bosques_umsef_db/wms", 
+            "baseUrl": "http://geo2.ambiente.gob.ar/geo-server/bosques_umsef_db/wms", 
             "id": "map-stbptf9806_3857", 
             "visible": true, 
             "wmsName": "bosques_umsef_db:stbptf9806_3857_t", 
@@ -176,7 +176,7 @@
             "wmsName": "bosques_umsef_db:limites_provinciales", 
             "legend": "lim_prov.png",
             "queryType" : "wfs",
-            "queryUrl" : "http://geo2.ambiente.gob.ar/portal/gs/wfs",
+            "queryUrl" : "http://geo2.ambiente.gob.ar/geo-server/wfs",
    			"queryGeomFieldName" : "geom",
  			"queryFieldNames" : [ "nprov", "cod_indec" ],
 			"queryFieldAliases" : [ "Nombre", "Codigo" ]
@@ -502,5 +502,5 @@
             "label": "Informaci\u00f3n Auxiliar"
         }
     ], 
-    "default-server": "http://geo2.ambiente.gob.ar/portal/gs"
+    "default-server": "http://geo2.ambiente.gob.ar/geo-server"
 }

base/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.fao.unredd</groupId>
 		<artifactId>portal-root</artifactId>
-		<version>4.0.1</version>
+		<version>4.0.2</version>
 	</parent>
 	<artifactId>base</artifactId>
 	<name>UNREDD NFMS base plugins</name>
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.fao.unredd</groupId>
 			<artifactId>core</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<!-- J2EE -->
 		<dependency>
@@ -46,4 +46,106 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.github.klieber</groupId>
+				<artifactId>phantomjs-maven-plugin</artifactId>
+				<version>0.7</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>install</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<version>1.9.7</version>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.github.searls</groupId>
+				<artifactId>jasmine-maven-plugin</artifactId>
+				<version>2.1</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test</goal>
+						</goals>
+					</execution>
+				</executions>
+				<!-- keep the configuration out of the execution so that the bdd goal 
+					has access to it -->
+				<configuration>
+					<jsSrcDir>src/main/resources/nfms/modules</jsSrcDir>
+					<jsTestSrcDir>src/test/resources/nfms/modules/</jsTestSrcDir>
+					<webDriverClassName>org.openqa.selenium.phantomjs.PhantomJSDriver</webDriverClassName>
+					<webDriverCapabilities>
+						<capability>
+							<name>phantomjs.binary.path</name>
+							<value>${phantomjs.binary}</value>
+						</capability>
+					</webDriverCapabilities>
+					<haltOnFailure>true</haltOnFailure>
+					<additionalContexts>
+						<context>
+							<contextRoot>/messagebus</contextRoot>
+							<directory>${project.basedir}/../core/src/main/resources/nfms/modules</directory>
+						</context>
+						<context>
+							<contextRoot>/jslib</contextRoot>
+							<directory>${project.basedir}/../core/src/main/resources/nfms/jslib</directory>
+						</context>
+						<context>
+							<contextRoot>/test-jslib</contextRoot>
+							<directory>${project.basedir}/src/test/resources/nfms/jslib</directory>
+						</context>
+					</additionalContexts>
+					<preloadSources>
+						<source>/jslib/jquery-2.1.0.js</source>
+						<source>/jslib/require.js</source>
+					</preloadSources>
+					<!-- <keepServerAlive>false</keepServerAlive> -->
+					<customRunnerTemplate>src/test/resources/SpecRunner.html</customRunnerTemplate>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											com.github.klieber
+										</groupId>
+										<artifactId>
+											phantomjs-maven-plugin
+										</artifactId>
+										<versionRange>
+											[0.7,)
+										</versionRange>
+										<goals>
+											<goal>install</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>

base/src/main/java/org/fao/unredd/layers/Output.java

@@ -156,7 +156,7 @@ public void process(Connection connection) throws SQLException {
 				for (String variableName : fieldSeries.keySet()) {
 					sql += ", \"" + variableName + "\" ";
 				}
-				sql += "FROM " + table_name_data + " WHERE \""
+				sql += " FROM " + table_name_data + " WHERE \""
 						+ data_table_id_field
 						+ "\"::varchar in (?, trim(leading '0' from ?)) "
 						+ "ORDER BY " + dateExpression;

base/src/main/resources/nfms/base-conf.json

@@ -22,7 +22,8 @@
 			"highcharts-theme-sand" : "../jslib/sand-signika",
 			"openlayers" : "../jslib/OpenLayers/OpenLayers.debug",
 			"mustache" : "../jslib/jquery.mustache",
-			"moment" : "../jslib/moment"
+			"moment" : "../jslib/moment",
+			"text" : "../jslib/text"
 		},
 		"shim" : {
 			"fancy-box" : [ "jquery" ],