Author: blavenier Date: 2013-02-11 13:45:44 +0100 (Mon, 11 Feb 2013) New Revision: 390 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/390 Log: Fix : - do not load Spring context twice Added: trunk/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml Removed: trunk/tutti-persistence/src/main/resources/beanRefFactory.xml Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2013-02-11 08:14:47 UTC (rev 389) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2013-02-11 12:45:44 UTC (rev 390) @@ -42,9 +42,9 @@ } public static void initTuttiDefault() { - instance().init("beanRefFactory.xml", "TuttiBeanRefFactory"); + instance().init("tuttiBeanRefFactory.xml", "TuttiBeanRefFactory"); } - + public static void initTutti(String beanFactoryReferenceLocation, String beanRefFactoryReferenceId) { instance().init(beanFactoryReferenceLocation, beanRefFactoryReferenceId); Deleted: trunk/tutti-persistence/src/main/resources/beanRefFactory.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/beanRefFactory.xml 2013-02-11 08:14:47 UTC (rev 389) +++ trunk/tutti-persistence/src/main/resources/beanRefFactory.xml 2013-02-11 12:45:44 UTC (rev 390) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Tutti :: Persistence API - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - - <bean id="TuttiBeanRefFactory" - class="org.springframework.context.support.ClassPathXmlApplicationContext"> - <constructor-arg> - <list> - <value>applicationContext-conf.xml</value> - <value>applicationContext-dataSource-${dataSource.type}.xml</value> - <value>applicationContext-entities.xml</value> - <value>applicationContext-service.xml</value> - <value>applicationContext-service-tutti.xml</value> - </list> - </constructor-arg> - </bean> - -</beans> \ No newline at end of file Added: trunk/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml (rev 0) +++ trunk/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml 2013-02-11 12:45:44 UTC (rev 390) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: Persistence API + $Id: beanRefFactory.xml 300 2013-02-02 14:11:58Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/tutti-persistence/src/main/re... $ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + + <import resource="classpath*:applicationContext-conf.xml"/> + + <bean id="TuttiBeanRefFactory" + class="org.springframework.context.support.ClassPathXmlApplicationContext"> + <constructor-arg> + <list> + <value>classpath:applicationContext-conf.xml</value> + <value>classpath:applicationContext-dataSource-${dataSource.type}.xml</value> + <value>classpath:applicationContext-entities.xml</value> + <value>classpath:applicationContext-service.xml</value> + <value>classpath:applicationContext-service-tutti.xml</value> + </list> + </constructor-arg> + </bean> + +</beans> \ No newline at end of file