branch develop updated (6ba0506 -> 46b0e37)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 6ba0506 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 46b0e37 Supprime la conf de base par défault du module rest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 46b0e3740a4818ca1eaa9970daeacd6440df4eba Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 16 10:24:49 2015 +0100 Supprime la conf de base par défault du module rest Summary of changes: coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 2 +- coselmar-rest/src/main/resources/coselmar-services.properties | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 46b0e3740a4818ca1eaa9970daeacd6440df4eba Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 16 10:24:49 2015 +0100 Supprime la conf de base par défault du module rest --- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 2 +- coselmar-rest/src/main/resources/coselmar-services.properties | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml index 02952d9..19c9656 100644 --- a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml +++ b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml @@ -47,6 +47,6 @@ <context-param> <param-name>wm.exclude.paths</param-name> <param-value>/webjars</param-value> -</context-param> + </context-param> </web-app> \ No newline at end of file diff --git a/coselmar-rest/src/main/resources/coselmar-services.properties b/coselmar-rest/src/main/resources/coselmar-services.properties index 4c88a46..216d2ab 100644 --- a/coselmar-rest/src/main/resources/coselmar-services.properties +++ b/coselmar-rest/src/main/resources/coselmar-services.properties @@ -22,12 +22,4 @@ # #L% ### -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.url=jdbc:h2:file:${coselmar.data.directory}/db/coselmar -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.hbm2ddl.auto=update coselmar.version=${project.version} - -coselmar.index.directory=${coselmar.data.directory}/index \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm