raphael 01/05/28 09:08:28
Modified: src/java/org/apache/jetspeed/modules/actions
CustomizeUserPSMLFile.java
src/java/org/apache/jetspeed/portal/portlets/admin
GlobalAdminPortlet.java
src/java/org/apache/jetspeed/services/daemonfactory
JetspeedDaemonFactoryService.java
src/java/org/apache/jetspeed/util/customization
AllowablePortletSet.java PSMLEntry.java
Removed: src/java/org/apache/jetspeed/om/registry BaseRegistry.java
CapabilityMapRegistry.java EntryFactory.java
InvalidEntryException.java MediaTypeRegistry.java
PortletControlRegistry.java
PortletControllerRegistry.java PortletRegistry.java
Registry.java RegistryEntry.java
RegistryException.java
src/java/org/apache/jetspeed/om/registry/peer
CapabilityMapEntry.java MediaTypeEntry.java
MetaInfo.java Parameter.java
PortletControlEntry.java
PortletControllerEntry.java PortletEntry.java
PortletEntryNormalizer.java ProfileEntry.java
Security.java package.html
src/java/org/apache/jetspeed/om/registry/peer/base
BasePortletEntry.java package.html
src/java/org/apache/jetspeed/services/registrymanager
FileWatcher.java
JetspeedConfigRegistryManagerService.java
RegistryBroker.java RegistryManager.java
RegistryManagerService.java
Log:
remove the old RegistryManager implementation
Revision Changes Path
1.2 +8 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CustomizeUserPSMLFile.java
Index: CustomizeUserPSMLFile.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CustomizeUserPSMLFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CustomizeUserPSMLFile.java 2001/05/08 06:28:29 1.1
+++ CustomizeUserPSMLFile.java 2001/05/28 16:07:59 1.2
@@ -58,7 +58,7 @@
import org.apache.turbine.util.*;
// Jetspeed
-import org.apache.jetspeed.om.registry.peer.PortletEntry;
+import org.apache.jetspeed.om.newregistry.PortletEntry;
// Java
import java.util.*;
@@ -68,13 +68,13 @@
/**
- * Action class that handles the customization for the user portal page. Access
is only granted once
- * the user has been logged on.
- * Note: Should we throw an exception if an invalid screen tries to access on of
the events handler?
+ * Action class that handles the customization for the user portal page. Access
is only granted once
+ * the user has been logged on.
+ * Note: Should we throw an exception if an invalid screen tries to access on of
the events handler?
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Van Truong </a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Ernest Ros </a>
- * @version $Id: CustomizeUserPSMLFile.java,v 1.1 2001/05/08 06:28:29 taylor Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Van Truong </a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Ernest Ros </a>
+ * @version $Id: CustomizeUserPSMLFile.java,v 1.2 2001/05/28 16:07:59 raphael Exp $
*
*/
public class CustomizeUserPSMLFile extends ActionEvent
@@ -185,7 +185,7 @@
{
PortletEntry pe = ap.getPortletEntry(portlets[i]);
org.apache.jetspeed.xml.api.portletmarkup.Layout layout =
- new org.apache.jetspeed.xml.api.portletmarkup.Layout();
+ new org.apache.jetspeed.xml.api.portletmarkup.Layout();
layout.setPosition(String.valueOf(pos));
PSMLEntry psmlEntry = new PSMLEntry(pe, layout, coord);
list.add(psmlEntry);
1.13 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java
Index: GlobalAdminPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- GlobalAdminPortlet.java 2001/03/29 06:13:01 1.12
+++ GlobalAdminPortlet.java 2001/05/28 16:08:18 1.13
@@ -65,9 +65,9 @@
import org.apache.jetspeed.portal.factory.*;
import org.apache.jetspeed.portal.portlets.*;
import org.apache.jetspeed.util.*;
+import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.services.threadpool.ThreadPoolService;
import org.apache.jetspeed.services.threadpool.JetspeedThreadPoolService;
-import org.apache.jetspeed.services.registrymanager.RegistryManager;
import org.apache.jetspeed.services.urlmanager.URLManager;
import org.apache.jetspeed.services.urlmanager.URLManagerService;
import org.apache.jetspeed.services.urlmanager.URLFetcher;
@@ -86,7 +86,7 @@
Returns global information about Jetspeed.
@author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
-@version $Id: GlobalAdminPortlet.java,v 1.12 2001/03/29 06:13:01 sgala Exp $
+@version $Id: GlobalAdminPortlet.java,v 1.13 2001/05/28 16:08:18 raphael Exp $
*/
public class GlobalAdminPortlet extends AbstractPortlet {
@@ -125,7 +125,7 @@
this.createCategory( ec, "PortletRegistry" );
ec.addElement( this.getEntry( "Number of entries: ",
-
RegistryManager.get(RegistryManager.PORTLET_REGISTRY).getEntryCount() ) );
+ Registry.get(Registry.PORTLET).getEntryCount() ) );
this.createCategory( ec, "Resource Manager" );
1.5 +1 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java
Index: JetspeedDaemonFactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedDaemonFactoryService.java 2001/03/07 06:48:23 1.4
+++ JetspeedDaemonFactoryService.java 2001/05/28 16:08:20 1.5
@@ -70,14 +70,12 @@
import org.apache.turbine.services.TurbineServices;
import org.apache.jetspeed.services.urlmanager.URLManagerService;
-import org.apache.jetspeed.services.registrymanager.RegistryManagerService;
-
/**
@author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
-@version $Id: JetspeedDaemonFactoryService.java,v 1.4 2001/03/07 06:48:23 taylor
Exp $
+@version $Id: JetspeedDaemonFactoryService.java,v 1.5 2001/05/28 16:08:20 raphael
Exp $
*/
public class JetspeedDaemonFactoryService
extends TurbineBaseService
1.4 +9 -20
jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/AllowablePortletSet.java
Index: AllowablePortletSet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/AllowablePortletSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AllowablePortletSet.java 2001/05/08 19:49:01 1.3
+++ AllowablePortletSet.java 2001/05/28 16:08:26 1.4
@@ -66,9 +66,8 @@
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.cache.disk.*;
import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.xml.api.jetspeedconfig.JetspeedConfig;
-import org.apache.jetspeed.om.registry.EntryFactory;
-import org.apache.jetspeed.om.registry.peer.PortletEntry;
+import org.apache.jetspeed.services.Registry;
+import org.apache.jetspeed.om.newregistry.PortletEntry;
/**
* This class represents all the allowable portlets for a given user, including
those that
@@ -76,7 +75,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Van Truong </a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ernest Ros </a>
- * @version $Id: AllowablePortletSet.java,v 1.3 2001/05/08 19:49:01 taylor Exp $
+ * @version $Id: AllowablePortletSet.java,v 1.4 2001/05/28 16:08:26 raphael Exp
$
*
*/
public class AllowablePortletSet
@@ -288,7 +287,7 @@
{
PortletEntryWrapper pw = (PortletEntryWrapper)portletEntry.get(name);
- return pw.getPortletEntry().getMetaInfo().getDescription();
+ return pw.getPortletEntry().getDescription();
}
catch (NullPointerException n)
{
@@ -314,7 +313,7 @@
try
{
PortletEntryWrapper pw = (PortletEntryWrapper)portletEntry.get(name);
- String title = pw.getPortletEntry().getMetaInfo().getTitle();
+ String title = pw.getPortletEntry().getTitle();
if (title == null || title.trim().equals(""))
{
@@ -346,23 +345,13 @@
{
try
{
- // Read from the Jetspeed config file
+ Enumeration en = Registry.get(Registry.PORTLET).getEntries();
- // FIXME: this needs to be converted over to the new Registry interface
- String url =
JetspeedResources.getString("services.RegistryManager.url");
- DiskCacheEntry pde = JetspeedDiskCache.getInstance().getEntry(url);
- JetspeedConfig jetspeedConfig =
JetspeedConfig.unmarshal(pde.getReader());
-
- // Get the PortletEntry
- org.apache.jetspeed.xml.api.jetspeedconfig.PortletEntry[] xml_pe =
- jetspeedConfig.getPortletRegistry().getPortletEntry();
-
- for (int i=0; i<xml_pe.length; i++)
+ while(en.hasMoreElements())
{
- PortletEntry reg_pe = EntryFactory.getEntry(xml_pe[i]);
+ PortletEntry reg_pe = (PortletEntry)en.nextElement();
- if (!reg_pe.getType().equals(PortletEntry.TYPE_ABSTRACT) &&
- !reg_pe.getType().equals(PortletEntry.TYPE_UNKNOWN))
+ if (!reg_pe.getType().equals(PortletEntry.TYPE_ABSTRACT))
{
portletEntry.put(reg_pe.getName(), new
PortletEntryWrapper(reg_pe));
}
1.2 +6 -6
jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLEntry.java
Index: PSMLEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PSMLEntry.java 2001/05/08 06:26:11 1.1
+++ PSMLEntry.java 2001/05/28 16:08:26 1.2
@@ -56,19 +56,19 @@
import org.apache.jetspeed.xml.api.portletmarkup.Entry;
-import org.apache.jetspeed.om.registry.peer.PortletEntry;
+import org.apache.jetspeed.om.newregistry.PortletEntry;
import org.apache.jetspeed.xml.api.portletmarkup.Layout;
import org.apache.turbine.util.Log;
import java.lang.NullPointerException;
/**
*
- * PSMLEntry is a wrapper class that bundles the Entry object and positioning
- * information for a particular portlet together.
+ * PSMLEntry is a wrapper class that bundles the Entry object and positioning
+ * information for a particular portlet together.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Yoo </a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Ernest Ros </a>
- * @version $Id: PSMLEntry.java,v 1.1 2001/05/08 06:26:11 taylor Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Yoo </a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Ernest Ros </a>
+ * @version $Id: PSMLEntry.java,v 1.2 2001/05/28 16:08:26 raphael Exp $
*
*/
public class PSMLEntry
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
