[iCal4j-commit] iCal4j/source/net/fortuna/ical4j/model TimeZoneRegistryImpl.java, 1.23, 1.24
Brought to you by:
fortuna
From: Ben F. <fo...@us...> - 2010-09-24 23:14:39
|
Update of /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22162/source/net/fortuna/ical4j/model Modified Files: TimeZoneRegistryImpl.java Log Message: Load resources via thread context classloader for compatibility with app servers Index: TimeZoneRegistryImpl.java =================================================================== RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** TimeZoneRegistryImpl.java 6 Mar 2010 12:57:24 -0000 1.23 --- TimeZoneRegistryImpl.java 24 Sep 2010 23:14:31 -0000 1.24 *************** *** 45,48 **** --- 45,49 ---- import net.fortuna.ical4j.util.CompatibilityHints; import net.fortuna.ical4j.util.Configurator; + import net.fortuna.ical4j.util.ResourceLoader; import org.apache.commons.logging.Log; *************** *** 62,66 **** public class TimeZoneRegistryImpl implements TimeZoneRegistry { ! private static final String DEFAULT_RESOURCE_PREFIX = "/zoneinfo/"; private static final Pattern TZ_ID_SUFFIX = Pattern.compile("(?<=/)[^/]*/[^/]*$"); --- 63,67 ---- public class TimeZoneRegistryImpl implements TimeZoneRegistry { ! private static final String DEFAULT_RESOURCE_PREFIX = "zoneinfo/"; private static final Pattern TZ_ID_SUFFIX = Pattern.compile("(?<=/)[^/]*/[^/]*$"); *************** *** 75,80 **** static { try { ! ALIASES.load(TimeZoneRegistryImpl.class ! .getResourceAsStream("/net/fortuna/ical4j/model/tz.alias")); } catch (IOException ioe) { --- 76,80 ---- static { try { ! ALIASES.load(ResourceLoader.getResourceAsStream("net/fortuna/ical4j/model/tz.alias")); } catch (IOException ioe) { *************** *** 181,185 **** */ private VTimeZone loadVTimeZone(final String id) throws IOException, ParserException { ! final URL resource = TimeZoneRegistryImpl.class.getResource(resourcePrefix + id + ".ics"); if (resource != null) { final CalendarBuilder builder = new CalendarBuilder(); --- 181,185 ---- */ private VTimeZone loadVTimeZone(final String id) throws IOException, ParserException { ! final URL resource = ResourceLoader.getResource(resourcePrefix + id + ".ics"); if (resource != null) { final CalendarBuilder builder = new CalendarBuilder(); |