diff options
Diffstat (limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml index ea0e7c78d..775d02d05 100644 --- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml +++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml @@ -11,7 +11,10 @@ <context:annotation-config /> - <context:property-placeholder location="${location}"/> + <!-- context:property-placeholder location="${location}"/--> + +<!-- <bean class="at.gv.egovernment.moa.id.commons.config.persistence.JPAPropertiesWithJavaConfig"> + </bean> --> <bean id="configPropertyDao" class="at.gv.egovernment.moa.id.commons.db.dao.config.DatabaseConfigPropertyImpl"/> @@ -24,22 +27,27 @@ <!-- <bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/> --> <!-- <bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/> --> - <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close"> +<!-- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close"> <aop:scoped-proxy/> - <property name="driverClassName" value="${configuration.hibernate.connection.driver_class}" /> - <property name="url" value="${configuration.hibernate.connection.url}"/> - <property name="username" value="${configuration.hibernate.connection.username}" /> - <property name="password" value="${configuration.hibernate.connection.password}" /> + <property name="driverClassName" value="${hibernate.connection.driver_class}" /> + <property name="url" value="${hibernate.connection.url}"/> + <property name="username" value="${hibernate.connection.username}" /> + <property name="password" value="${hibernate.connection.password}" /> <property name="testOnBorrow" value="true" /> <property name="validationQuery" value="SELECT 1" /> - </bean> + </bean> --> - <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"> +<!-- <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"> <property name="showSql" value="true" /> <property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" /> - <property name="databasePlatform" value="${configuration.hibernate.dialect}" /> - </bean> + <property name="generateDdl"> + <bean class="java.lang.Boolean"> + <constructor-arg value="${jpaVendorAdapter.generateDdl}"/> + </bean> + </property> + <property name="databasePlatform" value="${hibernate.dialect}" /> + </bean> --> <bean name="config" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> |