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:54:51 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml PsmlManager.java PsmlManagerService.java CastorPsmlManagerService.java
weaver 2003/10/18 12:54:51
Modified: portal/src/java/org/apache/jetspeed/services/idgenerator
JetspeedIdGenerator.java
JetspeedIdGeneratorService.java
IdGeneratorService.java
portal/src/java/org/apache/jetspeed/services/profiler
Profiler.java JetspeedProfilerService.java
ProfilerService.java
portal/src/java/org/apache/jetspeed/services/jmx JMX.java
JetspeedJMXService.java
portal/src/java/org/apache/jetspeed/services/information
InformationProviderServiceImpl.java
InformationProviderManager.java
portal/src/java/org/apache/jetspeed/services/entity
PortletEntityServiceImpl.java
PortletEntityService.java PortletEntityAccess.java
portal/src/java/org/apache/jetspeed/services/registry
JetspeedRegistry.java PortletRegistryService.java
RegistryService.java JetspeedPortletRegistry.java
portal/src/java/org/apache/jetspeed/services/registry/impl
CastorConfiguration.java
PersistentPortletRegistryService.java
CastorRegistryService.java
StandardRegistryService.java
portal/src/java/org/apache/jetspeed/services/factory
FactoryManager.java FactoryManagementService.java
FactoryManagerServiceImpl.java
portal/src/java/org/apache/jetspeed/services/psml
PsmlManager.java PsmlManagerService.java
CastorPsmlManagerService.java
Removed: portal/src/java/org/apache/jetspeed/util ServiceUtil.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/services/idgenerator/JetspeedIdGenerator.java
Index: JetspeedIdGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedIdGenerator.java 28 Jul 2003 23:47:47 -0000 1.1
+++ JetspeedIdGenerator.java 18 Oct 2003 19:54:50 -0000 1.2
@@ -53,7 +53,8 @@
*/
package org.apache.jetspeed.services.idgenerator;
-import org.apache.jetspeed.services.JetspeedServices;
+import org.apache.jetspeed.cps.CommonPortletServices;
+
/**
* Static accessor for the IdGeneatorService
@@ -72,7 +73,7 @@
*/
protected static IdGeneratorService getService()
{
- return (IdGeneratorService)JetspeedServices
+ return (IdGeneratorService)CommonPortletServices
.getInstance().getService(IdGeneratorService.SERVICE_NAME);
}
1.2 +7 -6 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java
Index: JetspeedIdGeneratorService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedIdGeneratorService.java 28 Jul 2003 23:47:47 -0000 1.1
+++ JetspeedIdGeneratorService.java 18 Oct 2003 19:54:50 -0000 1.2
@@ -54,10 +54,11 @@
package org.apache.jetspeed.services.idgenerator;
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
/**
* Simple implementation of the IdGeneratorService.
@@ -65,7 +66,7 @@
* @author <a href="mailto:paulsp@apache.org">Paul Spencer</a>
* @version $Id$
*/
-public class JetspeedIdGeneratorService extends BaseService
+public class JetspeedIdGeneratorService extends BaseCommonService
implements IdGeneratorService
{
private final static Log log = LogFactory.getLog(JetspeedIdGeneratorService.class);
@@ -94,7 +95,7 @@
* fails to initialize
*/
public void init()
- throws InitializationException
+ throws CPSInitializationException
{
log.info( "JetspeedIdGeneratorService init");
@@ -127,7 +128,7 @@
* @exception throws a <code>InitializationException</code> if the service
* fails to initialize
*/
- private void initConfiguration() throws InitializationException
+ private void initConfiguration() throws CPSInitializationException
{
peidPrefix = getConfiguration().getString( CONFIG_PEID_PREFIX, DEFAULT_CONFIG_PEID_PREFIX );
peidSuffix = getConfiguration().getString( CONFIG_PEID_SUFFIX, DEFAULT_CONFIG_PEID_SUFFIX );
1.2 +4 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/idgenerator/IdGeneratorService.java
Index: IdGeneratorService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/idgenerator/IdGeneratorService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdGeneratorService.java 28 Jul 2003 23:47:47 -0000 1.1
+++ IdGeneratorService.java 18 Oct 2003 19:54:50 -0000 1.2
@@ -53,7 +53,8 @@
*/
package org.apache.jetspeed.services.idgenerator;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
+
/**
* This service handles the generation of unique identifiers
@@ -61,7 +62,7 @@
* @author <a href="mailto:paulsp@apache.org">Paul Spencer</a>
* @version $Id$
*/
-public interface IdGeneratorService extends Service
+public interface IdGeneratorService extends CommonService
{
public String SERVICE_NAME = "IdGenerator";
1.2 +2 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/Profiler.java
Index: Profiler.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/Profiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Profiler.java 28 Jul 2003 23:47:49 -0000 1.1
+++ Profiler.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.Iterator;
-import org.apache.jetspeed.services.JetspeedServices;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.QueryLocator;
@@ -63,7 +63,6 @@
import org.apache.jetspeed.om.profile.Portlets;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.services.profiler.ProfilerService;
public class Profiler
{
@@ -86,7 +85,7 @@
*/
public static ProfilerService getService()
{
- return (ProfilerService)JetspeedServices
+ return (ProfilerService)CommonPortletServices
.getInstance().getService(ProfilerService.SERVICE_NAME);
}
1.2 +6 -6 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedProfilerService.java 28 Jul 2003 23:47:49 -0000 1.1
+++ JetspeedProfilerService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -60,8 +60,8 @@
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.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.jetspeed.om.profile.BasePSMLDocument;
import org.apache.jetspeed.om.profile.BaseProfile;
import org.apache.jetspeed.om.profile.BaseProfileLocator;
@@ -101,7 +101,7 @@
* @version $Id$
*/
-public class JetspeedProfilerService extends BaseService
+public class JetspeedProfilerService extends BaseCommonService
implements ProfilerService
{
@@ -165,7 +165,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())
{
@@ -381,7 +381,7 @@
* @exception throws a <code>InitializationException</code> if the service
* fails to initialize
*/
- private void initConfiguration() throws InitializationException
+ private void initConfiguration() throws CPSInitializationException
{
resourceDefault = getConfiguration().getString( CONFIG_RESOURCE_DEFAULT, DEFAULT_CONFIG_RESOURCE_DEFAULT );
1.2 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java
Index: ProfilerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfilerService.java 28 Jul 2003 23:47:49 -0000 1.1
+++ ProfilerService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.Iterator;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
import org.apache.jetspeed.om.profile.Portlets;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.ProfileException;
@@ -72,7 +72,7 @@
* @version $Id$
*/
-public interface ProfilerService extends Service
+public interface ProfilerService extends CommonService
{
/** The name of this service */
1.2 +4 -4 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/jmx/JMX.java
Index: JMX.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/jmx/JMX.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMX.java 28 Jul 2003 23:47:48 -0000 1.1
+++ JMX.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -55,9 +55,9 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-
import org.apache.commons.modeler.ManagedBean;
-import org.apache.jetspeed.util.ServiceUtil;
+import org.apache.jetspeed.cps.CommonPortletServices;
+
/**
@@ -92,7 +92,7 @@
private static JetspeedJMXService getService()
{
- return (JetspeedJMXService) ServiceUtil.getServiceByName(JetspeedJMXService.SERVICE_NAME);
+ return (JetspeedJMXService) CommonPortletServices.getPortalService(JetspeedJMXService.SERVICE_NAME);
}
public static String[] getManagedBeans()
{
1.3 +13 -12 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/jmx/JetspeedJMXService.java
Index: JetspeedJMXService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/jmx/JetspeedJMXService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedJMXService.java 15 Aug 2003 00:27:54 -0000 1.2
+++ JetspeedJMXService.java 18 Oct 2003 19:54:51 -0000 1.3
@@ -75,8 +75,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
/**
*
@@ -190,7 +190,7 @@
* @version $Id$
*
*/
-public class JetspeedJMXService extends BaseService
+public class JetspeedJMXService extends BaseCommonService
{
public static final String SERVICE_NAME = "JMXService";
private MBeanServer server;
@@ -213,7 +213,7 @@
isLocked = false;
}
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (isInitialized())
{
@@ -248,7 +248,8 @@
File mbeanFile = new File(getRealPath(descriptor));
if (!mbeanFile.exists())
{
- throw new InitializationException("MBean descriptor " + mbeanFile.getCanonicalPath() + " could not be found.");
+ throw new CPSInitializationException(
+ "MBean descriptor " + mbeanFile.getCanonicalPath() + " could not be found.");
}
stream = new BufferedInputStream(new FileInputStream(mbeanFile));
}
@@ -263,7 +264,7 @@
}
catch (Exception e)
{
- throw new InitializationException("Failed to load registry: " + descriptor);
+ throw new CPSInitializationException("Failed to load registry: " + descriptor);
}
server = Registry.getServer();
@@ -332,13 +333,13 @@
log.fatal("Unable to start JMX service", e);
// roll back all registered beans
removeAllMBeans();
- if (e instanceof InitializationException)
+ if (e instanceof CPSInitializationException)
{
- throw (InitializationException) e;
+ throw (CPSInitializationException) e;
}
else
{
- throw new InitializationException("Unable to start JMX service", e);
+ throw new CPSInitializationException("Unable to start JMX service", e);
}
}
@@ -348,7 +349,7 @@
}
}
- protected void initRemoteAccess(Configuration conf) throws InitializationException
+ protected void initRemoteAccess(Configuration conf) throws CPSInitializationException
{
// Create a MBeanServer
try
@@ -413,7 +414,7 @@
{
String msg = "Unable to start Jetspeed JMX remote services.";
log.error(msg, e);
- throw new InitializationException(msg, e);
+ throw new CPSInitializationException(msg, e);
}
}
1.5 +5 -5 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
Index: InformationProviderServiceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InformationProviderServiceImpl.java 8 Oct 2003 04:36:39 -0000 1.4
+++ InformationProviderServiceImpl.java 18 Oct 2003 19:54:51 -0000 1.5
@@ -55,8 +55,8 @@
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.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.pluto.factory.Factory;
import org.apache.pluto.services.information.DynamicInformationProvider;
import org.apache.pluto.services.information.StaticInformationProvider;
@@ -67,7 +67,7 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public class InformationProviderServiceImpl extends BaseService implements Factory, InformationProviderServiceService
+public class InformationProviderServiceImpl extends BaseCommonService implements Factory, InformationProviderServiceService
{
private javax.servlet.ServletConfig servletConfig;
private static final Log log = LogFactory.getLog(InformationProviderServiceImpl.class);
@@ -157,7 +157,7 @@
/**
* @see org.apache.fulcrum.Service#init()
*/
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (!isInitialized())
{
1.2 +4 -4 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderManager.java
Index: InformationProviderManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InformationProviderManager.java 28 Jul 2003 23:47:47 -0000 1.1
+++ InformationProviderManager.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -53,8 +53,7 @@
*/
package org.apache.jetspeed.services.information;
-import org.apache.jetspeed.util.ServiceUtil;
-
+import org.apache.jetspeed.cps.CommonPortletServices;
/**
* InformationProviderManager
@@ -68,6 +67,7 @@
public static final InformationProviderServiceService getService()
{
- return (InformationProviderServiceService) ServiceUtil.getServiceByName(InformationProviderServiceService.SERVICE_NAME);
+ return (InformationProviderServiceService) CommonPortletServices.getPortalService(
+ InformationProviderServiceService.SERVICE_NAME);
}
}
1.9 +7 -7 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java
Index: PortletEntityServiceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PortletEntityServiceImpl.java 17 Oct 2003 19:59:49 -0000 1.8
+++ PortletEntityServiceImpl.java 18 Oct 2003 19:54:51 -0000 1.9
@@ -55,14 +55,14 @@
import java.util.HashMap;
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.entity.impl.PortletEntityImpl;
import org.apache.jetspeed.persistence.LookupCriteria;
import org.apache.jetspeed.persistence.PersistencePlugin;
import org.apache.jetspeed.persistence.PersistenceService;
import org.apache.jetspeed.util.JetspeedObjectID;
-import org.apache.jetspeed.util.ServiceUtil;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.entity.PortletEntityCtrl;
@@ -77,7 +77,7 @@
* @version $Id$
*
*/
-public class PortletEntityServiceImpl extends BaseService implements PortletEntityService
+public class PortletEntityServiceImpl extends BaseCommonService implements PortletEntityService
{
// TODO: this should eventually use a system cach like JCS
@@ -88,11 +88,11 @@
/**
* @see org.apache.fulcrum.Service#init()
*/
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (!isInitialized())
{
- PersistenceService ps = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ PersistenceService ps = (PersistenceService) CommonPortletServices.getPortalService(PersistenceService.SERVICE_NAME);
String pluginName = getConfiguration().getString("persistence.plugin.name", "jetspeed");
autoCreateNewEntities = getConfiguration().getBoolean("autocreate", false);
plugin = ps.getPersistencePlugin(pluginName);
1.4 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityService.java
Index: PortletEntityService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletEntityService.java 17 Oct 2003 19:57:26 -0000 1.3
+++ PortletEntityService.java 18 Oct 2003 19:54:51 -0000 1.4
@@ -53,8 +53,8 @@
*/
package org.apache.jetspeed.services.entity;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -68,7 +68,7 @@
* @version $Id$
*
*/
-public interface PortletEntityService extends Service
+public interface PortletEntityService extends CommonService
{
String SERVICE_NAME = "PortletEntityService";
1.5 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java
Index: PortletEntityAccess.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletEntityAccess.java 17 Oct 2003 19:57:26 -0000 1.4
+++ PortletEntityAccess.java 18 Oct 2003 19:54:51 -0000 1.5
@@ -53,7 +53,7 @@
*/
package org.apache.jetspeed.services.entity;
-import org.apache.jetspeed.util.ServiceUtil;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -81,7 +81,7 @@
protected static PortletEntityService getService()
{
- return (PortletEntityService) ServiceUtil.getServiceByName(PortletEntityService.SERVICE_NAME);
+ return (PortletEntityService) CommonPortletServices.getPortalService(PortletEntityService.SERVICE_NAME);
}
}
1.2 +15 -19 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/JetspeedRegistry.java
Index: JetspeedRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/JetspeedRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedRegistry.java 28 Jul 2003 23:47:50 -0000 1.1
+++ JetspeedRegistry.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -56,11 +56,10 @@
import java.util.Enumeration;
+import org.apache.jetspeed.cps.CommonPortletServices;
+import org.apache.jetspeed.om.registry.Registry;
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.RegistryException;
-import org.apache.jetspeed.services.JetspeedServices;
-import org.apache.jetspeed.om.registry.Registry;
-
/**
* <P>This is a commodity static accessor class around the
@@ -79,9 +78,7 @@
*/
private static RegistryService getService()
{
- return (RegistryService)JetspeedServices
- .getInstance()
- .getService(RegistryService.SERVICE_NAME);
+ return (RegistryService) CommonPortletServices.getInstance().getService(RegistryService.SERVICE_NAME);
}
/**
@@ -95,41 +92,40 @@
/**
* @see RegistryService#get
*/
- public static Registry get( String regName )
+ public static Registry get(String regName)
{
- return getService().get( regName );
+ return getService().get(regName);
}
/**
* @see RegistryService#createEntry
*/
- public static RegistryEntry createEntry( String regName )
+ public static RegistryEntry createEntry(String regName)
{
- return getService().createEntry( regName );
- }
+ return getService().createEntry(regName);
+ }
/**
* @see RegistryService#getEntry
*/
- public static RegistryEntry getEntry( String regName, String entryName )
+ public static RegistryEntry getEntry(String regName, String entryName)
{
- return getService().getEntry( regName, entryName );
+ return getService().getEntry(regName, entryName);
}
/**
* @see RegistryService#addEntry
*/
- public static void addEntry( String regName, RegistryEntry value )
- throws RegistryException
+ public static void addEntry(String regName, RegistryEntry value) throws RegistryException
{
- getService().addEntry( regName, value );
+ getService().addEntry(regName, value);
}
/**
* @see RegistryService#removeEntry
*/
- public static void removeEntry( String regName, String entryName )
+ public static void removeEntry(String regName, String entryName)
{
- getService().removeEntry( regName, entryName );
+ getService().removeEntry(regName, entryName);
}
}
1.4 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/PortletRegistryService.java
Index: PortletRegistryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/PortletRegistryService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletRegistryService.java 5 Aug 2003 16:22:50 -0000 1.3
+++ PortletRegistryService.java 18 Oct 2003 19:54:51 -0000 1.4
@@ -58,7 +58,7 @@
import java.util.List;
import java.util.Locale;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
import org.apache.jetspeed.exception.RegistryException;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
@@ -77,7 +77,7 @@
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
* @version $Id$
*/
-public interface PortletRegistryService extends Service
+public interface PortletRegistryService extends CommonService
{
/** The name of this service */
1.2 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/RegistryService.java
Index: RegistryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/RegistryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegistryService.java 28 Jul 2003 23:47:50 -0000 1.1
+++ RegistryService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.Enumeration;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.RegistryException;
import org.apache.jetspeed.om.registry.Registry;
@@ -68,7 +68,7 @@
* @version $Id$
*
*/
-public interface RegistryService extends Service
+public interface RegistryService extends CommonService
{
/** Default Skin Registry name */
public static String SKIN = "Skin";
1.5 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/JetspeedPortletRegistry.java
Index: JetspeedPortletRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/JetspeedPortletRegistry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedPortletRegistry.java 5 Aug 2003 16:22:50 -0000 1.4
+++ JetspeedPortletRegistry.java 18 Oct 2003 19:54:51 -0000 1.5
@@ -57,6 +57,7 @@
import java.util.List;
import java.util.Locale;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.exception.RegistryException;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
@@ -65,7 +66,6 @@
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
-import org.apache.jetspeed.util.ServiceUtil;
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
@@ -255,7 +255,7 @@
private static final PortletRegistryService getService()
{
- return (PortletRegistryService) ServiceUtil.getServiceByName(
+ return (PortletRegistryService) CommonPortletServices.getPortalService(
PortletRegistryService.SERVICE_NAME);
}
1.2 +4 -4 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/CastorConfiguration.java
Index: CastorConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/CastorConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CastorConfiguration.java 28 Jul 2003 23:47:51 -0000 1.1
+++ CastorConfiguration.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -72,7 +72,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fulcrum.InitializationException;
+import org.apache.jetspeed.cps.CPSInitializationException;
/**
** CastorConfiguration class normalizes access to string attributes set within the Castor Configuration,
@@ -125,7 +125,7 @@
* @return InputSource The input source to the memory image of the normalized XML configuration.
*/
public InputSource load(String configPath)
- throws InitializationException
+ throws CPSInitializationException
{
this.configurationName = configPath;
boolean normalizedUrl = false;
@@ -213,7 +213,7 @@
catch (Throwable t)
{
t.printStackTrace();
- throw new InitializationException(t.toString());
+ throw new CPSInitializationException(t.toString());
}
return inputSource;
}
1.11 +9 -9 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/PersistentPortletRegistryService.java
Index: PersistentPortletRegistryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/PersistentPortletRegistryService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PersistentPortletRegistryService.java 17 Oct 2003 19:58:32 -0000 1.10
+++ PersistentPortletRegistryService.java 18 Oct 2003 19:54:51 -0000 1.11
@@ -61,8 +61,9 @@
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.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.exception.RegistryException;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
@@ -81,7 +82,6 @@
import org.apache.jetspeed.persistence.PersistenceService;
import org.apache.jetspeed.services.registry.PortletRegistryService;
import org.apache.jetspeed.util.ArgUtil;
-import org.apache.jetspeed.util.ServiceUtil;
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
@@ -89,7 +89,7 @@
/**
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
*/
-public class PersistentPortletRegistryService extends BaseService implements PortletRegistryService
+public class PersistentPortletRegistryService extends BaseCommonService implements PortletRegistryService
{
private PersistencePlugin plugin;
@@ -102,12 +102,12 @@
/**
* @see org.apache.fulcrum.Service#init()
*/
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (!isInitialized())
{
- PersistenceService ps = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
-
+ // PersistenceService ps = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ PersistenceService ps = (PersistenceService) CommonPortletServices.getPortalService(PersistenceService.SERVICE_NAME);
String pluginName = getConfiguration().getString("persistence.plugin.name", "jetspeed");
plugin = ps.getPersistencePlugin(pluginName);
@@ -383,7 +383,7 @@
new String[] { "newApp", "system" },
"registerPortletApplication(PortletApplicationDefinition newApp, String system)");
- PersistenceService ps = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ PersistenceService ps = (PersistenceService) CommonPortletServices.getPortalService(PersistenceService.SERVICE_NAME);
PersistencePlugin usePlugin = ps.getPersistencePlugin(system);
registerPortletApplication(newApp, usePlugin);
}
@@ -429,7 +429,7 @@
if (system != null)
{
- PersistenceService ps = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ PersistenceService ps = (PersistenceService) CommonPortletServices.getPortalService(PersistenceService.SERVICE_NAME);
originalPlugin = this.plugin;
this.plugin = ps.getPersistencePlugin(system);
}
1.2 +9 -9 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/CastorRegistryService.java
Index: CastorRegistryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/CastorRegistryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CastorRegistryService.java 28 Jul 2003 23:47:51 -0000 1.1
+++ CastorRegistryService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -71,8 +71,8 @@
import org.apache.commons.configuration.Configuration;
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.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.jetspeed.om.registry.Registry;
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.RegistryException;
@@ -117,7 +117,7 @@
* @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
* @version $Id$
*/
-public class CastorRegistryService extends BaseService
+public class CastorRegistryService extends BaseCommonService
implements RegistryService, FileRegistry
{
protected final static Log log =
@@ -364,7 +364,7 @@
* This is the early initialization method called by the
* Turbine <code>Service</code> framework
*/
- public void initConfiguration() throws InitializationException
+ public void initConfiguration() throws CPSInitializationException
{
String mapFile = null;
Vector names = new Vector();
@@ -405,7 +405,7 @@
catch (Exception e)
{
log.error("RegistryService: Registry init error", e);
- throw new InitializationException("Unable to initialize CastorRegistryService, invalid registries definition");
+ throw new CPSInitializationException("Unable to initialize CastorRegistryService, invalid registries definition");
}
////
// create the serializer output format
@@ -430,12 +430,12 @@
catch (Exception e)
{
log.error("RegistryService: Error in mapping creation", e);
- throw new InitializationException("Error in mapping", e);
+ throw new CPSInitializationException("Error in mapping", e);
}
}
else
{
- throw new InitializationException(
+ throw new CPSInitializationException(
"Mapping not found or not a file or unreadable: "
+ mapFile);
}
@@ -520,7 +520,7 @@
}
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
log.info( "Initalizing service");
1.2 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/StandardRegistryService.java
Index: StandardRegistryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/registry/impl/StandardRegistryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardRegistryService.java 28 Jul 2003 23:47:52 -0000 1.1
+++ StandardRegistryService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -53,7 +53,7 @@
*/
package org.apache.jetspeed.services.registry.impl;
-import org.apache.fulcrum.InitializationException;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.RegistryException;
@@ -151,7 +151,7 @@
super.removeEntry(regName, entryName);
}
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (isInitialized())
1.2 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/factory/FactoryManager.java
Index: FactoryManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/factory/FactoryManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryManager.java 28 Jul 2003 23:47:47 -0000 1.1
+++ FactoryManager.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -53,9 +53,9 @@
*/
package org.apache.jetspeed.services.factory;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.pluto.factory.Factory;
import org.apache.pluto.services.factory.FactoryManagerService;
-import org.apache.jetspeed.services.JetspeedServices;
/**
@@ -76,7 +76,7 @@
*/
protected static FactoryManagementService getServiceImpl()
{
- return (FactoryManagementService)JetspeedServices
+ return (FactoryManagementService)CommonPortletServices
.getInstance().getService(FactoryManagementService.SERVICE_NAME);
}
1.2 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/factory/FactoryManagementService.java
Index: FactoryManagementService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/factory/FactoryManagementService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryManagementService.java 28 Jul 2003 23:47:47 -0000 1.1
+++ FactoryManagementService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -53,7 +53,7 @@
*/
package org.apache.jetspeed.services.factory;
-import org.apache.fulcrum.Service;
+import org.apache.jetspeed.cps.CommonService;
import org.apache.pluto.factory.Factory;
/**
@@ -65,7 +65,7 @@
* @version $Id$
*/
public interface FactoryManagementService
- extends Service
+ extends CommonService
{
public String SERVICE_NAME = "factory";
1.2 +10 -10 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/factory/FactoryManagerServiceImpl.java
Index: FactoryManagerServiceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/factory/FactoryManagerServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryManagerServiceImpl.java 28 Jul 2003 23:47:47 -0000 1.1
+++ FactoryManagerServiceImpl.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -60,8 +60,6 @@
import java.util.Iterator;
import javax.servlet.ServletConfig;
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.configuration.Configuration;
@@ -71,6 +69,8 @@
import org.apache.pluto.util.StringUtils;
import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
/**
* Manages the life-time of factories registered during container startup.
@@ -81,7 +81,7 @@
* @version $Id$
*/
public class FactoryManagerServiceImpl
- extends BaseService
+ extends BaseCommonService
implements FactoryManagementService, FactoryManagerService
{
private final static Log log = LogFactory.getLog(FactoryManagerServiceImpl.class);
@@ -100,7 +100,7 @@
* fails to initialize
*/
public void init()
- throws InitializationException
+ throws CPSInitializationException
{
log.info("FactoryManagerService init");
@@ -154,7 +154,7 @@
// protected void initConfiguration (ServletConfig config, Properties aProperties) throws Exception
protected void initConfiguration ()
- throws InitializationException
+ throws CPSInitializationException
{
ServletConfig servletConfig = Jetspeed.getEngine().getServletConfig();
Configuration config = Jetspeed.getContext().getConfiguration();
@@ -235,26 +235,26 @@
{
String msg = "FactoryManager: A factory implementation with name " + factoryImplName + " cannot be found.";
log.error(msg, exc);
- throw new InitializationException(msg, exc);
+ throw new CPSInitializationException(msg, exc);
}
catch (ClassCastException exc)
{
String msg = "FactoryManager: Factory implementation "
+ factoryImplName + " is not a factory of the required type.";
log.error (msg, exc);
- throw new InitializationException(msg, exc);
+ throw new CPSInitializationException(msg, exc);
}
catch (InstantiationException exc)
{
String msg = "FactoryManager: Factory implementation " + factoryImplName + " cannot be instantiated.";
log.error(msg , exc);
- throw new InitializationException(msg, exc);
+ throw new CPSInitializationException(msg, exc);
}
catch (Exception exc)
{
String msg = "FactoryManager: An unidentified error occurred";
log.error(msg, exc);
- throw new InitializationException(msg, exc);
+ throw new CPSInitializationException(msg, exc);
}
if (factory != null)
1.2 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml/PsmlManager.java
Index: PsmlManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml/PsmlManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PsmlManager.java 28 Jul 2003 23:47:50 -0000 1.1
+++ PsmlManager.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -56,7 +56,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.jetspeed.services.JetspeedServices;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.QueryLocator;
@@ -79,7 +79,7 @@
*/
public static PsmlManagerService getService()
{
- return (PsmlManagerService)JetspeedServices
+ return (PsmlManagerService)CommonPortletServices
.getInstance().getService(PsmlManagerService.SERVICE_NAME);
}
1.2 +5 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml/PsmlManagerService.java
Index: PsmlManagerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml/PsmlManagerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PsmlManagerService.java 28 Jul 2003 23:47:50 -0000 1.1
+++ PsmlManagerService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -55,11 +55,13 @@
import java.util.Iterator;
import java.util.List;
+
+import org.apache.jetspeed.cps.CommonService;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.QueryLocator;
import org.apache.jetspeed.om.profile.Profile;
-import org.apache.fulcrum.Service;
+
/**
* This service is responsible for loading and saving PSML documents.
@@ -69,7 +71,7 @@
*
* @version $Id$
*/
-public interface PsmlManagerService extends Service
+public interface PsmlManagerService extends CommonService
{
/** The name of the service */
public String SERVICE_NAME = "PsmlManager";
1.2 +8 -8 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/psml/CastorPsmlManagerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CastorPsmlManagerService.java 28 Jul 2003 23:47:50 -0000 1.1
+++ CastorPsmlManagerService.java 18 Oct 2003 19:54:51 -0000 1.2
@@ -66,12 +66,12 @@
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.Jetspeed;
import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
import org.apache.jetspeed.cache.file.FileCacheEventListener;
+import org.apache.jetspeed.cps.BaseCommonService;
+import org.apache.jetspeed.cps.CPSInitializationException;
import org.apache.jetspeed.om.profile.BasePSMLDocument;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Portlets;
@@ -100,7 +100,7 @@
* @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
* @version $Id$
*/
-public class CastorPsmlManagerService extends BaseService
+public class CastorPsmlManagerService extends BaseCommonService
implements FileCacheEventListener,
PsmlManagerService
{
@@ -158,7 +158,7 @@
* This is the early initialization method called by the
* Turbine <code>Service</code> framework
*/
- public void init() throws InitializationException
+ public void init() throws CPSInitializationException
{
if (isInitialized())
{
@@ -551,7 +551,7 @@
}
protected void loadMapping()
- throws InitializationException
+ throws CPSInitializationException
{
// test the mapping file and create the mapping object
@@ -574,12 +574,12 @@
catch (Exception e)
{
log.error("PSMLManager: Error in psml mapping creation",e);
- throw new InitializationException("Error in mapping",e);
+ throw new CPSInitializationException("Error in mapping",e);
}
}
else
{
- throw new InitializationException("PSML Mapping not found or not a file or unreadable: "+mapFile);
+ throw new CPSInitializationException("PSML Mapping not found or not a file or unreadable: "+mapFile);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org