weaver 2003/10/18 12:54:05
Modified: portal/src/java/org/apache/jetspeed/container/services/log
ContainerLogAdaptorService.java
ContainerLogAdaptorServiceImpl.java
ContainerLogAdaptor.java
Log:
All fulcrum, ServiceUtil AND JetpseedServices references removed and
replaces with CPS.
Revision Changes Path
1.2 +4 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/services/log/ContainerLogAdaptorService.java
Index: ContainerLogAdaptorService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/services/log/ContainerLogAdaptorService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerLogAdaptorService.java 28 Jul 2003 23:47:38 -0000 1.1
+++ ContainerLogAdaptorService.java 18 Oct 2003 19:54:05 -0000 1.2
@@ -53,7 +53,8 @@
*/
package org.apache.jetspeed.container.services.log;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
+
/**
* Defines the adaptor interface between Pluto's container logging and Jetspeed
(Commons) logging.
@@ -63,7 +64,7 @@
* @version $Id$
*/
public interface ContainerLogAdaptorService
- extends Service
+ extends CommonService
{
public String SERVICE_NAME = "logadaptor";
}
1.2 +6 -5
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/services/log/ContainerLogAdaptorServiceImpl.java
Index: ContainerLogAdaptorServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/services/log/ContainerLogAdaptorServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerLogAdaptorServiceImpl.java 28 Jul 2003 23:47:38 -0000 1.1
+++ ContainerLogAdaptorServiceImpl.java 18 Oct 2003 19:54:05 -0000 1.2
@@ -56,9 +56,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.LogConfigurationException;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.pluto.services.log.LogService;
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
+
/**
* Implements the logging service adaptor for the Pluto container
@@ -73,7 +74,7 @@
* @version $Id$
*/
public class ContainerLogAdaptorServiceImpl
- extends BaseService
+ extends BaseCommonService
implements ContainerLogAdaptorService, LogService
{
private final static Log defaultLog =
LogFactory.getLog(ContainerLogAdaptorServiceImpl.class);
@@ -90,7 +91,7 @@
* fails to initialize
*/
public void init()
- throws InitializationException
+ throws CPSInitializationException
{
defaultLog.info("ContainerLogAdaptor init");
1.2 +4 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/services/log/ContainerLogAdaptor.java
Index: ContainerLogAdaptor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/services/log/ContainerLogAdaptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerLogAdaptor.java 28 Jul 2003 23:47:38 -0000 1.1
+++ ContainerLogAdaptor.java 18 Oct 2003 19:54:05 -0000 1.2
@@ -53,7 +53,8 @@
*/
package org.apache.jetspeed.container.services.log;
-import org.apache.jetspeed.services.JetspeedServices;
+
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.pluto.services.log.LogService;
/**
@@ -72,7 +73,7 @@
*/
protected static ContainerLogAdaptorService getServiceImpl()
{
- return (ContainerLogAdaptorService)JetspeedServices
+ return (ContainerLogAdaptorService)CommonPortletServices
.getInstance().getService(ContainerLogAdaptorService.SERVICE_NAME);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
