En lun, 2001-11-19 a 17:37, Jason van Zyl escribi�:
> Send me this patch as an attachment and I will apply it right now if
it will
> let jetspeed use Turbine from CVS. We can deal with the Extended properties
> class and the general turbine 3 issue later. You guys needs this now so I
> will apply it.
>
Here it is. I will check if we have some remaining issue wrt turbine,
and report.
Thanks.
Index: src/java/org/apache/turbine/services/resources/TurbineResourceService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResourceService.java,v
retrieving revision 1.4
diff -u -r1.4 TurbineResourceService.java
--- src/java/org/apache/turbine/services/resources/TurbineResourceService.java
2001/09/25 02:18:17 1.4
+++ src/java/org/apache/turbine/services/resources/TurbineResourceService.java
+2001/11/19 17:43:35
@@ -228,6 +228,9 @@
return null;
}
+ //Get the full ResourceService (we could be in a subset instance)
+ ResourceService top = TurbineResources.getService();
+
int begin = -1;
int end = -1;
int prec = 0-END_TOKEN.length();
@@ -240,9 +243,9 @@
{
result.append(base.substring(prec+END_TOKEN.length(),begin));
variable = base.substring(begin+START_TOKEN.length(),end);
- if (configuration.get(variable)!=null)
+ if (top.getString(variable)!=null)
{
- result.append(configuration.get(variable));
+ result.append(top.getString(variable));
}
prec=end;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
