Author: taylor
Date: Wed Sep 7 16:45:24 2005
New Revision: 279463
URL: http://svn.apache.org/viewcvs?rev=279463&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-360 - Springize Aggregation
refactored spring assembly of aggregation components
made work manager a component, with configurable workers parameters
made the header resource factory a component
dependency injected new components associations into render and aggregator
abstracted out content manager coupling from aggregator via an adapter (JS2-24)
started on a new 'experimental' aggregator: AsyncPageAggregatorImpl
This aggregator is under development and will be changing over the next week quite a bit
It is NOT hooked into the pipeline
Modified:
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java?rev=279463&r1=279462&r2=279463&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
Wed Sep 7 16:45:24 2005
@@ -20,8 +20,11 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.jetspeed.aggregator.impl.ContentServerAdapterImpl;
import org.apache.jetspeed.aggregator.impl.PageAggregatorImpl;
import org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl;
+import org.apache.jetspeed.headerresource.HeaderResourceFactory;
+import org.apache.jetspeed.headerresource.impl.HeaderResourceFactoryImpl;
/**
* <P>Test the aggregation service</P>
@@ -49,13 +52,16 @@
{
super.setUp();
- ArrayList pathes = new ArrayList(4);
- pathes.add("portlet/{mediaType}/jetspeed");
- pathes.add("portlet/{mediaType}");
- pathes.add("generic/{mediaType}");
- pathes.add("/{mediaType}");
-
- pageAggregator = new PageAggregatorImpl(renderer, pathes);
+ ArrayList paths = new ArrayList(4);
+ paths.add("portlet/{mediaType}/jetspeed");
+ paths.add("portlet/{mediaType}");
+ paths.add("generic/{mediaType}");
+ paths.add("/{mediaType}");
+
+ HeaderResourceFactory headerFactory = new HeaderResourceFactoryImpl();
+ ContentServerAdapter contentServer = new ContentServerAdapterImpl(headerFactory,
paths);
+
+ pageAggregator = new PageAggregatorImpl(renderer, contentServer);
portletAggregator = new PortletAggregatorImpl(renderer);
}
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java?rev=279463&r1=279462&r2=279463&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java
Wed Sep 7 16:45:24 2005
@@ -20,6 +20,7 @@
import org.apache.jetspeed.AbstractPortalContainerTestCase;
import org.apache.jetspeed.aggregator.impl.PortletRendererImpl;
+import org.apache.jetspeed.aggregator.impl.WorkerMonitorImpl;
/**
* TestPortletRenderer
@@ -45,8 +46,10 @@
protected void setUp() throws Exception
{
super.setUp();
+ WorkerMonitor monitor = new WorkerMonitorImpl(5, 20, 5, 10);
+ monitor.start();
- renderer = new PortletRendererImpl(portletContainer, windowAccessor);
+ renderer = new PortletRendererImpl(portletContainer, windowAccessor, monitor);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org
|