Project

General

Profile

« Previous | Next » 

Revision 206b33d6

Added by Niels Hoffmann over 15 years ago

cdm application controller now generated instances of conversation holders

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationDefaultConfiguration.java
9 9

  
10 10
package eu.etaxonomy.cdm.api.application;
11 11

  
12
import javax.sql.DataSource;
13

  
12 14
import org.apache.log4j.Logger;
15
import org.hibernate.SessionFactory;
13 16
import org.springframework.beans.factory.annotation.Autowired;
14
import org.springframework.beans.factory.annotation.Qualifier;
15 17
import org.springframework.orm.hibernate3.HibernateTransactionManager;
16 18
import org.springframework.stereotype.Component;
17 19
import org.springframework.transaction.PlatformTransactionManager;
......
74 76
	//@Autowired
75 77
	//@Qualifier("mainService")
76 78
	private IService<CdmBase> mainService;
77

  
79
	@Autowired
80
	private SessionFactory sessionFactory;
81
	@Autowired
82
	private DataSource dataSource;
78 83
	
79 84
	/**
80 85
	 * 
......
160 165
		return this.transactionManager;
161 166
	}
162 167

  
168
	/* (non-Javadoc)
169
	 * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#NewConversation()
170
	 */
171
	public ConversationHolder NewConversation() {
172
		return new ConversationHolder(dataSource, sessionFactory, transactionManager);
173
	}
174

  
163 175
	
164 176
}

Also available in: Unified diff