portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [1/2] git commit: 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
Date Fri, 27 Jun 2014 13:08:25 GMT
Repository: portals-pluto
Updated Branches:
  refs/heads/master dd1e82113 -> 8d848588e


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


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/c5686ad7
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/c5686ad7
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/c5686ad7

Branch: refs/heads/master
Commit: c5686ad77bb2c7701d7867dfca2d31cac31fdda2
Parents: dd1e821
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Mon Jun 2 17:41:14 2014 +0200
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Mon Jun 2 17:41:14 2014 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/pluto/testsuite/TestConfigFactory.java    | 1 +
 .../util/install/file/tomcat5/Tomcat5FileSystemInstaller.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c5686ad7/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
----------------------------------------------------------------------
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 class TestConfigFactory {
      */
     public TestConfigFactory() {
         digester = new Digester();
+        digester.setClassLoader(Thread.currentThread().getContextClassLoader());
         digester.addObjectCreate("testportlet-config", ArrayList.class);
 
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c5686ad7/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
----------------------------------------------------------------------
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 @@ public class Tomcat5FileSystemInstaller extends FileSystemInstaller {
     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();


Mime
View raw message