svn commit: r489914 - in /portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer: driver/portlet/GenericPortletRegistryImpl.java driver/producer/GenericPersistentProducerRegistryImpl.java interfaces/portlet/PortletRegistry.java

[dl...@apache.org]

Author: dlouzan
Date: Sat Dec 23 10:40:05 2006
New Revision: 489914

URL: http://svn.apache.org/viewvc?view=rev&rev=489914
Log:
Modified the operations according to interface change in revision 489913

Modified:
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/portlet/GenericPortletRegistryImpl.java
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/producer/GenericPersistentProducerRegistryImpl.java
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/portlet/PortletRegistry.java

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/portlet/GenericPortletRegistryImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/portlet/GenericPortletRegistryImpl.java?view=diff&rev=489914&r1=489913&r2=489914
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/portlet/GenericPortletRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/portlet/GenericPortletRegistryImpl.java Sat Dec 23 10:40:05 2006
@@ -75,7 +75,8 @@
      *            The portlet key identifying the portlet
      * @return The portlet which has been removed or null
      */
-    public WSRPPortlet removePortlet(PortletKey portletKey) {
+    public WSRPPortlet removePortlet(PortletKey portletKey)
+    throws WSRPException {
         if (portletKey == null)
             return null;
 
@@ -85,7 +86,7 @@
     /**
      * Remove all portlets from the registry
      */
-    public void removeAllPortlets() {
+    public void removeAllPortlets() throws WSRPException {
         portlets.clear();
     }
 

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/producer/GenericPersistentProducerRegistryImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/producer/GenericPersistentProducerRegistryImpl.java?view=diff&rev=489914&r1=489913&r2=489914
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/producer/GenericPersistentProducerRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/producer/GenericPersistentProducerRegistryImpl.java Sat Dec 23 10:40:05 2006
@@ -17,6 +17,9 @@
 
 import java.util.Iterator;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.apache.wsrp4j.commons.consumer.interfaces.producer.Producer;
 import org.apache.wsrp4j.commons.exception.WSRPException;
 
@@ -35,6 +38,9 @@
 public class GenericPersistentProducerRegistryImpl extends
         GenericProducerRegistryImpl implements StateChangedListener {
 
+    private final static Log log = 
+            LogFactory.getLog(GenericPersistentProducerRegistryImpl.class);
+    
     // persistence
     protected PersistentDataObject persistentDataObject;
 
@@ -83,7 +89,13 @@
             return null;
 
         Producer producer = super.removeProducer(id);
-        delete(producer);
+        try {
+            delete(producer);
+        } catch (WSRPException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Error while removing producer", e);
+            }
+        }
 
         return producer;
     }
@@ -92,7 +104,7 @@
         Iterator producers = getAllProducers();
         while (producers.hasNext()) {
             Producer producer = (Producer) producers.next();
-            delete(producer);
+            removeProducer(producer.getID());
         }
 
         super.removeAllProducers();
@@ -175,7 +187,7 @@
      * 
      * @param producer
      */
-    private void delete(Producer producer) {
+    private void delete(Producer producer) throws WSRPException {
 
         if (producer != null) {
 

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/portlet/PortletRegistry.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/portlet/PortletRegistry.java?view=diff&rev=489914&r1=489913&r2=489914
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/portlet/PortletRegistry.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/portlet/PortletRegistry.java Sat Dec 23 10:40:05 2006
@@ -47,7 +47,7 @@
      * @param portletKey The portlet key identifying the portlet
      * @return The portlet which has been removed or null
      **/
-    WSRPPortlet removePortlet(PortletKey portletKey);
+    WSRPPortlet removePortlet(PortletKey portletKey) throws WSRPException;
 
     /**
      * Tests if a portlet with the given portlet key
@@ -68,6 +68,6 @@
     /**
      * Remove all portlets from the registry
      **/
-    void removeAllPortlets();
+    void removeAllPortlets() throws WSRPException;
 
 }