portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r688553 - /portals/jetspeed-2/portal/branches/JS2-869/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java
Date Sun, 24 Aug 2008 19:57:28 GMT
Author: ate
Date: Sun Aug 24 12:57:28 2008
New Revision: 688553

URL: http://svn.apache.org/viewvc?rev=688553&view=rev
Log:
Merging trunk fix:
Fixing an unexpected error when using the ${applicationRoot} variable by Spring if it contains
(Windows) \ path delimiters.
Somehow Spring seems to "mangle" such variables. Simply replacing \ by / prevents this.

Modified:
    portals/jetspeed-2/portal/branches/JS2-869/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java

Modified: portals/jetspeed-2/portal/branches/JS2-869/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java?rev=688553&r1=688552&r2=688553&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-869/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java
Sun Aug 24 12:57:28 2008
@@ -148,6 +148,10 @@
                     applicationRoot = webappRoot;
                 }
 
+                // Using \ characters will corrupt the path when used as (Spring expanded)
variables
+                // making sure default (Java) path separators are used which somehow always
work, even on Windows platform.
+                applicationRoot = applicationRoot.replace('\\', '/');
+                
                 // load jetspeed.properties, override.properties and spring-filter-key.properties
separately
                 // and "merge" them by hand instead of relaying on Commons Configuration
"include" functionality...
                 // Commons Configuration performs property value *appending* if keys are
encountered multiple times,



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message