Author: solomax
Date: Fri Feb 15 03:12:55 2013
New Revision: 1446437
URL: http://svn.apache.org/r1446437
Log:
BaseHttpServlet is generalized to better handled not initialized state
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseHttpServlet.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BeanUtil.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/ServerNotInitializedException.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseHttpServlet.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseHttpServlet.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseHttpServlet.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseHttpServlet.java
Fri Feb 15 03:12:55 2013
@@ -18,14 +18,29 @@
*/
package org.apache.openmeetings.servlet;
+import java.io.IOException;
+import java.io.OutputStream;
+
import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
public abstract class BaseHttpServlet extends HttpServlet {
private static final long serialVersionUID = -2713422496723115524L;
private BeanUtil beanUtil = new BeanUtil();
- protected <T> T getBean(Class<T> beanClass) {
+ protected <T> T getBean(Class<T> beanClass) throws
ServerNotInitializedException {
return beanUtil.getBean(beanClass, getServletContext());
}
+
+ protected void handleNotBooted(HttpServletResponse response) throws
IOException {
+ OutputStream out = response.getOutputStream();
+
+ String msg = "Server is not booted yet";
+
+ out.write(msg.getBytes());
+
+ out.flush();
+ out.close();
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java
Fri Feb 15 03:12:55 2013
@@ -29,7 +29,7 @@ public abstract class BaseVelocityViewSe
private BeanUtil beanUtil = new BeanUtil();
- protected <T> T getBean(Class<T> beanClass) {
+ protected <T> T getBean(Class<T> beanClass) throws
ServerNotInitializedException {
return beanUtil.getBean(beanClass, getServletContext());
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BeanUtil.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BeanUtil.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BeanUtil.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BeanUtil.java
Fri Feb 15 03:12:55 2013
@@ -24,7 +24,7 @@ import org.apache.openmeetings.remote.re
import org.springframework.web.context.support.WebApplicationContextUtils;
public class BeanUtil {
- public <T> T getBean(Class<T> beanClass, ServletContext ctx) {
+ public <T> T getBean(Class<T> beanClass, ServletContext ctx) throws
ServerNotInitializedException {
if (ScopeApplicationAdapter.initComplete) {
return
WebApplicationContextUtils.getWebApplicationContext(ctx).getBean(beanClass);
} else {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/ServerNotInitializedException.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/ServerNotInitializedException.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/ServerNotInitializedException.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/ServerNotInitializedException.java
Fri Feb 15 03:12:55 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.servlet;
-public class ServerNotInitializedException extends RuntimeException {
+public class ServerNotInitializedException extends Exception {
private static final long serialVersionUID = -7771909924751249321L;
public ServerNotInitializedException(String msg) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java
Fri Feb 15 03:12:55 2013
@@ -19,7 +19,6 @@
package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
-import java.io.OutputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -27,6 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.servlet.BaseHttpServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -55,27 +55,12 @@ public class BackupExportFacade extends
IOException {
try {
-
- if (getBean(BackupExport.class) == null) {
- OutputStream out =
httpServletResponse.getOutputStream();
-
- String msg = "Server is not booted yet";
-
- out.write(msg.getBytes());
-
- out.flush();
- out.close();
-
- return;
- }
-
getBean(BackupExport.class).service(httpServletRequest,
httpServletResponse,
getServletContext());
-
+ } catch (ServerNotInitializedException e) {
+ handleNotBooted(httpServletResponse);
} catch (Exception er) {
- log.error("ERROR ", er);
- log.debug("Error exporting: " + er);
- er.printStackTrace();
+ log.error("Error exporting ", er);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
Fri Feb 15 03:12:55 2013
@@ -32,12 +32,12 @@ import javax.servlet.http.HttpServletRes
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.servlet.BaseHttpServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
@@ -60,15 +60,6 @@ public class CalendarServlet extends Bas
IOException {
try {
-
- if (getBean(UserManager.class) == null
- || getBean(ConfigurationDao.class) ==
null
- || getBean(SessiondataDao.class) == null
- || getBean(AppointmentLogic.class) ==
null
- || getBean(TimezoneUtil.class) == null)
{
- return;
- }
-
String sid = httpServletRequest.getParameter("sid");
if (sid == null) {
@@ -295,7 +286,8 @@ public class CalendarServlet extends Bas
out.close();
}
-
+ } catch (ServerNotInitializedException e) {
+ return;
} catch (Exception er) {
log.error("[Calendar :: service]", er);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
Fri Feb 15 03:12:55 2013
@@ -21,7 +21,6 @@ package org.apache.openmeetings.servlet.
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Date;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -34,6 +33,7 @@ import org.apache.openmeetings.data.file
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
import org.apache.openmeetings.servlet.BaseHttpServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -73,11 +73,6 @@ public class DownloadHandler extends Bas
IOException {
try {
-
- if (getBean(UserManager.class) == null ||
getBean(SessiondataDao.class) == null) {
- return;
- }
-
httpServletRequest.setCharacterEncoding("UTF-8");
log.debug("\nquery = " +
httpServletRequest.getQueryString());
@@ -302,14 +297,13 @@ public class DownloadHandler extends Bas
out.close();
}
} else {
- System.out
- .println("ERROR
DownloadHandler: not authorized FileDownload "
- + (new Date()));
+ log.error("ERROR DownloadHandler: not
authorized FileDownload ");
}
+ } catch (ServerNotInitializedException e) {
+ return;
} catch (Exception er) {
log.error("Error downloading: ", er);
- // er.printStackTrace();
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java?rev=1446437&r1=1446436&r2=1446437&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
Fri Feb 15 03:12:55 2013
@@ -41,9 +41,9 @@ import org.apache.openmeetings.batik.bea
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.record.WhiteboardMapToSVG;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.documents.GenerateImage;
import org.apache.openmeetings.remote.PrintService;
import org.apache.openmeetings.servlet.BaseHttpServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -71,11 +71,6 @@ public class ExportToImage extends BaseH
IOException {
try {
- if (getBean(UserManager.class) == null ||
getBean(SessiondataDao.class) == null
- || getBean(GenerateImage.class) ==
null) {
- return;
- }
-
String sid = request.getParameter("sid");
if (sid == null) {
sid = "default";
@@ -175,11 +170,10 @@ public class ExportToImage extends BaseH
//TODO not implemented yet
}
}
-
+ } catch (ServerNotInitializedException e) {
+ return;
} catch (Exception er) {
- log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
+ log.error("Error exporting to image ", er);
}
}
