diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-02 07:26:30 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-02 07:26:30 +0200 |
| commit | 5bc01dab26425144a41dbece04b642fb963e1315 (patch) | |
| tree | 543fe5f7b8d576c7e85ba711c1f9bf03d3dc699f /id/server/moa-id-commons/src/main/resources | |
| parent | 06e63a4fb89dd92583fc3e72e12750becdd6c8ef (diff) | |
| download | moa-id-spss-5bc01dab26425144a41dbece04b642fb963e1315.tar.gz moa-id-spss-5bc01dab26425144a41dbece04b642fb963e1315.tar.bz2 moa-id-spss-5bc01dab26425144a41dbece04b642fb963e1315.zip | |
devel
Diffstat (limited to 'id/server/moa-id-commons/src/main/resources')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml | 2 | ||||
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/configuration.beans.xml_old (renamed from id/server/moa-id-commons/src/main/resources/configuration.beans.xml) | 9 | ||||
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/persistence_template.xml | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml index 8ff384eb9..6325ada5f 100644 --- a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml +++ b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml @@ -10,7 +10,7 @@ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" <class>at.gv.egovernment.moa.id.commons.config.persistence.dal.SOME_CLASS</class> </persistence-unit> - <persistence-unit name="moaidconf" transaction-type="RESOURCE_LOCAL"> + <persistence-unit name="config" transaction-type="RESOURCE_LOCAL"> <provider>org.hibernate.ejb.HibernatePersistence</provider> <class>at.gv.egovernment.moa.id.commons.db.dao.config.ConfigProperty</class> <properties> 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_old index 732c19721..b3e7526d0 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_old @@ -16,8 +16,9 @@ <bean id="configPropertyDao" - class="at.gv.egovernment.moa.id.commons.db.dao.config.ConfigPropertyDaoImpl" /> - <bean id="config" class="at.gv.egovernment.moa.id.commons.config.persistence.ConfigurationImpl"> + class="at.gv.egovernment.moa.id.commons.db.dao.config.DatabaseConfigPropertyImpl" /> + + <bean id="config" class="at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfigurationImpl"> <property name="configPropertyDao" ref="configPropertyDao" /> </bean> @@ -25,6 +26,8 @@ <bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/> + <bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider" + <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close"> <aop:scoped-proxy/> <property name="driverClassName" value="${dataSource.driverClassName}" /> @@ -46,7 +49,7 @@ <bean name="moaidconf" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <property name="dataSource" ref="dataSource" /> <property name="jpaVendorAdapter" ref="jpaVendorAdapter" /> - <property name="persistenceUnitName" value="moaidconf" /> + <property name="persistenceUnitName" value="config" /> </bean> <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> diff --git a/id/server/moa-id-commons/src/main/resources/persistence_template.xml b/id/server/moa-id-commons/src/main/resources/persistence_template.xml index 06706e27a..d9adc4394 100644 --- a/id/server/moa-id-commons/src/main/resources/persistence_template.xml +++ b/id/server/moa-id-commons/src/main/resources/persistence_template.xml @@ -3,7 +3,7 @@ http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <!-- <persistence-unit name="##generated"> --> - <persistence-unit name="moaidconf" transaction-type="RESOURCE_LOCAL"> + <persistence-unit name="config" transaction-type="RESOURCE_LOCAL"> <provider>org.hibernate.ejb.HibernatePersistence</provider> <class>at.gv.egovernment.moa.id.commons.db.dao.config.ConfigProperty</class> <properties> |