You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2003/10/18 21:53:32 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator BasicAggregator.java Aggregator.java AggregatorValve.java
weaver 2003/10/18 12:53:32
Modified: portal/src/java/org/apache/jetspeed/aggregator
BasicAggregator.java Aggregator.java
AggregatorValve.java
Log:
All fulcrum, ServiceUtil AND JetpseedServices references removed and
replaces with CPS.
Revision Changes Path
1.2 +6 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicAggregator.java 28 Jul 2003 23:47:36 -0000 1.1
+++ BasicAggregator.java 18 Oct 2003 19:53:32 -0000 1.2
@@ -57,8 +57,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Portlets;
@@ -68,6 +66,8 @@
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.jetspeed.container.PortletContainerFactory;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletContainer;
@@ -79,7 +79,7 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public class BasicAggregator extends BaseService
+public class BasicAggregator extends BaseCommonService
implements Aggregator
{
private final static Log log = LogFactory.getLog(BasicAggregator.class);
@@ -99,7 +99,7 @@
* @exception throws a <code>InitializationException</code> if the service
* fails to initialize
*/
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (isInitialized())
{
@@ -121,7 +121,7 @@
}
- private void initConfiguration() throws InitializationException
+ private void initConfiguration() throws CPSInitializationException
{
String defaultStrategy = getConfiguration().getString(DEFAULT_STRATEGY,
CONFIG_STRATEGY_SEQUENTIAL);
1.2 +4 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Aggregator.java
Index: Aggregator.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Aggregator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Aggregator.java 28 Jul 2003 23:47:36 -0000 1.1
+++ Aggregator.java 18 Oct 2003 19:53:32 -0000 1.2
@@ -53,9 +53,10 @@
*/
package org.apache.jetspeed.aggregator;
-import org.apache.fulcrum.Service;
+
+import org.apache.jetspeed.cps.CommonService;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.request.RequestContext;
@@ -65,7 +66,7 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface Aggregator extends Service
+public interface Aggregator extends CommonService
{
public String SERVICE_NAME = "Aggregator";
1.2 +3 -4 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java
Index: AggregatorValve.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregatorValve.java 28 Jul 2003 23:47:36 -0000 1.1
+++ AggregatorValve.java 18 Oct 2003 19:53:32 -0000 1.2
@@ -57,8 +57,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.services.JetspeedServices;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
@@ -79,8 +79,7 @@
{
try
{
- Aggregator aggregator = (Aggregator)JetspeedServices
- .getInstance().getService(Aggregator.SERVICE_NAME);
+ Aggregator aggregator = (Aggregator)CommonPortletServices.getPortalService(Aggregator.SERVICE_NAME);
aggregator.build(request);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org