diff --git a/pom.xml b/pom.xml index be1482d..99e442a 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,14 @@ See e.g. https://tomcat.apache.org/tomcat-8.5-doc/config/context.html Should be the same as the project.version but padded with zeros to six digits. --> 000001 + + ${project.artifactId} @@ -125,9 +133,10 @@ war postgres + financer - ${project.artifactId}##${parallelDeploymentVersion} + ${finalName}##${parallelDeploymentVersion} diff --git a/src/main/resources/config/application-dev.properties b/src/main/resources/config/application-dev.properties index 000f956..7bbdbf2 100644 --- a/src/main/resources/config/application-dev.properties +++ b/src/main/resources/config/application-dev.properties @@ -1,2 +1,4 @@ # Hibernate -spring.jpa.show-sql=true \ No newline at end of file +spring.jpa.show-sql=true + +financer.serverUrl=http://localhost:8089/financer-server/ \ No newline at end of file diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties index 38f476d..5d2c261 100644 --- a/src/main/resources/config/application.properties +++ b/src/main/resources/config/application.properties @@ -5,6 +5,9 @@ spring.profiles.active=@activeProfiles@ +# This properties are just for the embedded Tomcat used while developing +# In a standalone servlet container instance the context path is usually defined by the name +# of the .war file. See property 'finalName' in the POM for more info. server.servlet.context-path=/financer-web-client server.port=8090 @@ -20,6 +23,6 @@ logging.file=financer-web-client.log # The date format of the client-supplied date string, used to parse the string into a proper object financer.dateFormat=dd.MM.yyyy financer.version=@project.version@ -financer.serverUrl=http://localhost:8089/financer-server/ +financer.serverUrl=http://localhost:8080/financer-server/ spring.messages.basename=i18n/message \ No newline at end of file