Revision 4df43dd4
Added by Katja Luther almost 2 years ago
| cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java | ||
|---|---|---|
| 21 | 21 |
|
| 22 | 22 |
import javax.sql.DataSource; |
| 23 | 23 |
|
| 24 |
|
|
| 24 | 25 |
import org.apache.logging.log4j.LogManager; |
| 25 | 26 |
import org.apache.logging.log4j.Logger; |
| 27 |
|
|
| 26 | 28 |
import org.hibernate.cache.spi.RegionFactory; |
| 27 | 29 |
import org.jdom.Attribute; |
| 28 | 30 |
import org.jdom.Element; |
| ... | ... | |
| 77 | 79 |
} |
| 78 | 80 |
|
| 79 | 81 |
/** |
| 82 |
<<<<<<< Updated upstream |
|
| 83 |
======= |
|
| 84 |
* Returns the default CdmDataSource |
|
| 85 |
*/ |
|
| 86 |
public final static CdmPersistentDataSource NewLocalHsqlInstance() throws DataSourceNotFoundException{
|
|
| 87 |
return NewInstance("localDefaultHsql");
|
|
| 88 |
} |
|
| 89 |
|
|
| 90 |
/** |
|
| 91 |
>>>>>>> Stashed changes |
|
| 80 | 92 |
* Returns the CdmDataSource named by strDataSource |
| 81 | 93 |
* @param strDataSource |
| 82 | 94 |
* @return |
Also available in: Unified diff
resolve the merge