svn commit: r1295524 - in /incubator/wookie/trunk/src/org/apache/wookie: helpers/WidgetFactory.java server/ContextListener.java

[sc...@apache.org]

Author: scottbw
Date: Thu Mar  1 11:43:07 2012
New Revision: 1295524

URL: http://svn.apache.org/viewvc?rev=1295524&view=rev
Log:
Moved logging of messages from ContextListener to WidgetFactory - this way the same messages are output to logs whether widgets are deployed/updated using the watched folder or the REST API.

Modified:
    incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
    incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java

Modified: incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java?rev=1295524&r1=1295523&r2=1295524&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Thu Mar  1 11:43:07 2012
@@ -96,6 +96,9 @@ public class WidgetFactory {
 		createFeatures(persistenceManager, model,widget);
         persistenceManager.save(widget);
 		createAccessRequests(persistenceManager, model, widget, grantAccessRequests);
+		
+    _logger.info("'"+model.getLocalName("en") +"' - " + "Widget was successfully imported into the system");
+    
 		return widget;	       
 	}
 
@@ -245,9 +248,12 @@ public class WidgetFactory {
 	 * @return true if the widget is destroyed successfully
 	 */
 	public static boolean destroy(IWidget widget){
+	  
 
 		if(widget==null) return false;
 		
+		String widgetName = widget.getWidgetTitle("en");
+		
     IPersistenceManager persistenceManager = PersistenceManagerFactory.getPersistenceManager();
 		
 		// remove any widget instances for this widget
@@ -287,6 +293,9 @@ public class WidgetFactory {
         
 		// remove the widget itself
 		persistenceManager.delete(widget);
+		
+    _logger.info("'"+widgetName+"' - " + "Widget was successfully deleted from the system.");
+    
 		return true;
 	} 
 	
@@ -332,6 +341,8 @@ public class WidgetFactory {
 		createFeatures(persistenceManager, model,widget);
         persistenceManager.save(widget);
 		createAccessRequests(persistenceManager, model, widget, grantAccessRequests);
+
+		_logger.info("'"+model.getLocalName("en") +"' - " + "Widget was successfully updated in the system.");
 	}
 
 }

Modified: incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java?rev=1295524&r1=1295523&r2=1295524&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java Thu Mar  1 11:43:07 2012
@@ -190,12 +190,10 @@ public class ContextListener implements 
 	 						if(persistenceManager.findWidgetByGuid(model.getIdentifier()) == null) {
 	 							WidgetFactory.addNewWidget(model, upload, true);	
 	 							String message = model.getLocalName("en") +"' - " + localizedMessages.getString("WidgetAdminServlet.19");
-	 							_logger.info(message);
 	 							FlashMessage.getInstance().message(message);
 	 						} else {
 	 							String message = model.getLocalName("en") +"' - " + localizedMessages.getString("WidgetAdminServlet.20");
 	 							WidgetFactory.update(model, persistenceManager.findWidgetByGuid(model.getIdentifier()), true, upload);
-	 							_logger.info(message);
 	 							FlashMessage.getInstance().message(message);
 	 						}
 	 						persistenceManager.commit();