You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by dl...@apache.org on 2006/12/23 19:46:57 UTC
svn commit: r489919 - in
/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver:
PageRegistryImpl.java PortletRegistryImpl.java SwingConsumer.java
UserRegistryImpl.java
Author: dlouzan
Date: Sat Dec 23 10:46:57 2006
New Revision: 489919
URL: http://svn.apache.org/viewvc?view=rev&rev=489919
Log:
Modified operations according to interface modifications in revision 489913
Modified:
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/UserRegistryImpl.java
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java?view=diff&rev=489919&r1=489918&r2=489919
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java Sat Dec 23 10:46:57 2006
@@ -174,7 +174,13 @@
return null;
Page page = (Page)pages.remove(pageID);
- delete(page);
+ try {
+ delete(page);
+ } catch (WSRPException e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error while removing a page", e);
+ }
+ }
return page;
}
@@ -272,7 +278,7 @@
}
}
- private void delete(Page page) {
+ private void delete(Page page) throws WSRPException {
if (page != null) {
// delete the persistentFileStore for this page
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java?view=diff&rev=489919&r1=489918&r2=489919
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java Sat Dec 23 10:46:57 2006
@@ -213,7 +213,8 @@
* @param portletKey The portlet key identifying the portlet
* @return returns the removed instance of WSRPPortlet
**/
- public WSRPPortlet removePortlet(PortletKey portletKey) {
+ public WSRPPortlet removePortlet(PortletKey portletKey)
+ throws WSRPException {
WSRPPortlet portlet = null;
if (portletKey != null) {
@@ -244,7 +245,7 @@
* Remove all portlets from the registry and delete them in the
* persistent store.
**/
- public void removeAllPortlets() {
+ public void removeAllPortlets() throws WSRPException {
Iterator iterator = getAllPortlets();
while (iterator.hasNext()) {
@@ -417,7 +418,8 @@
* Delete the input PersistentDataObject from the persistent store
*
*/
- private void delete(PersistentDataObject persistentDataObject) {
+ private void delete(PersistentDataObject persistentDataObject)
+ throws WSRPException {
this.persistentHandler.delete(persistentDataObject);
}
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java?view=diff&rev=489919&r1=489918&r2=489919
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java Sat Dec 23 10:46:57 2006
@@ -533,8 +533,14 @@
for (int i = 0; i < portletHandles.length; i++) {
tmpKey = new PortletKeyImpl(portletHandles[i],
portletKey.getProducerId());
- consumerEnv.getPortletRegistry().
- removePortlet(tmpKey);
+ try {
+ consumerEnv.getPortletRegistry().
+ removePortlet(tmpKey);
+ } catch (WSRPException e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error while removing a portlet", e);
+ }
+ }
destroyedKeys.add(tmpKey);
}
@@ -569,8 +575,14 @@
tmpKey = new PortletKeyImpl(
portletHandles[i],
portletKey.getProducerId());
- consumerEnv.getPortletRegistry().
- removePortlet(tmpKey);
+ try {
+ consumerEnv.getPortletRegistry().
+ removePortlet(tmpKey);
+ } catch (WSRPException e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error while removing a portlet", e);
+ }
+ }
// save all successfully deleted portlets
// for clean up of the page registry
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/UserRegistryImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/UserRegistryImpl.java?view=diff&rev=489919&r1=489918&r2=489919
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/UserRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/UserRegistryImpl.java Sat Dec 23 10:46:57 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.exception.WSRPException;
import org.apache.wsrp4j.commons.persistence.PersistentDataObject;
@@ -39,6 +42,8 @@
public class UserRegistryImpl extends GenericUserRegistryImpl
implements StateChangedListener {
+ private static final Log log = LogFactory.getLog(UserRegistryImpl.class);
+
private static UserRegistry instance;
private PersistentDataObject persistentDataObject;
@@ -83,7 +88,13 @@
User user = super.removeUser(userID);
- deleteFile(user);
+ try {
+ deleteFile(user);
+ } catch (WSRPException e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error while deleting a user", e);
+ }
+ }
return user;
}
@@ -92,7 +103,7 @@
Iterator users = getAllUsers();
while (users.hasNext()) {
User user = (User)users.next();
- deleteFile(user);
+ removeUser(user.getUserID());
}
super.removeAllUsers();
@@ -209,7 +220,7 @@
*
* @param user
*/
- private void deleteFile(User user) {
+ private void deleteFile(User user) throws WSRPException {
if (user != null) {
persistentDataObject.clear();