You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/07/26 17:07:05 UTC
git commit: [OLINGO-377] Changed base dir for tomcat
Repository: olingo-odata4
Updated Branches:
refs/heads/OLINGO-377-FIT a18ec9d69 -> 2403efe06
[OLINGO-377] Changed base dir for tomcat
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/2403efe0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/2403efe0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/2403efe0
Branch: refs/heads/OLINGO-377-FIT
Commit: 2403efe062560ca5448b94cf05b81c0fe6a3e9f2
Parents: a18ec9d
Author: mibo <mi...@mirb.de>
Authored: Sat Jul 26 17:06:57 2014 +0200
Committer: mibo <mi...@mirb.de>
Committed: Sat Jul 26 17:06:57 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/olingo/fit/server/TomcatTestServer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2403efe0/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
index 5204983..0a95d8e 100644
--- a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
+++ b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
@@ -116,8 +116,6 @@ public class TomcatTestServer {
private TomcatTestServer server;
private TestServerBuilder(int fixedPort) {
- tomcat = new Tomcat();
- tomcat.setPort(fixedPort);
//baseDir = new File(System.getProperty("java.io.tmpdir"), "tomcat-test");
projectTarget = new File(Thread.currentThread().getContextClassLoader().getResource(".").getFile());
// projectTarget == ...fit/target/test-classes
@@ -125,11 +123,13 @@ public class TomcatTestServer {
if(!baseDir.exists() && !baseDir.mkdirs()) {
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().setAppBase(baseDir.getAbsolutePath());
- tomcat.setBaseDir(baseDir.getParentFile().getAbsolutePath());
tomcat.getHost().setDeployOnStartup(true);
- // <user name="odatajclient" password="odatajclient" roles="odatajclient"/>
tomcat.addUser("odatajclient", "odatajclient");
tomcat.addRole("odatajclient", "odatajclient");
}