You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/02/04 10:03:54 UTC
svn commit: r618211 - in
/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source:
AggregatingFallbackSourceFactory.java FallbackSourceFactory.java
Author: andreas
Date: Mon Feb 4 01:03:53 2008
New Revision: 618211
URL: http://svn.apache.org/viewvc?rev=618211&view=rev
Log:
Added URI caching for AggregatingFallbackSourceFactory.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java?rev=618211&r1=618210&r2=618211&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java Mon Feb 4 01:03:53 2008
@@ -24,19 +24,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.Request;
import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceFactory;
-import org.apache.excalibur.source.SourceUtil;
-import org.apache.excalibur.source.URIAbsolutizer;
+import org.apache.excalibur.store.impl.MRUMemoryStore;
import org.apache.lenya.cms.module.ModuleManager;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentUtil;
@@ -50,12 +41,39 @@
* Aggregate all existing fallback URIs by merging their XML content under
* the document element of the first encountered source.
*/
-public class AggregatingFallbackSourceFactory extends AbstractLogEnabled implements SourceFactory,
- Serviceable, Contextualizable, URIAbsolutizer {
-
+public class AggregatingFallbackSourceFactory extends FallbackSourceFactory {
+
+ private boolean useCache = true;
+
+ /**
+ * @see org.apache.excalibur.source.SourceFactory#getSource(java.lang.String, java.util.Map)
+ */
public Source getSource(final String location, Map parameters) throws IOException,
MalformedURLException {
+ MRUMemoryStore store = getStore();
+ String[] uris;
+ final String cacheKey = getCacheKey(location);
+ final String[] cachedUris = (String[]) store.get(cacheKey);
+
+ if (!useCache || cachedUris == null) {
+ uris = findUris(location, parameters);
+ store.hold(cacheKey, uris);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("No cached source URI for key " + cacheKey + ", caching resolved URIs.");
+ }
+ } else {
+ uris = cachedUris;
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Using cached source URIs for key " + cacheKey);
+ }
+ }
+ return new AggregatingSource(location, uris, this.manager);
+ }
+
+ protected String[] findUris(final String location, Map parameters) throws IOException,
+ MalformedURLException {
+
// Remove the protocol and the first '//'
int pos = location.indexOf("://");
@@ -134,8 +152,7 @@
allUris.add(contextSourceUri);
}
- String[] aggregateUris = (String[]) allUris.toArray(new String[allUris.size()]);
- return new AggregatingSource(location, aggregateUris, this.manager);
+ return (String[]) allUris.toArray(new String[allUris.size()]);
} catch (Exception e) {
throw new RuntimeException("Resolving path [" + location + "] failed: ", e);
@@ -144,25 +161,6 @@
this.manager.release(templateManager);
}
}
- }
-
- public void release(Source source) {
- }
-
- private ServiceManager manager;
-
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
- }
-
- private Context context;
-
- public void contextualize(Context context) throws ContextException {
- this.context = context;
- }
-
- public String absolutize(String baseURI, String location) {
- return SourceUtil.absolutize(baseURI, location, true);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java?rev=618211&r1=618210&r2=618211&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java Mon Feb 4 01:03:53 2008
@@ -62,8 +62,8 @@
public class FallbackSourceFactory extends AbstractLogEnabled implements SourceFactory,
Serviceable, Contextualizable, URIAbsolutizer {
- private static MRUMemoryStore store;
- private boolean useCache = false;
+ protected static MRUMemoryStore store;
+ private boolean useCache = true;
protected static final String STORE_ROLE = FallbackSourceFactory.class.getName() + "Store";
@@ -247,10 +247,10 @@
return new ExistingSourceResolver();
}
- private org.apache.avalon.framework.context.Context context;
+ protected org.apache.avalon.framework.context.Context context;
/** The ServiceManager */
- private ServiceManager manager;
+ protected ServiceManager manager;
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org