Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-377] Changed base dir for tomcat

This commit is contained in:
mibo 2014-07-26 17:06:57 +02:00
parent a18ec9d69a
commit 2403efe062
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
View File

@ -116,8 +116,6 @@ public class TomcatTestServer {
private TomcatTestServer server; private TomcatTestServer server;
private TestServerBuilder(int fixedPort) { private TestServerBuilder(int fixedPort) {
tomcat = new Tomcat();
tomcat.setPort(fixedPort);
//baseDir = new File(System.getProperty("java.io.tmpdir"), "tomcat-test"); //baseDir = new File(System.getProperty("java.io.tmpdir"), "tomcat-test");
projectTarget = new File(Thread.currentThread().getContextClassLoader().getResource(".").getFile()); projectTarget = new File(Thread.currentThread().getContextClassLoader().getResource(".").getFile());
// projectTarget == ...fit/target/test-classes // projectTarget == ...fit/target/test-classes
@ -125,11 +123,13 @@ public class TomcatTestServer {
if(!baseDir.exists() && !baseDir.mkdirs()) { if(!baseDir.exists() && !baseDir.mkdirs()) {
throw new RuntimeException("Unable to create temporary test directory at {" + baseDir.getAbsolutePath() + "}"); throw new RuntimeException("Unable to create temporary test directory at {" + baseDir.getAbsolutePath() + "}");
} }
//
tomcat = new Tomcat();
tomcat.setBaseDir(baseDir.getParentFile().getAbsolutePath());
tomcat.setPort(fixedPort);
tomcat.getHost().setAutoDeploy(true); tomcat.getHost().setAutoDeploy(true);
tomcat.getHost().setAppBase(baseDir.getAbsolutePath()); tomcat.getHost().setAppBase(baseDir.getAbsolutePath());
tomcat.setBaseDir(baseDir.getParentFile().getAbsolutePath());
tomcat.getHost().setDeployOnStartup(true); tomcat.getHost().setDeployOnStartup(true);
// <user name="odatajclient" password="odatajclient" roles="odatajclient"/>
tomcat.addUser("odatajclient", "odatajclient"); tomcat.addUser("odatajclient", "odatajclient");
tomcat.addRole("odatajclient", "odatajclient"); tomcat.addRole("odatajclient", "odatajclient");
} }