Commit a02e1343 authored by Noel Alonso's avatar Noel Alonso
Browse files

Actualiza pom y propiedades

parent 7449dabb

pom.xml

+1 −18
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>

		<redmic.models.version>0.6.1</redmic.models.version>

		<redmic.mediastorage.version>0.6.0</redmic.mediastorage.version>

		<redmic.mediastorage.version>0.7.0</redmic.mediastorage.version>

		<redmic.sitemapgen4j.version>0.6.0</redmic.sitemapgen4j.version>



		<redmic.test-utils.version>0.6.0</redmic.test-utils.version>
@@ -153,23 +153,6 @@ 
			<scope>test</scope>

		</dependency>

	</dependencies>

	<repositories>

		<repository>

			<id>central</id>

			<name>libs-release</name>

			<url>https://artifactory.redmic.net/artifactory/libs-release</url>

		</repository>

		<repository>

			<id>snapshots</id>

			<name>libs-snapshot</name>

			<url>https://artifactory.redmic.net/artifactory/libs-snapshot</url>

		</repository>

		<repository>

			<id>osgeo</id>

			<name>Open Source Geospatial Foundation Repository</name>

			<url>http://download.osgeo.org/webdav/geotools/</url>

		</repository>

	</repositories>

	<build>

		<plugins>

			<plugin>

src/main/java/es/redmic/api/config/CorsConfiguration.java

+20 −0
Original line number Diff line number Diff line 
package es.redmic.api.config;



/*-

 * #%L

 * API

 * %%

 * Copyright (C) 2019 - 2020 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import org.springframework.context.annotation.Configuration;

import org.springframework.web.servlet.config.annotation.CorsRegistry;

import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/resources/application-dev.properties

+8 −8
Original line number Diff line number Diff line 
server.port=8080

#elastic

elastic.addresses=redmic.net

elastic.addresses=es-1

elastic.port=9300

elastic.clusterName=elasticsearch_dev

redmic.elasticsearch.check.mappings=true
@@ -12,8 +12,8 @@ aws.bucket=mediastorage.redmicdev 
aws.region=eu-west-1



# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.name=redmic

spring.datasource.url=jdbc:postgresql://redmic.net:5432/redmic?stringtype=unspecified

spring.datasource.name=name

spring.datasource.url=jdbc:postgresql://db:5432/redmic?stringtype=unspecified



#logging.level.ma.glasnost.orika=DEBUG
@@ -21,11 +21,11 @@ logging.level.org.hibernate.SQL=DEBUG 
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE



#oauth

oauth.server=http://redmic.net:8081

oauth.server=http://oauth:8081



#Sitemap properties

property.USER_API=http://213.0.110.84:8082

property.SITEMAP_BASE_URL=https://appdev.redmic.net

property.USER_API=http://user:8082

property.SITEMAP_BASE_URL=https://redmic.dev



#Mediastorage

#S3
@@ -34,8 +34,8 @@ property.path.media_storage.PUBLIC_BASE_PATH=/public 


#Local private



property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/home/REDMIC/MEDIA_STORAGE

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/tmp/MEDIA_STORAGE



#Local public



property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/home/REDMIC/PUBLIC_MEDIA_STORAGE
 
 No newline at end of file
 
property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/tmp/PUBLIC_MEDIA_STORAGE

src/main/resources/application-pre.properties

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ oauth.server=http://oauth:8081 


#Sitemap properties

property.USER_API=http://user:8082

property.SITEMAP_BASE_URL=https://redmic.net

property.SITEMAP_BASE_URL=https://redmic.pre



#S3

src/main/resources/application-test.properties

+12 −8
Original line number Diff line number Diff line 
server.port=8080

#elastic

elastic.addresses=redmic.net

elastic.addresses=localhost

elastic.port=9300

elastic.clusterName=elasticsearch_dev

redmic.elasticsearch.check.mappings=true

redmic.elasticsearch.check.mappings=false



#Mediastorage S3

aws.bucket=mediastorage.redmicdev
@@ -11,17 +11,17 @@ aws.region=eu-west-1 


# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.name=redmic

spring.datasource.url=jdbc:postgresql://redmic.net:5432/redmic?stringtype=unspecified

spring.datasource.url=jdbc:postgresql://localhost:5432/redmic?stringtype=unspecified



#logging.level.ma.glasnost.orika=DEBUG



logging.level.es.redmic=debug



#oauth

oauth.server=http://redmic.net:8081

oauth.server=http://localhost:8081



#Sitemap properties

property.USER_API=http://213.0.110.84:8082

property.USER_API=http://localhost:8082

property.SITEMAP_BASE_URL=https://appdev.redmic.net



#Mediastorage
@@ -31,16 +31,20 @@ property.path.media_storage.PUBLIC_BASE_PATH=/public 


#Local private



property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/home/REDMIC/MEDIA_STORAGE

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/tmp/MEDIA_STORAGE



#Local public



property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/home/REDMIC/PUBLIC_MEDIA_STORAGE

property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/tmp/PUBLIC_MEDIA_STORAGE



#TEST USERS



test.user.ADMINISTRATOR=administrator@redmic.es

test.user.OAG=oag@redmic.es

test.user.OPERATOR=operator@redmic.es

#TODO: eliminar cuando se cambie OAG por OPERATOR en librería test

test.user.OAG=operator@redmic.es

test.user.COLLABORATOR=collaborator@redmic.es

test.user.USER=user@redmic.es

test.user.PASSWORD=test.user.PASSWORD

test.oauth.AUTHORIZATION=test.oauth.AUTHORIZATION

test.oauth.GETTOKENPATH=/api/oauth/token