Author: rmannibucau
Date: Wed Mar 20 14:48:05 2013
New Revision: 1458859
URL: http://svn.apache.org/r1458859
Log:
forcing Container to use the config we give it
Modified:
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Modified:
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1458859&r1=1458858&r2=1458859&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Wed Mar 20 14:48:05 2013
@@ -83,10 +83,9 @@ public class Container {
private Tomcat tomcat;
public Container() {
- final Configuration configuration = new Configuration();
+ configuration = new Configuration();
configuration.setHttpPort(23880);
configuration.setStopPort(23881);
- setup(configuration);
}
public void setup(final Configuration configuration) {
@@ -120,6 +119,10 @@ public class Container {
}
public void start() throws Exception {
+ if (base == null) {
+ setup(configuration);
+ }
+
Logger.configure();
final File conf = new File(base, "conf");
@@ -257,8 +260,12 @@ public class Container {
try {
final String dir = configuration.getDir();
- if (dir != null && new File(dir).exists()) {
- return dir;
+ if (dir != null) {
+ final File dirFile = new File(dir);
+ if (dirFile.exists()) {
+ return dir;
+ }
+ return Files.mkdir(dirFile).getAbsolutePath();
}
try {
