Author: henning
Date: Mon Sep 19 00:13:51 2005
New Revision: 290076
URL: http://svn.apache.org/viewcvs?rev=290076&view=rev
Log:
commit UI Manager property loading patch (thanks Thomas Vandahl)
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/UIManager.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/UIManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/UIManager.java?rev=290076&r1=290075&r2=290076&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/UIManager.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/UIManager.java
Mon Sep 19 00:13:51 2005
@@ -421,7 +421,17 @@
try
{
- InputStream is =
TurbineServlet.getResourceAsStream(getScript(SKIN_PROPS_FILE));
+ StringBuffer sb = new StringBuffer();
+
+ sb.append(resourcesDirectory).
+ append('/').
+ append(skinsDirectory).
+ append('/').
+ append(getSkin()).
+ append('/').
+ append(SKIN_PROPS_FILE);
+
+ InputStream is = TurbineServlet.getResourceAsStream(sb.toString());
skinProperties.load(is);
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?rev=290076&r1=290075&r2=290076&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Mon Sep
19 00:13:51 2005
@@ -25,6 +25,10 @@
<body>
<release version="2.3.2-rc2" date="in Subversion">
+ <action type="fix" dev="henning" issue="TRB-5" due-to="Thomas Vandahl">
+ The skin properties file must not be loaded as stream from the filesystem
+ and not using the getScript() method.
+ </action>
<action type="update" dev="henning">
Make sure that the source can still be compiled and tested under JDK
1.3.1.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
