Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/resource Modified Files: BrokerTemplateLoader.java GenerationalCacheManager.java ReloadDelayDecorator.java URLTemplateProvider.java UrlProvider.java Log Message: - adding copyright headers where they were missing - fix a few import statements - minor javadoc cleanup here and there - used IDEA to find and fix redundant type casts and unused assignments. Index: BrokerTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BrokerTemplateLoader.java 11 Jun 2002 17:43:22 -0000 1.2 --- BrokerTemplateLoader.java 11 Nov 2002 19:22:37 -0000 1.3 *************** *** 1,2 **** --- 1,23 ---- + /* + * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted under the terms of either of the following + * Open Source licenses: + * + * The GNU General Public License, version 2, or any later version, as + * published by the Free Software Foundation + * (http://www.fsf.org/copyleft/gpl.html); + * + * or + * + * The Semiotek Public License (http://webmacro.org/LICENSE.) + * + * This software is provided "as is", with NO WARRANTY, not even the + * implied warranties of fitness to purpose, or merchantability. You + * assume all risks and liabilities associated with its use. + * + * See www.webmacro.org for more information on the WebMacro project. + */ package org.webmacro.resource; Index: GenerationalCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/GenerationalCacheManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GenerationalCacheManager.java 12 Jun 2002 17:35:34 -0000 1.5 --- GenerationalCacheManager.java 11 Nov 2002 19:22:37 -0000 1.6 *************** *** 20,23 **** --- 20,35 ---- * See www.webmacro.org for more information on the WebMacro project. */ + package org.webmacro.resource; + + import org.opendoors.cache.UpdateableCache; + import org.opendoors.cache.immutable.CacheFactory; + import org.opendoors.cache.immutable.CacheImpl; + + import org.webmacro.Broker; + import org.webmacro.InitException; + import org.webmacro.Log; + import org.webmacro.ResourceException; + import org.webmacro.util.Settings; + import org.webmacro.util.SubSettings; /** *************** *** 36,61 **** * This cache manager supports reloadability * of a cache entry provided the cache element knows how ! * to test itself for having become stale. ! * <a href="mailto:la...@op...">Architecture Support</a> ! * @since 0.96 ! */ ! package org.webmacro.resource; ! ! import org.opendoors.cache.UpdateableCache; ! import org.opendoors.cache.immutable.CacheFactory; ! import org.opendoors.cache.immutable.CacheImpl; ! ! import org.webmacro.Broker; ! import org.webmacro.InitException; ! import org.webmacro.Log; ! import org.webmacro.ResourceException; ! import org.webmacro.util.Settings; ! import org.webmacro.util.SubSettings; ! ! /** * The GenerationalCacheManager implements the CacheManager * interface for WebMacro providers which extend the CachingProvider * base class. This implementation encapsulates the use of VFC * provided by Open Doors Software and incorporated into WM. */ public class GenerationalCacheManager implements CacheManager { --- 48,60 ---- * This cache manager supports reloadability * of a cache entry provided the cache element knows how ! * to test itself for having become stale.<p> ! * * The GenerationalCacheManager implements the CacheManager * interface for WebMacro providers which extend the CachingProvider * base class. This implementation encapsulates the use of VFC * provided by Open Doors Software and incorporated into WM. + * + * @author Lane Sharman (la...@op...) + * @since 0.96 */ public class GenerationalCacheManager implements CacheManager { Index: ReloadDelayDecorator.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/ReloadDelayDecorator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReloadDelayDecorator.java 11 Jun 2002 17:43:22 -0000 1.3 --- ReloadDelayDecorator.java 11 Nov 2002 19:22:37 -0000 1.4 *************** *** 1,2 **** --- 1,23 ---- + /* + * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted under the terms of either of the following + * Open Source licenses: + * + * The GNU General Public License, version 2, or any later version, as + * published by the Free Software Foundation + * (http://www.fsf.org/copyleft/gpl.html); + * + * or + * + * The Semiotek Public License (http://webmacro.org/LICENSE.) + * + * This software is provided "as is", with NO WARRANTY, not even the + * implied warranties of fitness to purpose, or merchantability. You + * assume all risks and liabilities associated with its use. + * + * See www.webmacro.org for more information on the WebMacro project. + */ package org.webmacro.resource; Index: URLTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplateProvider.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** URLTemplateProvider.java 12 Jun 2002 17:35:34 -0000 1.16 --- URLTemplateProvider.java 11 Nov 2002 19:22:37 -0000 1.17 *************** *** 390,394 **** } else if (tPart.startsWith(CONTEXT_PREFIX)) { - tPart = tPart.substring(CONTEXT_PREFIX_LENGTH); throw new IllegalStateException("Not implemented"); } --- 390,393 ---- Index: UrlProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/UrlProvider.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** UrlProvider.java 11 Jun 2002 17:43:22 -0000 1.12 --- UrlProvider.java 11 Nov 2002 19:22:37 -0000 1.13 *************** *** 119,123 **** length = 1024; } ! long now = System.currentTimeMillis(); long timeout = uc.getExpiration(); --- 119,123 ---- length = 1024; } ! /** long now = System.currentTimeMillis(); long timeout = uc.getExpiration(); *************** *** 131,134 **** --- 131,135 ---- timeout = MAX_TIMEOUT; else if (timeout < MIN_TIMEOUT) timeout = MIN_TIMEOUT; + **/ char buf[] = new char[1024]; |