Fix for #175 - Change to use System.getProperty("ebean.serverfactory")

rather than GlobalProperties
This commit is contained in:
rbygrave committed 2014-07-21 22:31:01 +12:00
1 parent f7ece0f13c
commit e50656871d
3 files changed
+47 -79

No files matched your search

@@ -1,9 +1,11 @@
package com.avaje.tests.unitinternal;
import java.io.File;
import org.avaje.agentloader.AgentLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.EbeanServerFactory;
import com.avaje.ebean.config.DataSourceConfig;
@@ -12,42 +14,51 @@ import com.avaje.tests.model.basic.TOne;
public class HelloMain {
public static void main(String[] args) {
// ### Configuration Objects ###
ServerConfig serverConfig = new ServerConfig();
DataSourceConfig dataSourceConfig = new DataSourceConfig();
protected static Logger logger = LoggerFactory.getLogger(HelloMain.class);
// ### Configuration Settings ###
// -> data source
dataSourceConfig.setDriver("org.h2.Driver");
dataSourceConfig.setUsername("howtouser");
dataSourceConfig.setPassword("");
dataSourceConfig.setUrl("jdbc:h2:db/howto1");
static {
logger.debug("... preStart");
if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1;packages=com.avaje.tests.**")) {
logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
}
}
// -> server
serverConfig.setName("default");
serverConfig.setDataSourceConfig(dataSourceConfig);
public static void main(String[] args) {
// ### Configuration Objects ###
ServerConfig serverConfig = new ServerConfig();
DataSourceConfig dataSourceConfig = new DataSourceConfig();
// auto create db if it does not exist
if(!(new File("db/howto1.data.db")).exists() ){
serverConfig.setDdlGenerate(true);
serverConfig.setDdlRun(true);
serverConfig.addClass(TOne.class);
}
// ### Configuration Settings ###
// -> data source
dataSourceConfig.setDriver("org.h2.Driver");
dataSourceConfig.setUsername("howtouser");
dataSourceConfig.setPassword("");
dataSourceConfig.setUrl("jdbc:h2:db/howto1");
EbeanServer eServer = EbeanServerFactory.create(serverConfig);
// -> server
serverConfig.setName("default");
serverConfig.setDataSourceConfig(dataSourceConfig);
// auto create db if it does not exist
if (!(new File("db/howto1.data.db")).exists()) {
serverConfig.setDdlGenerate(true);
serverConfig.setDdlRun(true);
serverConfig.addClass(TOne.class);
}
EbeanServer eServer = EbeanServerFactory.create(serverConfig);
long id = 1;
TOne data = eServer.find(TOne.class, id);
if (data == null) {
System.out.println("This is the first run, saving data..");
TOne tone = new TOne();
tone.setName("banan");
eServer.save(tone);// new TOne()id, "Hello World!"));
} else {
System.out.println(String.format("############\n%s############", data.getName()));
}
// ShutdownManager.shutdown();
}
long id = 1;
TOne data = eServer.find(TOne.class, id);
if (data == null) {
System.out.println("This is the first run, saving data..");
TOne tone = new TOne();
tone.setName("banan");
eServer.save(tone);//new TOne()id, "Hello World!"));
} else {
System.out.println(String.format("############\n%s############", data.getName()));
}
//ShutdownManager.shutdown();
}
}