Author: scottbw
Date: Fri Nov 27 12:13:18 2009
New Revision: 884851
URL: http://svn.apache.org/viewvc?rev=884851&view=rev
Log:
Localized console messages for hot deploy; also added a check to ensure a
dropped widget was not a duplicate of existing
Modified:
incubator/wookie/trunk/src/org/apache/wookie/messages.properties
incubator/wookie/trunk/src/org/apache/wookie/messages_nl.properties
incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/messages.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/messages.properties?rev=884851&r1=884850&r2=884851&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/messages.properties (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/messages.properties Fri Nov 27
12:13:18 2009
@@ -30,6 +30,11 @@
WidgetAdminServlet.29=Invalid Widget: Bad zip file
WidgetAdminServlet.30=Invalid Widget: Config.xml specifies an unsupported
content type
+WidgetHotDeploy.0=Hot deploy disabled
+WidgetHotDeploy.1=Hot deploy error: Unable to move dropped .wgt file to upload
folder
+WidgetHotDeploy.2=Hot deploy error: file is not a valid widget package
+WidgetHotDeploy.3=Hot deploy error: widget has invalid manifest
+
WidgetServiceServlet.0=No valid requestid was found.
WidgetServiceServlet.1=completed
WidgetServiceServlet.2=Invalid API key
Modified: incubator/wookie/trunk/src/org/apache/wookie/messages_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/messages_nl.properties?rev=884851&r1=884850&r2=884851&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/messages_nl.properties
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/messages_nl.properties Fri Nov
27 12:13:18 2009
@@ -30,6 +30,11 @@
WidgetAdminServlet.29=Invalid Widget: Bad zip file(dutch)
WidgetAdminServlet.30=Invalid Widget: Config.xml specifies an unsupported
content type (dutch)
+WidgetHotDeploy.0=Hot deploy disabled (dutch)
+WidgetHotDeploy.1=Hot deploy error: Unable to move dropped .wgt file to upload
folder (dutch)
+WidgetHotDeploy.2=Hot deploy error: file is not a valid widget package (dutch)
+WidgetHotDeploy.3=Hot deploy error: widget has invalid manifest (dutch)
+
WidgetServiceServlet.0=No valid requestid was found.(dutch)
WidgetServiceServlet.1=completed(dutch)
WidgetServiceServlet.2=Invalid API key(dutch)
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=884851&r1=884850&r2=884851&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
Fri Nov 27 12:13:18 2009
@@ -17,11 +17,14 @@
import java.io.File;
import java.io.IOException;
+import java.util.Locale;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import org.apache.log4j.Logger;
+import org.apache.wookie.Messages;
+import org.apache.wookie.beans.Widget;
import org.apache.wookie.exceptions.BadManifestException;
import org.apache.wookie.exceptions.BadWidgetZipFileException;
import org.apache.wookie.manager.impl.WidgetAdminManager;
@@ -78,8 +81,14 @@
* Initialise the locale handler
*/
LocaleHandler.getInstance().initialize(configuration);
+ final Locale locale = new
Locale(configuration.getString("widget.default.locale"));
+ final Messages localizedMessages =
LocaleHandler.getInstance().getResourceBundle(locale);
- if (configuration.getBoolean("widget.hot_deploy"))
startWatcher(context, configuration);
+ if (configuration.getBoolean("widget.hot_deploy")) {
+ startWatcher(context, configuration,
localizedMessages);
+ } else {
+
_logger.info(localizedMessages.getString("WidgetHotDeploy.0"));
+ }
/*
* load the opensocial.properties file and put it into
this context
@@ -110,7 +119,7 @@
* @param context the current servlet context
* @param configuration the configuration properties
*/
- private void startWatcher(ServletContext context, Configuration
configuration){
+ private void startWatcher(ServletContext context, Configuration
configuration, final Messages localizedMessages){
/*
* Start watching for widget deployment
*/
@@ -127,20 +136,24 @@
watcher.setWatchDir(deploy);
watcher.setListener(new
WgtWatcher.FileChangeListener(){
public void fileModified(File f) {
- _logger.info("Deploying
widget:"+f.getName());
try{
dbManager.beginTransaction();
File upload =
WidgetPackageUtils.dealWithDroppedFile(UPLOADFOLDER, f);
IManifestModel model =
WidgetPackageUtils.processWidgetPackage(upload, localWidgetFolderPath,
WIDGETFOLDER, UPLOADFOLDER);
WidgetAdminManager
manager = new WidgetAdminManager(null);
-
manager.addNewWidget(model, null);
+
if(!Widget.exists(model.getIdentifier())) {
+
manager.addNewWidget(model, null);
+
_logger.info(model.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.19"));
+ } else {
+
_logger.info(model.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.20"));
+ }
dbManager.commitTransaction();
} catch (IOException e) {
- _logger.error("Hot
deploy error: Unable to move dropped .wgt file to upload folder");
+
_logger.error(f.getName()+":"+localizedMessages.getString("WidgetHotDeploy.1"));
} catch
(BadWidgetZipFileException e) {
- _logger.warn("Hot
deploy error: file is not a valid widget packge");
+
_logger.error(f.getName()+":"+localizedMessages.getString("WidgetHotDeploy.2"));
} catch (BadManifestException
e) {
- _logger.warn("Hot
deploy error: widget has invalid manifest");
+
_logger.error(f.getName()+":"+localizedMessages.getString("WidgetHotDeploy.3"));
}
}
public void fileRemoved(File f) {
