| commit | c5686ad77bb2c7701d7867dfca2d31cac31fdda2 | [log] [tgz] |
|---|---|---|
| author | Scott Nicklous <msnicklous@apache.org> | Mon Jun 02 17:41:14 2014 +0200 |
| committer | Scott Nicklous <msnicklous@apache.org> | Mon Jun 02 17:41:14 2014 +0200 |
| tree | 0e16cdf5bcbd684acf3f306aa84c0651be0e8a22 | |
| parent | dd1e82113d488c382b67512260693ec45a899e08 [diff] |
Code fixes to get all test cases to work on Tomee. 1) In TestConfigFactory.java: set classloader to avoid runtime error 2) In Tomcat5FileSystemInstaller.java: added trailing slash to context name to avoid tomcat warning during bringup
diff --git a/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java b/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java index 50312a5..08fbf0a 100644 --- a/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java +++ b/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
@@ -44,6 +44,7 @@ */ public TestConfigFactory() { digester = new Digester(); + digester.setClassLoader(Thread.currentThread().getContextClassLoader()); digester.addObjectCreate("testportlet-config", ArrayList.class);
diff --git a/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java b/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java index 9345466..968167b 100644 --- a/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java +++ b/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
@@ -135,7 +135,7 @@ private String getConfigContents(String war, String contextPath) { StringBuffer contents = new StringBuffer(); contents.append("<Context ") - .append("path=\"").append(contextPath).append("\" ") + .append("path=\"/").append(contextPath).append("\" ") .append("docBase=\"").append(war).append("\" ") .append("crossContext=\"true\">").append("</Context>"); return contents.toString();