Skip to content
Snippets Groups Projects
Commit b7f59019 authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

merging

parents c60ae04d 7afcd3c0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 30
− 28
View file @ b7f59019
......@@ -17,34 +17,35 @@
<version>1.3.2.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<profiles>
<profile>
<id>test</id>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<connection.driver_class>org.h2.Driver</connection.driver_class>
<connection.url>jdbc:h2:mem:test</connection.url>
<connection.username>root</connection.username>
<connection.password>root</connection.password>
<hibernate.dialect>org.hibernate.dialect.H2Dialect</hibernate.dialect>
<schema.deploy>true</schema.deploy>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<connection.driver_class>org.postgresql.Driver</connection.driver_class>
<connection.url>jdbc:postgresql://hbpmdw1.chuv.ch:31432/portal</connection.url>
<connection.username>portal</connection.username>
<connection.password>iaezXODVLb1e70I</connection.password>
<hibernate.dialect>org.hibernate.dialect.PostgreSQL82Dialect</hibernate.dialect>
<schema.deploy>false</schema.deploy>
</properties>
</profile>
<profiles>
<profile>
<id>test</id>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<connection.driver_class>org.h2.Driver</connection.driver_class>
<connection.url>jdbc:h2:mem:test</connection.url>
<connection.username>root</connection.username>
<connection.password>root</connection.password>
<hibernate.dialect>org.hibernate.dialect.H2Dialect</hibernate.dialect>
<schema.deploy>true</schema.deploy>
<frontend.redirect>http://frontend/#/home</frontend.redirect>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<connection.driver_class>org.postgresql.Driver</connection.driver_class>
<connection.url>jdbc:postgresql://hbpmdw1.chuv.ch:31432/portal</connection.url>
<connection.username>portal</connection.username>
<connection.password>iaezXODVLb1e70I</connection.password>
<hibernate.dialect>org.hibernate.dialect.PostgreSQL82Dialect</hibernate.dialect>
<schema.deploy>false</schema.deploy>
<frontend.redirect>https://mip.humanbrainproject.eu/#/home</frontend.redirect>
</properties>
</profile>
<profile>
<id>dev</id>
<properties>
......@@ -56,6 +57,7 @@
<connection.password>test</connection.password>
<hibernate.dialect>org.hibernate.dialect.PostgreSQL82Dialect</hibernate.dialect>
<schema.deploy>false</schema.deploy>
<frontend.redirect>http://frontend/#/home</frontend.redirect>
</properties>
</profile>
</profiles>
......
src/main/resources/hibernate.cfg.xml
+ 21
− 21
View file @ b7f59019
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.driver_class">${connection.driver_class}</property>
<property name="connection.url">${connection.url}</property>
<property name="connection.username">${connection.username}</property>
<property name="connection.password">${connection.password}</property>
<property name="hibernate.format_sql">true</property>
<property name="connection.pool_size">1</property>
<property name="hibernate.dialect">${hibernate.dialect}</property>
<property name="current_session_context_class">thread</property>
<property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
<property name="hibernate.show_sql">false</property>
<property name="hibernate.hbm2ddl.auto">update</property>
</session-factory>
</hibernate-configuration>
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.driver_class">${connection.driver_class}</property>
<property name="connection.url">${connection.url}</property>
<property name="connection.username">${connection.username}</property>
<property name="connection.password">${connection.password}</property>
<property name="hibernate.format_sql">true</property>
<property name="connection.pool_size">1</property>
<property name="hibernate.dialect">${hibernate.dialect}</property>
<property name="current_session_context_class">thread</property>
<property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
<property name="hibernate.show_sql">false</property>
<property name="hibernate.hbm2ddl.auto">update</property>
</session-factory>
</hibernate-configuration>
src/main/resources/spring/application-context.xml
+ 1
− 13
View file @ b7f59019
......@@ -8,18 +8,6 @@
<context:component-scan base-package="org.hbp.mip" />
<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
<!--
<property name="dataSource">
<bean id="idDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="${connection.driver_class}" />
<property name="url" value="${connection.url}" />
<property name="username" value="${connection.username}" />
<property name="password" value="${connection.password}" />
</bean>
</property>
-->
<property name="packagesToScan">
<list>
<value>org.hbp.mip.model</value>
......@@ -37,7 +25,7 @@
<constructor-arg value="/login/hbp"></constructor-arg>
<property name="authenticationSuccessHandler">
<bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler">
<property name="defaultTargetUrl" value="http://frontend/#/home" />
<property name="defaultTargetUrl" value="${frontend.redirect}" />
</bean>
</property>
<property name="restTemplate">
......
start.bat 0 → 100644
+ 1
− 0
View file @ b7f59019
start java -jar target\backend-services-0.0.1-SNAPSHOT.jar --spring.config.location=config\application.yml
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment