Export: Beans from export-convert-module are now configurable from th…

…e export-web-module

Now you don't need to run a mvn install on the export-convert-module
when changing the properties in the app-convert.properties file

exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/app-convert.properties

@@ -25,7 +25,7 @@ maxTimeout = 6500
 #### Pool properties ####
 
 # number of phantomjs servers you can run in the pool.
-poolSize = 4
+poolSize = 5
 
 # The pool is implemented as a BlockingQueue. When asking for a phantom server connection and nothing is available, it waits for the number of milliseconds defined by maxWait
 maxWait = 500

exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/spring-convert.xml

@@ -17,7 +17,8 @@
 	<context:annotation-config/>
 	<context:component-scan base-package="com.highcharts.export.converter" />
 
-	<context:property-placeholder location="classpath*:app-convert.properties" />
+	<context:property-placeholder location="classpath*:app-convert.properties" order="0"/>
+	<context:property-placeholder ignore-unresolvable="true" ignore-resource-not-found="true" location="WEB-INF/spring/app-convert.properties" order="-1"/>
 
 	<bean id="tempDir" class="com.highcharts.export.util.TempDir"/>
 

exporting-server/java/highcharts-export/highcharts-export-web/src/main/webapp/WEB-INF/spring/app-convert.properties

@@ -0,0 +1,34 @@
+#### phantomjs properties ####
+
+# the host and port phantomjs listens to
+host = 127.0.0.1
+port = 7777
+
+# location of the phantomjs executable, could be for example /usr/local/bin/phantomjs
+exec = phantomjs
+
+# name of the convert script used by phantomjs
+script = highcharts-convert.js
+
+#### connect properties used to connect with phantomjs running as HTTP-server ####
+# all values in milliseconds
+
+# specifies the timeout when reading from phantomjs when a connection is established
+readTimeout = 6000
+
+# timeout to be used when opening a communications link to the phantomjs server
+connectTimeout = 500
+
+# the whole request to the phantomjs server is scheduled, max timeout can last to this value. This is because in java you can't rely on the above two timeouts.
+maxTimeout = 6500
+
+#### Pool properties ####
+
+# number of phantomjs servers you can run in the pool.
+poolSize = 5
+
+# The pool is implemented as a BlockingQueue. When asking for a phantom server connection and nothing is available, it waits for the number of milliseconds defined by maxWait
+maxWait = 500
+
+# Keep files in the temp folder for a certain retentionTime, defined in miliseconds
+retentionTime = 30000