Commit 7d7b26fa authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade nuevas propiedades 

Se pasan constantes del servicio a properties y se añaden nuevas
para controlar la descarga y procesamiento de los datos
parent 180a8e05

src/main/resources/application-dev.properties

+7 −1
Original line number Diff line number Diff line
@@ -3,3 +3,9 @@ spring.kafka.bootstrap-servers=localhost:19092 
spring.kafka.properties.schema.registry.url=http://localhost:18081



config.fixedDelay=60000

app.scheduling.enable=false



aishub.service.url=none



#Local private

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/home/REDMIC/MEDIA_STORAGE
 
 No newline at end of file

src/main/resources/application-pre.properties

+7 −1
Original line number Diff line number Diff line
@@ -3,3 +3,9 @@ spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092 
spring.kafka.properties.schema.registry.url=http://schema-registry:8081



config.fixedDelay=60000

app.scheduling.enable=false



aishub.service.url=none



#Local private

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/data/MEDIA_STORAGE
 
 No newline at end of file

src/main/resources/application-prod.properties

+8 −1
Original line number Diff line number Diff line
@@ -3,3 +3,10 @@ spring.kafka.bootstrap-servers=localhost:9092 
spring.kafka.properties.schema.registry.url=http://localhost:18081



config.fixedDelay=60000

app.scheduling.enable=true



aishub.service.username=aishub.service.username

aishub.service.url=http://data.aishub.net/ws.php?username=${aishub.service.username}&format=1&output=csv&compress=1



#Local private

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/data/REDMIC/MEDIA_STORAGE
 
 No newline at end of file

src/main/resources/application-test.properties

+7 −1
Original line number Diff line number Diff line
@@ -3,3 +3,9 @@ spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers} 
spring.kafka.properties.schema.registry.url=http://redmic.net:18081



config.fixedDelay=100

app.scheduling.enable=false



aishub.service.url=none



#Local private

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/home/REDMIC/MEDIA_STORAGE
 
 No newline at end of file

src/main/resources/application.properties

+11 −3
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ logging.level.org.springframework=info 
logging.level.es.redmic=info

logging.level.es.redmic.brokerlib=error



aishub.service.username=aishub.service.username

aishub.service.url=http://data.aishub.net/ws.php?username=${aishub.service.username}&format=1&output=csv&compress=1

spring.mvc.locale-resolver=fixed

spring.mvc.locale=es_ES



aishub.service.url=${aishub.service.url}



file.delimiter.csv=,



spring.kafka.bootstrap-servers=${spring.kafka.bootstrap-servers}

spring.kafka.consumer.auto-offset-reset=earliest

spring.kafka.client-id=@project.name@

spring.kafka.consumer.group-id=@project.name@

spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer

spring.kafka.producer.value-serializer=io.confluent.kafka.serializers.KafkaAvroSerializer
@@ -39,8 +41,14 @@ spring.kafka.properties.schema.registry.url=${spring.kafka.properties.schema.reg 
broker.topic.realtime.tracking.vessels=realtime.tracking.vessels



config.fixedDelay=${config.fixedDelay}

app.scheduling.enable=${app.scheduling.enable}



spring.jackson.serialization.write-dates-as-timestamps=false



#Local private tmp directory

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=${property.path.media_storage.LOCAL_PRIVATE_BASE_PATH}

property.path.media_storage.TEMP_BASE_PATH=${property.path.media_storage.LOCAL_PRIVATE_BASE_PATH}/temp

property.path.media_storage.AIS_TEMP=${property.path.media_storage.TEMP_BASE_PATH}/ais



#Exclude from autoconfigure

spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.websocket.WebSocketAutoConfiguration,org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration, org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration, org.springframework.boot.autoconfigure.aop.AopAutoConfiguration, org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration, org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration, org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration, org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration, org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration, org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration, org.springframework.boot.autoconfigure.data.cassandra.CassandraRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.couchbase.CouchbaseDataAutoConfiguration, org.springframework.boot.autoconfigure.data.couchbase.CouchbaseRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration, org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration, org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.ldap.LdapDataAutoConfiguration, org.springframework.boot.autoconfigure.data.ldap.LdapRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration, org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration, org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration, org.springframework.boot.autoconfigure.data.solr.SolrRepositoriesAutoConfiguration, org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration, org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration, org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration, org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration, org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration, org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration, org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration, org.springframework.boot.autoconfigure.hazelcast.HazelcastJpaDependencyAutoConfiguration, org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration, org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration, org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration, org.springframework.boot.autoconfigure.jdbc.XADataSourceAutoConfiguration, org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration, org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration, org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration, org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration, org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration, org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration,org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration, org.springframework.boot.autoconfigure.ldap.embedded.EmbeddedLdapAutoConfiguration, org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration, org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration, org.springframework.boot.autoconfigure.mail.MailSenderValidatorAutoConfiguration, org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration, org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration, org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration, org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration, org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration, org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration, org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration, org.springframework.boot.autoconfigure.sendgrid.SendGridAutoConfiguration, org.springframework.boot.autoconfigure.session.SessionAutoConfiguration, org.springframework.boot.autoconfigure.social.FacebookAutoConfiguration, org.springframework.boot.autoconfigure.social.LinkedInAutoConfiguration, org.springframework.boot.autoconfigure.social.SocialWebAutoConfiguration, org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration, org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration, org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration, org.springframework.boot.autoconfigure.webservices.WebServicesAutoConfiguration
 
 No newline at end of file