github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-01 16:19:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor properties bootup, remove GlobalProperties and allow ServerConfig.loadFromProperties()

Browse Source
This commit is contained in:
rbygrave
2014-11-30 17:08:02 +13:00
parent fe65a0ccb9
commit 370267ab6f
105 changed files with 3772 additions and 3963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java
+20 -2
View File
@@ -1,12 +1,16 @@
package com.avaje.tests.persistencecontext;
import com.avaje.ebean.*;
import com.avaje.ebean.config.ContainerConfig;
import com.avaje.ebean.config.DataSourceConfig;
import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import com.avaje.ebeaninternal.api.SpiQuery;
import com.avaje.tests.model.basic.EBasicVer;
import org.junit.Test;
import java.util.Properties;
import static org.junit.Assert.assertEquals;
public class TestPersistenceContextServerConfig extends BaseTestCase {
@@ -26,10 +30,24 @@ public class TestPersistenceContextServerConfig extends BaseTestCase {
static EbeanServer create() {
ServerConfig config = new ServerConfig();
config.setName("h2");
config.loadFromProperties();
config.setName("withPCQuery");
Properties properties = new Properties();
properties.setProperty("datasource.withPCQuery.username","sa");
properties.setProperty("datasource.withPCQuery.password","");
properties.setProperty("datasource.withPCQuery.databaseUrl","jdbc:h2:mem:withPCQuery;");
properties.setProperty("datasource.withPCQuery.databaseDriver","org.h2.Driver");
config.loadFromProperties(properties);
config.setPersistenceContextScope(PersistenceContextScope.QUERY);
config.setContainerConfig(new ContainerConfig());
// DataSourceConfig dataSourceConfig = new DataSourceConfig();
// dataSourceConfig.setUsername("sa");
// dataSourceConfig.setPassword("");
// dataSourceConfig.setUrl("jdbc:h2:mem:withPCQuery;");
// dataSourceConfig.setDriver("org.h2.Driver");
// config.setDataSourceConfig(dataSourceConfig);
config.addClass(EBasicVer.class);