Skip to content
Browse files

Configuration now uses also jndi environment parameters.

For example, in tomcat:

<Context path="/openLS"
docBase="......./openLS.war" reloadable="true" >       
        <Environment name="var_name" value="var_value"
type="java.lang.String" />      
</Context>
  • Loading branch information...
1 parent 169d87a commit f27e279b3f4c647cd57929e713e88fe775608431 @Delawen Delawen committed
View
2 client/src/test/resources/determineRouteRequest.xml
@@ -28,7 +28,7 @@
<EndPoint>
<Position>
<gml:Point>
- <gml:pos>3.6507 40.4331</gml:pos>
+ <gml:pos>-3.6507 40.4331</gml:pos>
</gml:Point>
</Position>
</EndPoint>
View
82 src/main/java/org/gofleet/configuration/Configuration.java
@@ -1,10 +1,31 @@
package org.gofleet.configuration;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.DatabaseConfiguration;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+@Repository
+/**
+ *
+ * This class retrieves all the configuration from all sources posibles.
+ *
+ * Right now, it looks upon (on this order, lowest configurations may override upper):
+ * <ul>
+ * <li>Database</li>
+ * <li>Server context (likecontext.xml on Tomcat)</li>
+ * </ul>
+ *
+ * @author marias
+ *
+ */
public class Configuration {
private static AbstractConfiguration configuration = null;
@@ -12,20 +33,57 @@
.getLog(Configuration.class);
@Autowired
- private static org.apache.commons.dbcp.BasicDataSource datasource;
+ private org.apache.commons.dbcp.BasicDataSource dataSource;
- private static AbstractConfiguration getConfiguration() {
- try {
- if (configuration == null)
- configuration = new DatabaseConfiguration(datasource,
+ private AbstractConfiguration getConfiguration() {
+ if (configuration == null) {
+
+ try {
+ configuration = new DatabaseConfiguration(dataSource,
"configuration", "key", "value");
- } catch (Throwable t) {
- log.error("Error loading configuration: " + t);
+ } catch (Throwable t) {
+ log.error("Error loading database configuration", t);
+ }
+
+ try {
+ InitialContext icontext = new InitialContext();
+ Context context = (Context) icontext.lookup("java:comp/env");
+ NamingEnumeration<NameClassPair> propiedadesJDNI = context
+ .list("");
+ while (propiedadesJDNI.hasMoreElements()) {
+ NameClassPair propiety = propiedadesJDNI.nextElement();
+ configuration.addProperty(propiety.getName(),
+ context.lookup(propiety.getName()));
+ log.trace("Configuring '" + propiety.getName() + "' as '"
+ + context.lookup(propiety.getName().toString())
+ + "'");
+ }
+
+ } catch (NamingException e) {
+ log.error("Error loading configuration from context: " + e, e);
+ }
+
}
+
return configuration;
}
- static public String get(String key, String value) {
+ /**
+ * @return the datasource
+ */
+ public org.apache.commons.dbcp.BasicDataSource getDataSource() {
+ return dataSource;
+ }
+
+ /**
+ * @param datasource
+ * the datasource to set
+ */
+ public void setDataSource(org.apache.commons.dbcp.BasicDataSource dataSource) {
+ this.dataSource = dataSource;
+ }
+
+ public String get(String key, String value) {
try {
return getConfiguration().getString(key, value);
} catch (Throwable t) {
@@ -33,15 +91,15 @@ static public String get(String key, String value) {
}
}
- static public Boolean get(String key, Boolean value) {
+ public Boolean get(String key, Boolean value) {
try {
return getConfiguration().getBoolean(key, value);
} catch (Throwable t) {
return value;
}
}
-
- static public Double get(String key, Double value) {
+
+ public Double get(String key, Double value) {
try {
return getConfiguration().getDouble(key, value);
} catch (Throwable t) {
@@ -49,7 +107,7 @@ static public Double get(String key, Double value) {
}
}
- static public Integer get(String key, Integer value) {
+ public Integer get(String key, Integer value) {
try {
return getConfiguration().getInteger(key, value);
} catch (Throwable t) {
View
87 src/main/java/org/gofleet/openLS/OpenLS.java
@@ -32,44 +32,43 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.geotools.referencing.CRS;
-import org.gofleet.configuration.Configuration;
import org.gofleet.openLS.ddbb.GeoCoding;
import org.gofleet.openLS.ddbb.Routing;
import org.gofleet.openLS.util.MoNaVConnector;
import org.gofleet.openLS.util.OSRMConnector;
import org.gofleet.openLS.util.Utils;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
import org.xml.sax.SAXException;
/**
* Copyright (C) 2011, Emergya (http://www.emergya.es)
- *
+ *
* @author <a href="mailto:marias@emergya.es">María Arias</a>
- *
- * This file is part of GoFleet
- *
- * This software is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
+ *
+ * This file is part of GoFleet
+ *
+ * This software is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ * As a special exception, if you link this library with other files to
+ * produce an executable, this library does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * This exception does not however invalidate any other reasons why the
+ * executable file might be covered by the GNU General Public License.
*/
@Controller(value = "openLSService")
@Scope("session")
@@ -83,6 +82,24 @@
@Resource
private GeoCoding geoCodingController;
+ @Autowired
+ private org.gofleet.configuration.Configuration configuration;
+
+ /**
+ * @return the configuration
+ */
+ public org.gofleet.configuration.Configuration getConfiguration() {
+ return configuration;
+ }
+
+ /**
+ * @param configuration the configuration to set
+ */
+ public void setConfiguration(
+ org.gofleet.configuration.Configuration configuration) {
+ this.configuration = configuration;
+ }
+
private MoNaVConnector monavConnector = new MoNaVConnector();
private OSRMConnector osrmConnector = new OSRMConnector();
@@ -168,7 +185,8 @@ else if (request instanceof DirectoryRequestType)
/**
* Calls the routing method
- * @param epsg
+ *
+ * @param epsg
*
* @param parameter
* @return
@@ -179,14 +197,21 @@ else if (request instanceof DirectoryRequestType)
List<AbstractResponseParametersType> list = new LinkedList<AbstractResponseParametersType>();
AbstractResponseParametersType arpt = null;
try {
- String conn = Configuration.get("RoutingConnector", "default");
+ String conn = configuration.get("RoutingConnector", "default");
if (conn.equals("PGROUTING"))
arpt = routingController.routePlan(param);
else if (conn.equals("MONAV"))
arpt = monavConnector.routePlan(param);
- else
- arpt = osrmConnector.routePlan(param);
-
+ else {
+
+ String host_port = configuration.get("OSRM_HOST",
+ "localhost:5000");
+ String http = "http";
+ if (configuration.get("OSRM_SSL", "off").equals("on"))
+ http = "https";
+ arpt = osrmConnector.routePlan(param, host_port, http);
+ }
+
} catch (Throwable t) {
LOG.error("Error on routePlan", t);
}
View
26 src/main/java/org/gofleet/openLS/ddbb/dao/RoutingDAO.java
@@ -57,7 +57,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.gofleet.configuration.Configuration;
import org.gofleet.openLS.ddbb.GeoCoding;
import org.gofleet.openLS.ddbb.bean.HBA;
import org.gofleet.openLS.util.GeoUtil;
@@ -83,13 +82,22 @@
@Repository
public class RoutingDAO {
- private static final String GID_ROUTING = Configuration.get("ROUTING_ID",
- "gid");
- private static final String TABLE_ROUTING = Configuration.get(
- "ROUTING_TABLE", "routing");
+ @Autowired
+ private org.gofleet.configuration.Configuration configuration;
+ /**
+ * @return the configuration
+ */
+ public org.gofleet.configuration.Configuration getConfiguration() {
+ return configuration;
+ }
- private static final String EPSG_4326 = Configuration.get("ROUTING_EPSG",
- "EPSG:4326");
+ /**
+ * @param configuration the configuration to set
+ */
+ public void setConfiguration(
+ org.gofleet.configuration.Configuration configuration) {
+ this.configuration = configuration;
+ }
public GeometryFactory gf = new GeometryFactory();
@@ -143,10 +151,10 @@ public DetermineRouteResponseType doInHibernate(Session session)
}
stops.add(GeoUtil.getPoint(wayPointList.getEndPoint(), null));
- consulta.setString("tablename", TABLE_ROUTING);
+ consulta.setString("tablename", configuration.get("ROUTING_TABLE", "routing"));
consulta.setParameterList("stoptable", stops,
GeometryUserType.TYPE);
- consulta.setString("gid", GID_ROUTING);
+ consulta.setString("gid", configuration.get("ROUTING_ID", "gid"));
consulta.setParameter("start",
GeoUtil.getPoint(wayPointList.getStartPoint(), null),
GeometryUserType.TYPE);
View
10 src/main/java/org/gofleet/openLS/util/OSRMConnector.java
@@ -109,6 +109,8 @@ public OSRMConnector() {
* Route plan using osrm server.
*
* @param param
+ * @param host_port
+ * @param http
* @return
* @throws IOException
* @throws ParseException
@@ -116,7 +118,7 @@ public OSRMConnector() {
* @throws InterruptedException
*/
public AbstractResponseParametersType routePlan(
- DetermineRouteRequestType param) throws IOException, JAXBException,
+ DetermineRouteRequestType param, String host_port, String http) throws IOException, JAXBException,
ParseException, InterruptedException {
DetermineRouteResponseType res = new DetermineRouteResponseType();
@@ -153,12 +155,6 @@ public AbstractResponseParametersType routePlan(
WayPointListType wayPointList = param.getRoutePlan()
.getWayPointList();
- String host_port = Configuration.get("OSRM_HOST",
- "gofre.emergya.es:5000");
- String http = "http";
- if (Configuration.get("OSRM_SSL", "off").equals("on"))
- http = "https";
-
String url = http + "://" + host_port + "/viaroute";
CoordinateReferenceSystem sourceCRS = CRS.decode(EPSG_4326);
View
697 src/main/jmeter/GoFleetLS.jmx
@@ -9,7 +9,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="ip_address" elementType="Argument">
<stringProp name="Argument.name">ip_address</stringProp>
- <stringProp name="Argument.value">gofre</stringProp>
+ <stringProp name="Argument.value">localhost</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
@@ -17,13 +17,13 @@
<stringProp name="TestPlan.user_define_classpath"></stringProp>
</TestPlan>
<hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Grupo de Hilos" enabled="false">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Grupo de Hilos" enabled="true">
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Controlador Loop" enabled="true">
<boolProp name="LoopController.continue_forever">false</boolProp>
- <stringProp name="LoopController.loops">10</stringProp>
+ <stringProp name="LoopController.loops">1</stringProp>
</elementProp>
- <stringProp name="ThreadGroup.num_threads">1</stringProp>
- <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <stringProp name="ThreadGroup.num_threads">700</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">0</stringProp>
<longProp name="ThreadGroup.start_time">1317828719000</longProp>
<longProp name="ThreadGroup.end_time">1317828719000</longProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
@@ -32,367 +32,6 @@
<stringProp name="ThreadGroup.delay"></stringProp>
</ThreadGroup>
<hashTree>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Test" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/openLS/services/OpenLS/test</stringProp>
- <stringProp name="HTTPSamper.xml_data"></stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Geocoding-XML" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/openLS/services/OpenLS/openLS</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot;&gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;GeocodeRequest&quot;&gt;&lt;ns1:GeocodeRequest&gt;
- &lt;ns1:Address&gt;
- &lt;ns1:Place type=&quot;Municipality&quot;&gt;Sevilla&lt;/ns1:Place&gt;
- &lt;StreetAddress&gt;
- &lt;Street&gt;Sierpes&lt;/Street&gt;
- &lt;/StreetAddress&gt;
- &lt;/ns1:Address&gt;
- &lt;/ns1:GeocodeRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="ReverseGeocoding-XML" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/openLS/services/OpenLS/openLS</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot;&gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RevGcReq&quot;&gt;
- &lt;ns1:ReverseGeocodeRequest&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.93142 37.40709&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;ns1:ReverseGeocodePreference&gt;StreetAddress&lt;/ns1:ReverseGeocodePreference&gt;
- &lt;/ns1:ReverseGeocodeRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Routing-XML" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/openLS/services/OpenLS/openLS</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot; &gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RouteRequest&quot;&gt;
- &lt;ns1:DetermineRouteRequest&gt;
- &lt;ns1:RoutePlan&gt;
- &lt;ns1:RoutePreference&gt;Fastest&lt;/ns1:RoutePreference&gt;
- &lt;ns1:WayPointList&gt;
- &lt;ns1:StartPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.93142 37.40709&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:StartPoint&gt;
- &lt;ns1:ViaPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.89972 37.42268&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:ViaPoint&gt;
- &lt;ns1:EndPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.97659 37.39100&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:EndPoint&gt;
- &lt;/ns1:WayPointList&gt;
- &lt;/ns1:RoutePlan&gt;
- &lt;/ns1:DetermineRouteRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree/>
- <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generar Resumen de Resultados" enabled="true"/>
- <hashTree/>
- <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Gráfico" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="DistributionGraphVisualizer" testclass="ResultCollector" testname="Gráfico de Distribución (alfa)" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Gráfico de Resultados" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Informe Agregado" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Reporte resumen" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="GraphAccumVisualizer" testclass="ResultCollector" testname="Resultados de Gráfico Completo" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="SplineVisualizer" testclass="ResultCollector" testname="Visualizador Spline" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="Ver Árbol de Resultados" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Gestor de Cabecera HTTP" enabled="true">
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
@@ -402,249 +41,12 @@
</collectionProp>
</HeaderManager>
<hashTree/>
- </hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Routing aislado" enabled="true">
- <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Controlador Loop" enabled="true">
- <boolProp name="LoopController.continue_forever">false</boolProp>
- <stringProp name="LoopController.loops">1</stringProp>
- </elementProp>
- <stringProp name="ThreadGroup.num_threads">2</stringProp>
- <stringProp name="ThreadGroup.ramp_time">5</stringProp>
- <longProp name="ThreadGroup.start_time">1317828719000</longProp>
- <longProp name="ThreadGroup.end_time">1317828719000</longProp>
- <boolProp name="ThreadGroup.scheduler">false</boolProp>
- <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
- <stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.delay"></stringProp>
- </ThreadGroup>
- <hashTree>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Routing Clásico" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/gofleetLS/</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot; &gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RouteRequest&quot;&gt;
- &lt;ns1:DetermineRouteRequest&gt;
- &lt;ns1:RoutePlan&gt;
- &lt;ns1:RoutePreference&gt;Fastest&lt;/ns1:RoutePreference&gt;
- &lt;ns1:WayPointList&gt;
- &lt;ns1:StartPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.93142 37.40709&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:StartPoint&gt;
- &lt;ns1:ViaPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.89972 37.42268&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:ViaPoint&gt;
- &lt;ns1:EndPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.97659 37.39100&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:EndPoint&gt;
- &lt;/ns1:WayPointList&gt;
- &lt;/ns1:RoutePlan&gt;
- &lt;/ns1:DetermineRouteRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Routing2" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/gofleetLS/</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot; &gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RouteRequest&quot;&gt;
- &lt;ns1:DetermineRouteRequest&gt;
- &lt;ns1:RoutePlan&gt;
- &lt;ns1:RoutePreference&gt;Fastest&lt;/ns1:RoutePreference&gt;
- &lt;ns1:WayPointList&gt;
- &lt;ns1:StartPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.93142 37.40709&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:StartPoint&gt;
- &lt;ns1:EndPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.97659 37.39100&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:EndPoint&gt;
- &lt;/ns1:WayPointList&gt;
- &lt;/ns1:RoutePlan&gt;
- &lt;/ns1:DetermineRouteRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Routing3" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/gofleetLS/</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot; &gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RouteRequest&quot;&gt;
- &lt;ns1:DetermineRouteRequest&gt;
- &lt;ns1:RoutePlan&gt;
- &lt;ns1:RoutePreference&gt;Fastest&lt;/ns1:RoutePreference&gt;
- &lt;ns1:WayPointList&gt;
- &lt;ns1:StartPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.932346142 37.23456239&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:StartPoint&gt;
- &lt;ns1:EndPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.8234569 37.236235400&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:EndPoint&gt;
- &lt;/ns1:WayPointList&gt;
- &lt;/ns1:RoutePlan&gt;
- &lt;/ns1:DetermineRouteRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree>
- <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Gestor de Cabecera HTTP" enabled="true">
- <collectionProp name="HeaderManager.headers">
- <elementProp name="" elementType="Header">
- <stringProp name="Header.name">Content-Type</stringProp>
- <stringProp name="Header.value">application/xml</stringProp>
- </elementProp>
- </collectionProp>
- </HeaderManager>
- <hashTree/>
- </hashTree>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Routing4" enabled="true">
- <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
- <collectionProp name="Arguments.arguments"/>
- </elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/gofleetLS/</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot; &gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RouteRequest&quot;&gt;
- &lt;ns1:DetermineRouteRequest&gt;
- &lt;ns1:RoutePlan&gt;
- &lt;ns1:RoutePreference&gt;Fastest&lt;/ns1:RoutePreference&gt;
- &lt;ns1:WayPointList&gt;
- &lt;ns1:StartPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.92364538742 37.23847569&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:StartPoint&gt;
- &lt;ns1:EndPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.91823645278346 37.48756283475&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:EndPoint&gt;
- &lt;/ns1:WayPointList&gt;
- &lt;/ns1:RoutePlan&gt;
- &lt;/ns1:DetermineRouteRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
- <stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
- <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
- <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
- <hashTree>
- <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Gestor de Cabecera HTTP" enabled="true">
- <collectionProp name="HeaderManager.headers">
- <elementProp name="" elementType="Header">
- <stringProp name="Header.name">Content-Type</stringProp>
- <stringProp name="Header.value">application/xml</stringProp>
- </elementProp>
- </collectionProp>
- </HeaderManager>
- <hashTree/>
- </hashTree>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="5 Puntos" enabled="true">
+ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="Routing-XML" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
- <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/gofleetLS/</stringProp>
- <stringProp name="HTTPSamper.xml_data">&lt;ns1:XLS xmlns:ns1=&quot;http://www.opengis.net/xls&quot; xmlns:gml=&quot;http://www.opengis.net/gml&quot; &gt;
- &lt;ns1:RequestHeader /&gt;
- &lt;ns1:Request methodName=&quot;RouteRequest&quot;&gt;
- &lt;ns1:DetermineRouteRequest&gt;
- &lt;ns1:RoutePlan&gt;
- &lt;ns1:RoutePreference&gt;Fastest&lt;/ns1:RoutePreference&gt;
- &lt;ns1:WayPointList&gt;
- &lt;ns1:StartPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.92364538742 37.23847569&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:StartPoint&gt;
- &lt;ns1:ViaPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.3945687 37.42268&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:ViaPoint&gt;
- &lt;ns1:ViaPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.89972 37.876233458&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:ViaPoint&gt;
- &lt;ns1:ViaPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.838456237842 37.42348568768&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:ViaPoint&gt;
- &lt;ns1:EndPoint&gt;
- &lt;ns1:Position&gt;
- &lt;gml:Point&gt;
- &lt;gml:pos&gt;-5.91823645278346 37.48756283475&lt;/gml:pos&gt;
- &lt;/gml:Point&gt;
- &lt;/ns1:Position&gt;
- &lt;/ns1:EndPoint&gt;
- &lt;/ns1:WayPointList&gt;
- &lt;/ns1:RoutePlan&gt;
- &lt;/ns1:DetermineRouteRequest&gt;
- &lt;/ns1:Request&gt;
-&lt;/ns1:XLS&gt;</stringProp>
+ <stringProp name="SoapSampler.URL_DATA">http://${ip_address}:8080/openLS/</stringProp>
+ <stringProp name="HTTPSamper.xml_data">&lt;xls:XLS xmlns:xls=&quot;http://www.opengis.net/xls&quot; xsi:schemaLocation=&quot;http://www.opengis.net/xls http://schemas.opengis.net/ols/1.2.0/ADT.xsd http://schemas.opengis.net/ols/1.2.0/LocationUtilityService.xsd http://schemas.opengis.net/ols/1.2.0/RouteService.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;&lt;xls:RequestHeader/&gt;&lt;xls:Request methodName=&quot;RouteRequest&quot;&gt;&lt;xls:DetermineRouteRequest&gt;&lt;xls:RoutePlan&gt;&lt;xls:RoutePreference&gt;Fastest&lt;/xls:RoutePreference&gt;&lt;xls:WayPointList&gt;&lt;xls:StartPoint stop=&quot;false&quot;&gt;&lt;xls:Position&gt;&lt;gml:Point xmlns:gml=&quot;http://www.opengis.net/gml&quot;&gt;&lt;gml:pos&gt;-3.6993450768925 40.424319981934&lt;/gml:pos&gt;&lt;/gml:Point&gt;&lt;/xls:Position&gt;&lt;/xls:StartPoint&gt;&lt;xls:EndPoint stop=&quot;false&quot;&gt;&lt;xls:Position&gt;&lt;gml:Point xmlns:gml=&quot;http://www.opengis.net/gml&quot;&gt;&lt;gml:pos&gt;-3.7144512780644 40.407068079094&lt;/gml:pos&gt;&lt;/gml:Point&gt;&lt;/xls:Position&gt;&lt;/xls:EndPoint&gt;&lt;/xls:WayPointList&gt;&lt;/xls:RoutePlan&gt;&lt;xls:RouteInstructionsRequest/&gt;&lt;xls:RouteGeometryRequest/&gt;&lt;xls:RouteMapRequest/&gt;&lt;/xls:DetermineRouteRequest&gt;&lt;/xls:Request&gt;&lt;/xls:XLS&gt;</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
<stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
@@ -681,80 +83,9 @@
</value>
</objProp>
<stringProp name="filename"></stringProp>
+ <boolProp name="ResultCollector.success_only_logging">true</boolProp>
</ResultCollector>
<hashTree/>
- <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="Ver Árbol de Resultados" enabled="true">
- <boolProp name="ResultCollector.error_logging">false</boolProp>
- <objProp>
- <name>saveConfig</name>
- <value class="SampleSaveConfiguration">
- <time>true</time>
- <latency>true</latency>
- <timestamp>true</timestamp>
- <success>true</success>
- <label>true</label>
- <code>true</code>
- <message>true</message>
- <threadName>true</threadName>
- <dataType>true</dataType>
- <encoding>false</encoding>
- <assertions>true</assertions>
- <subresults>true</subresults>
- <responseData>false</responseData>
- <samplerData>false</samplerData>
- <xml>true</xml>
- <fieldNames>false</fieldNames>
- <responseHeaders>false</responseHeaders>
- <requestHeaders>false</requestHeaders>
- <responseDataOnError>false</responseDataOnError>
- <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
- <assertionsResultsToSave>0</assertionsResultsToSave>
- <bytes>true</bytes>
- </value>
- </objProp>
- <stringProp name="filename"></stringProp>
- </ResultCollector>
- <hashTree/>
- <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Guardar respuestas en archivo" enabled="true">
- <stringProp name="FileSaver.filename">gofleet</stringProp>
- <boolProp name="FileSaver.errorsonly">false</boolProp>
- <boolProp name="FileSaver.skipautonumber">false</boolProp>
- <boolProp name="FileSaver.skipsuffix">false</boolProp>
- <boolProp name="FileSaver.successonly">true</boolProp>
- </ResultSaver>
- <hashTree/>
<ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Gráfico de Resultados" enabled="true">
<boolProp name="ResultCollector.error_logging">false</boolProp>
<objProp>
@@ -785,18 +116,8 @@
</value>
</objProp>
<stringProp name="filename"></stringProp>
- <boolProp name="ResultCollector.success_only_logging">true</boolProp>
</ResultCollector>
<hashTree/>
- <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Gestor de Cabecera HTTP" enabled="true">
- <collectionProp name="HeaderManager.headers">
- <elementProp name="" elementType="Header">
- <stringProp name="Header.name">Content-Type</stringProp>
- <stringProp name="Header.value">application/xml</stringProp>
- </elementProp>
- </collectionProp>
- </HeaderManager>
- <hashTree/>
</hashTree>
</hashTree>
</hashTree>
View
13 src/main/resources/applicationContext.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
@@ -81,12 +80,20 @@
<!-- Application Beans -->
<bean id="routingDAO" class="org.gofleet.openLS.ddbb.dao.RoutingDAO">
<property name="sessionFactory" ref="sessionFactory" />
+ <property name="configuration" ref="configuration" />
</bean>
<bean id="geoCodingDAO" class="org.gofleet.openLS.ddbb.dao.GeoCodingDAO">
<property name="sessionFactory" ref="sessionFactory" />
</bean>
<bean id="routing" class="org.gofleet.openLS.ddbb.Routing" />
<bean id="geocoding" class="org.gofleet.openLS.ddbb.GeoCoding" />
- <bean id="openLSService" class="org.gofleet.openLS.OpenLS" />
+ <bean id="configuration" class="org.gofleet.configuration.Configuration">
+ <property name="dataSource">
+ <ref bean="dataSource" />
+ </property>
+ </bean>
+ <bean id="openLSService" class="org.gofleet.openLS.OpenLS">
+ <property name="configuration" ref="configuration" />
+ </bean>
</beans>

0 comments on commit f27e279

Please sign in to comment.
Something went wrong with that request. Please try again.