aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-07-14 05:56:13 (EDT)
committerGlyn Normington2010-07-14 05:56:13 (EDT)
commitab593b5484dccb6f8593b42735c63f23c2b87934 (patch)
treeeb94ed05e556a6dc69f59c844122aecf0c53080e
parentd54f545f7e9accd456b2b94ec279217ee91bdf5c (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-ab593b5484dccb6f8593b42735c63f23c2b87934.zip
org.eclipse.gemini.web.gemini-web-container-ab593b5484dccb6f8593b42735c63f23c2b87934.tar.gz
org.eclipse.gemini.web.gemini-web-container-ab593b5484dccb6f8593b42735c63f23c2b87934.tar.bz2
correct property and delete file checked in accidentally
-rw-r--r--org.eclipse.gemini.web.test/config/Catalina/localhost/war-with-context-xml-resources.xml9
-rw-r--r--org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java2
2 files changed, 1 insertions, 10 deletions
diff --git a/org.eclipse.gemini.web.test/config/Catalina/localhost/war-with-context-xml-resources.xml b/org.eclipse.gemini.web.test/config/Catalina/localhost/war-with-context-xml-resources.xml
deleted file mode 100644
index b0623f6..0000000
--- a/org.eclipse.gemini.web.test/config/Catalina/localhost/war-with-context-xml-resources.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Context>
-
- <Resource name="mail/Session"
- auth="Container"
- type="javax.mail.Session"
- mail.smtp.host="localhost"/>
-
-</Context>
-
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index c21b9d6..f5ed6c3 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -91,7 +91,7 @@ public class TomcatServletContainerTests {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("org.eclipse.gemini.web.tomcat.config.path", "target/config");
+ System.setProperty("org.eclipse.gemini.web.tomcat.config.path", "target/config/tomcat-server.xml");
}
@Before