taylor 2004/03/15 12:40:29
Modified: portal/src/java/org/apache/jetspeed/aggregator
BasicAggregator.java
portal/src/java/org/apache/jetspeed/aggregator/impl
PortletRendererImpl.java
Removed: portal/src/java/org/apache/jetspeed/aggregator
PortletWindowFactory.java
Log:
remove PortletWindowFactory
Revision Changes Path
1.12 +6 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java
Index: BasicAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicAggregator.java 9 Mar 2004 19:35:46 -0000 1.11
+++ BasicAggregator.java 15 Mar 2004 20:40:29 -0000 1.12
@@ -26,6 +26,7 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.container.PortletContainerFactory;
+import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.cps.BaseCommonService;
import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.jetspeed.engine.core.PortalControlParameter;
@@ -179,7 +180,10 @@
throw new JetspeedException("Failed to load: " + fragment.getName()
+ " from registry");
}
- PortletWindow portletWindow =
PortletWindowFactory.getWindow(portletDefinition, fragment.getName());
+ // TODO: make renderer a component, assemble window accessor in
constructor
+ PortletWindowAccessor windowAccess =
(PortletWindowAccessor)Jetspeed.getComponentManager().getComponent(PortletWindowAccessor.class);
+
+ PortletWindow portletWindow = windowAccess.getPortletWindow(fragment);
HttpServletRequest servletRequest =
request.getRequestForWindow(portletWindow);
HttpServletResponse servletResponse =
request.getResponseForWindow(portletWindow);
1.14 +2 -6
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
Index: PortletRendererImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PortletRendererImpl.java 15 Mar 2004 19:38:00 -0000 1.13
+++ PortletRendererImpl.java 15 Mar 2004 20:40:29 -0000 1.14
@@ -26,7 +26,6 @@
import org.apache.jetspeed.aggregator.ContentDispatcherCtrl;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.aggregator.UnknownPortletDefinitionException;
-import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.container.PortletContainerFactory;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.cps.BaseCommonService;
@@ -189,10 +188,7 @@
protected PortletWindow getPortletWindow(Fragment fragment) throws
UnknownPortletDefinitionException
{
ObjectID oid = JetspeedObjectID.createFromString(fragment.getId());
-
- // TODO: make renderer a component, assemble entity accessor in constructor
- PortletEntityAccessComponent entityAccess = (PortletEntityAccessComponent)
Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
-
+
// TODO: make renderer a component, assemble window accessor in constructor
PortletWindowAccessor windowAccess =
(PortletWindowAccessor)Jetspeed.getComponentManager().getComponent(PortletWindowAccessor.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
