Author: scottbw
Date: Wed Mar 28 10:43:49 2012
New Revision: 1306247
URL: http://svn.apache.org/viewvc?rev=1306247&view=rev
Log:
Removed FlashMessage - this was used with the admin UI to render log messages
Removed:
incubator/wookie/trunk/src/org/apache/wookie/helpers/FlashMessage.java
Modified:
incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
incubator/wookie/trunk/src/org/apache/wookie/server/Diagnostics.java
incubator/wookie/trunk/src/org/apache/wookie/updates/UpdatesController.java
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetJavascriptSyntaxAnalyzer.java
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=1306247&r1=1306246&r2=1306247&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
Wed Mar 28 10:43:49 2012
@@ -32,7 +32,6 @@ import org.apache.wookie.Messages;
import org.apache.wookie.beans.util.IPersistenceManager;
import org.apache.wookie.beans.util.PersistenceManagerFactory;
import org.apache.wookie.feature.Features;
-import org.apache.wookie.helpers.FlashMessage;
import org.apache.wookie.helpers.WidgetRuntimeHelper;
import org.apache.wookie.helpers.WidgetFactory;
import org.apache.wookie.util.WgtWatcher;
@@ -190,32 +189,28 @@ public class ContextListener implements
if(persistenceManager.findWidgetByGuid(model.getIdentifier()) == null) {
WidgetFactory.addNewWidget(model, upload, true);
String message
= model.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.19");
-
FlashMessage.getInstance().message(message);
+
_logger.info(message);
} else {
String message
= model.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.20");
WidgetFactory.update(model,
persistenceManager.findWidgetByGuid(model.getIdentifier()), true, upload);
-
FlashMessage.getInstance().message(message);
+
_logger.info(message);
}
persistenceManager.commit();
} catch (IOException e) {
persistenceManager.rollback();
String error =
f.getName()+":"+localizedMessages.getString("WidgetHotDeploy.1") + " - " +
e.getLocalizedMessage();
-
FlashMessage.getInstance().error(error);
_logger.error(error, e);
} catch
(BadWidgetZipFileException e) {
persistenceManager.rollback();
String error =
f.getName()+":"+localizedMessages.getString("WidgetHotDeploy.2") + " - " +
e.getLocalizedMessage();
-
FlashMessage.getInstance().error(error);
_logger.error(error, e);
} catch (BadManifestException
e) {
persistenceManager.rollback();
String error =
f.getName()+":"+localizedMessages.getString("WidgetHotDeploy.3") + " - " +
e.getLocalizedMessage();
-
FlashMessage.getInstance().error(error);
_logger.error(error, e);
} catch (Exception e) {
persistenceManager.rollback();
String error =
f.getName()+":"+e.getLocalizedMessage();
-
FlashMessage.getInstance().error(error);
_logger.error(error, e);
} finally {
// close thread persistence manager
Modified: incubator/wookie/trunk/src/org/apache/wookie/server/Diagnostics.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/server/Diagnostics.java?rev=1306247&r1=1306246&r2=1306247&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/Diagnostics.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/Diagnostics.java Wed
Mar 28 10:43:49 2012
@@ -20,7 +20,6 @@ import javax.servlet.ServletContext;
import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Logger;
-import org.apache.wookie.helpers.FlashMessage;
import org.apache.wookie.w3c.util.WidgetPackageUtils;
/**
@@ -55,17 +54,14 @@ public class Diagnostics {
if (!folder.exists()){
String error = name+" folder does not exist:
"+folder.getAbsolutePath();
_logger.error(error);
- FlashMessage.getInstance().error(error);
} else {
if (!folder.canRead()){
String error = name+" folder cannot be read
from: "+folder.getAbsolutePath();
_logger.error(error);
- FlashMessage.getInstance().error(error);
}
if (!folder.canWrite()){
String error = name+" folder cannot be written
to: "+folder.getAbsolutePath();
_logger.error(error);
- FlashMessage.getInstance().error(error);
}
}
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/updates/UpdatesController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/updates/UpdatesController.java?rev=1306247&r1=1306246&r2=1306247&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/updates/UpdatesController.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/updates/UpdatesController.java
Wed Mar 28 10:43:49 2012
@@ -32,7 +32,6 @@ import org.apache.wookie.exceptions.Reso
import org.apache.wookie.exceptions.ResourceNotFoundException;
import org.apache.wookie.exceptions.UnauthorizedAccessException;
import org.apache.wookie.feature.Features;
-import org.apache.wookie.helpers.FlashMessage;
import org.apache.wookie.helpers.WidgetFactory;
import org.apache.wookie.util.html.StartPageProcessor;
import org.apache.wookie.w3c.W3CWidget;
@@ -171,7 +170,6 @@ public class UpdatesController extends C
if (updatedWidget != null){
WidgetFactory.update(updatedWidget, widget, false,
null);
_logger.info("Successfully updated "+widget.getGuid()+"
to version "+updatedWidget.getVersion());
- FlashMessage.getInstance().message("Successfully
updated "+widget.getGuid()+" to version "+updatedWidget.getVersion());
}
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetJavascriptSyntaxAnalyzer.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/WidgetJavascriptSyntaxAnalyzer.java?rev=1306247&r1=1306246&r2=1306247&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetJavascriptSyntaxAnalyzer.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetJavascriptSyntaxAnalyzer.java
Wed Mar 28 10:43:49 2012
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
-import org.apache.wookie.helpers.FlashMessage;
+
/**
* A class designed to be used for parsing javascript in files and reporting
any problems
*
@@ -92,7 +92,6 @@ public class WidgetJavascriptSyntaxAnaly
String message= "\n(Line " + lineReader.getLineNumber() + ") in file
" + file;
message+= "\n\t "+line+"\n";
message+= "This file contains calls to Widget API methods that are
deprecated and likely to be removed in future releases.\n";
- FlashMessage.getInstance().message(formatWebMessage(message));
_logger.warn(message);
}
}
@@ -120,7 +119,6 @@ public class WidgetJavascriptSyntaxAnaly
String message= "\n(Line " + lineReader.getLineNumber() + ") in file
" + file;
message+= "\n\t "+line+"\n";
message+= "This file contains calls to Widget API methods that are
Wookie-specific extensions to the W3C Widget API, making it less likely the
widget will work in other environments\n";
- FlashMessage.getInstance().message(formatWebMessage(message));
_logger.warn(message);
}
}
@@ -151,7 +149,6 @@ public class WidgetJavascriptSyntaxAnaly
message+= "\n\t "+line+"\n";
message+= "This file contains
preference setter syntax which may not behave correctly in Internet Explorer
version 8 and below.\n";
message+= "See
https://cwiki.apache.org/confluence/display/WOOKIE/FAQ#FAQ-ie8prefs for more
information.\n";
-
FlashMessage.getInstance().message(formatWebMessage(message));
_logger.warn(message);
}
}
