Revision: 4046
Author: solomax666
Date: Sat Aug 13 22:42:00 2011
Log: - beans are passed to the servlets
http://code.google.com/p/openmeetings/source/detail?r=4046
Modified:
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Export.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/HttpServletRequestEx.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Import.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sat Aug 13 22:42:00 2011
@@ -27,6 +27,72 @@
<entry key="cfgManagement">
<ref bean="cfgManagement"/>
</entry>
+ <entry key="sessionManagement">
+ <ref bean="sessionManagement"/>
+ </entry>
+ <entry key="userManagement">
+ <ref bean="userManagement"/>
+ </entry>
+ <entry key="fieldmanagment">
+ <ref bean="fieldmanagment"/>
+ </entry>
+ <entry key="appointmentDao">
+ <ref bean="appointmentDao"/>
+ </entry>
+ <entry key="organisationmanagement">
+ <ref bean="organisationmanagement"/>
+ </entry>
+ <entry key="roommanagement">
+ <ref bean="roommanagement"/>
+ </entry>
+ <entry key="fileExplorerItemDao">
+ <ref bean="fileExplorerItemDao"/>
+ </entry>
+ <entry key="flvRecordingDao">
+ <ref bean="flvRecordingDao"/>
+ </entry>
+ <entry key="flvRecordingMetaDataDao">
+ <ref bean="flvRecordingMetaDataDao"/>
+ </entry>
+ <entry key="roomModeratorsDao">
+ <ref bean="roomModeratorsDao"/>
+ </entry>
+ <entry key="usersDao">
+ <ref bean="usersDao"/>
+ </entry>
+ <entry key="meetingMemberDao">
+ <ref bean="meetingMemberDao"/>
+ </entry>
+ <entry key="ldapConfigDao">
+ <ref bean="ldapConfigDao"/>
+ </entry>
+ <entry key="privateMessagesDao">
+ <ref bean="privateMessagesDao"/>
+ </entry>
+ <entry key="privateMessageFolderDao">
+ <ref bean="privateMessageFolderDao"/>
+ </entry>
+ <entry key="userContactsDao">
+ <ref bean="userContactsDao"/>
+ </entry>
+ <entry key="statemanagement">
+ <ref bean="statemanagement"/>
+ </entry>
+ <entry key="omTimeZoneDaoImpl">
+ <ref bean="omTimeZoneDaoImpl"/>
+ </entry>
+ <entry key="appointmentCategoryDaoImpl">
+ <ref bean="appointmentCategoryDaoImpl"/>
+ </entry>
+ <entry key="appointmentReminderTypDaoImpl">
+ <ref
bean="appointmentReminderTypDaoImpl"/>
+ </entry>
+ <entry key="appointmentLogic">
+ <ref bean="appointmentLogic"/>
+ </entry>
+ <entry key="fieldLanguageDaoImpl">
+ <ref bean="fieldLanguageDaoImpl"/>
+ </entry>
</map>
</property>
</bean>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sat Aug 13 22:42:00 2011
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.Date;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -22,20 +23,21 @@
import org.springframework.beans.factory.annotation.Autowired;
public class ActivateUser extends VelocityViewServlet {
-
- /**
- *
- */
private static final long serialVersionUID = -8892729047921796170L;
- private static Logger log =
Red5LoggerFactory.getLogger(ActivateUser.class,
- ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+ private static Logger log =
Red5LoggerFactory.getLogger(ActivateUser.class,
ScopeApplicationAdapter.webAppRootKey);
+
private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Fieldmanagment fieldmanagment;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ cfgManagement =
(Configurationmanagement)config.getServletContext().getAttribute("cfgManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ fieldmanagment =
(Fieldmanagment)config.getServletContext().getAttribute("fieldmanagment");
+ }
+
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse, Context ctx)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Sat Aug 13 22:01:31 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Sat Aug 13 22:42:00 2011
@@ -15,6 +15,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -70,37 +71,43 @@
public class BackupExport extends HttpServlet {
private static final long serialVersionUID = -928315730609302260L;
private static final Logger log =
Red5LoggerFactory.getLogger(BackupExport.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+
private AppointmentDaoImpl appointmentDao;
- @Autowired
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Organisationmanagement organisationmanagement;
- @Autowired
private Roommanagement roommanagement;
- @Autowired
private FileExplorerItemDaoImpl fileExplorerItemDao;
- @Autowired
private FlvRecordingDaoImpl flvRecordingDao;
- @Autowired
private FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao;
- @Autowired
private RoomModeratorsDaoImpl roomModeratorsDao;
- @Autowired
private UsersDaoImpl usersDao;
- @Autowired
private MeetingMemberDaoImpl meetingMemberDao;
- @Autowired
private LdapConfigDaoImpl ldapConfigDao;
- @Autowired
private PrivateMessagesDaoImpl privateMessagesDao;
- @Autowired
private PrivateMessageFolderDaoImpl privateMessageFolderDao;
- @Autowired
private UserContactsDaoImpl userContactsDao;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ appointmentDao =
(AppointmentDaoImpl)config.getServletContext().getAttribute("appointmentDao");
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ organisationmanagement =
(Organisationmanagement)config.getServletContext().getAttribute("organisationmanagement");
+ roommanagement =
(Roommanagement)config.getServletContext().getAttribute("roommanagement");
+ fileExplorerItemDao =
(FileExplorerItemDaoImpl)config.getServletContext().getAttribute("fileExplorerItemDao");
+ flvRecordingDao =
(FlvRecordingDaoImpl)config.getServletContext().getAttribute("flvRecordingDao");
+ flvRecordingMetaDataDao =
(FlvRecordingMetaDataDaoImpl)config.getServletContext().getAttribute("flvRecordingMetaDataDao");
+ roomModeratorsDao =
(RoomModeratorsDaoImpl)config.getServletContext().getAttribute("roomModeratorsDao");
+ usersDao =
(UsersDaoImpl)config.getServletContext().getAttribute("usersDao");
+ meetingMemberDao =
(MeetingMemberDaoImpl)config.getServletContext().getAttribute("meetingMemberDao");
+ ldapConfigDao =
(LdapConfigDaoImpl)config.getServletContext().getAttribute("ldapConfigDao");
+ privateMessagesDao =
(PrivateMessagesDaoImpl)config.getServletContext().getAttribute("privateMessagesDao");
+ privateMessageFolderDao =
(PrivateMessageFolderDaoImpl)config.getServletContext().getAttribute("privateMessageFolderDao");
+ userContactsDao =
(UserContactsDaoImpl)config.getServletContext().getAttribute("userContactsDao");
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sat Aug 13 22:01:31 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sat Aug 13 22:42:00 2011
@@ -19,6 +19,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -81,45 +82,25 @@
private static final Logger log =
Red5LoggerFactory.getLogger(BackupImport.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
private AppointmentDaoImpl appointmentDao;
- @Autowired
private Sessionmanagement sessionManagement;
- @Autowired
private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Statemanagement statemanagement;
- @Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
- @Autowired
private Organisationmanagement organisationmanagement;
- @Autowired
private Roommanagement roommanagement;
- @Autowired
private AppointmentCategoryDaoImpl appointmentCategoryDaoImpl;
- @Autowired
private AppointmentReminderTypDaoImpl appointmentReminderTypDaoImpl;
- @Autowired
private UsersDaoImpl usersDao;
- @Autowired
private FlvRecordingDaoImpl flvRecordingDao;
- @Autowired
private FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao;
- @Autowired
private PrivateMessageFolderDaoImpl privateMessageFolderDao;
- @Autowired
private PrivateMessagesDaoImpl privateMessagesDao;
- @Autowired
private MeetingMemberDaoImpl meetingMemberDao;
- @Autowired
private LdapConfigDaoImpl ldapConfigDao;
- @Autowired
private RoomModeratorsDaoImpl roomModeratorsDao;
- @Autowired
private FileExplorerItemDaoImpl fileExplorerItemDao;
- @Autowired
private UserContactsDaoImpl userContactsDao;
private final HashMap<Long, Long> usersMap = new HashMap<Long, Long>();
@@ -134,6 +115,31 @@
USERS, ORGANISATIONS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS, USERCONTACTS,
FILEEXPLORERITEMS
};
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ appointmentDao =
(AppointmentDaoImpl)config.getServletContext().getAttribute("appointmentDao");
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ cfgManagement =
(Configurationmanagement)config.getServletContext().getAttribute("cfgManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ statemanagement =
(Statemanagement)config.getServletContext().getAttribute("statemanagement");
+ omTimeZoneDaoImpl =
(OmTimeZoneDaoImpl)config.getServletContext().getAttribute("omTimeZoneDaoImpl");
+ organisationmanagement =
(Organisationmanagement)config.getServletContext().getAttribute("organisationmanagement");
+ roommanagement =
(Roommanagement)config.getServletContext().getAttribute("roommanagement");
+ appointmentCategoryDaoImpl =
(AppointmentCategoryDaoImpl)config.getServletContext().getAttribute("appointmentCategoryDaoImpl");
+ appointmentReminderTypDaoImpl =
(AppointmentReminderTypDaoImpl)config.getServletContext().getAttribute("appointmentReminderTypDaoImpl");
+ usersDao =
(UsersDaoImpl)config.getServletContext().getAttribute("usersDao");
+ flvRecordingDao =
(FlvRecordingDaoImpl)config.getServletContext().getAttribute("flvRecordingDao");
+ flvRecordingMetaDataDao =
(FlvRecordingMetaDataDaoImpl)config.getServletContext().getAttribute("flvRecordingMetaDataDao");
+ privateMessageFolderDao =
(PrivateMessageFolderDaoImpl)config.getServletContext().getAttribute("privateMessageFolderDao");
+ privateMessagesDao =
(PrivateMessagesDaoImpl)config.getServletContext().getAttribute("privateMessagesDao");
+ meetingMemberDao =
(MeetingMemberDaoImpl)config.getServletContext().getAttribute("meetingMemberDao");
+ ldapConfigDao =
(LdapConfigDaoImpl)config.getServletContext().getAttribute("ldapConfigDao");
+ roomModeratorsDao =
(RoomModeratorsDaoImpl)config.getServletContext().getAttribute("roomModeratorsDao");
+ fileExplorerItemDao =
(FileExplorerItemDaoImpl)config.getServletContext().getAttribute("fileExplorerItemDao");
+ userContactsDao =
(UserContactsDaoImpl)config.getServletContext().getAttribute("userContactsDao");
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
Sat Aug 13 03:02:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
Sat Aug 13 22:42:00 2011
@@ -8,6 +8,7 @@
import java.util.List;
import java.util.TimeZone;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -20,9 +21,25 @@
import org.dom4j.io.XMLWriter;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
+import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
+import org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl;
+import org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl;
+import
org.openmeetings.app.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.openmeetings.app.data.calendar.daos.MeetingMemberDaoImpl;
import org.openmeetings.app.data.calendar.management.AppointmentLogic;
+import org.openmeetings.app.data.conference.Roommanagement;
+import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
+import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
+import org.openmeetings.app.data.flvrecord.FlvRecordingDaoImpl;
+import org.openmeetings.app.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.openmeetings.app.data.user.Organisationmanagement;
+import org.openmeetings.app.data.user.Statemanagement;
import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.data.user.dao.PrivateMessageFolderDaoImpl;
+import org.openmeetings.app.data.user.dao.PrivateMessagesDaoImpl;
+import org.openmeetings.app.data.user.dao.UserContactsDaoImpl;
+import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.calendar.Appointment;
@@ -34,19 +51,24 @@
public class CalendarServlet extends HttpServlet {
private static final long serialVersionUID = 2192254610711799347L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- Calendar.class, ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+ private static final Logger log =
Red5LoggerFactory.getLogger(Calendar.class,
ScopeApplicationAdapter.webAppRootKey);
+
private AppointmentLogic appointmentLogic;
- @Autowired
private Sessionmanagement sessionManagement;
- @Autowired
private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ appointmentLogic =
(AppointmentLogic)config.getServletContext().getAttribute("appointmentLogic");
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ cfgManagement =
(Configurationmanagement)config.getServletContext().getAttribute("cfgManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ omTimeZoneDaoImpl =
(OmTimeZoneDaoImpl)config.getServletContext().getAttribute("omTimeZoneDaoImpl");
+ }
+
@Override
protected void service(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) throws
ServletException,
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Fri Aug 12 11:20:41 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Sat Aug 13 22:42:00 2011
@@ -21,6 +21,7 @@
public class DefaultIndex extends VelocityViewServlet {
private static final long serialVersionUID = 3043617619650666432L;
private static final Logger log =
Red5LoggerFactory.getLogger(DefaultIndex.class,
ScopeApplicationAdapter.webAppRootKey);
+
private Configurationmanagement cfgManagement;
@Override
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
Sat Aug 13 22:42:00 2011
@@ -6,12 +6,14 @@
import java.io.RandomAccessFile;
import java.util.Date;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -32,24 +34,16 @@
private static final String defaultSWFName = "deleted.swf";
private static final String defaultPDFName = "deleted.pdf";
- @Autowired
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
-// public void doFilter(ServletRequest servletRequest,
-// ServletResponse servletResponse,
-// FilterChain filterChain) {
-//
-// HttpServletRequest req = (HttpServletRequest)servletRequest;
-//
-// try {
-// req.setCharacterEncoding("UTF-8");
-// } catch (UnsupportedEncodingException e) {
-// log.error("doFilter",e);
-// }
-// }
-
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Export.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Export.java
Sat Aug 13 22:42:00 2011
@@ -6,6 +6,7 @@
import java.util.Iterator;
import java.util.List;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -28,7 +29,6 @@
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -37,17 +37,22 @@
*/
public class Export extends HttpServlet {
private static final long serialVersionUID = 8527093674786692472L;
- private static final Logger log =
Red5LoggerFactory.getLogger(Export.class,
- ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+ private static final Logger log =
Red5LoggerFactory.getLogger(Export.class,
ScopeApplicationAdapter.webAppRootKey);
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Organisationmanagement organisationmanagement;
- @Autowired
private UsersDaoImpl usersDao;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ organisationmanagement =
(Organisationmanagement)config.getServletContext().getAttribute("organisationmanagement");
+ usersDao =
(UsersDaoImpl)config.getServletContext().getAttribute("usersDao");
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java
Sat Aug 13 22:42:00 2011
@@ -10,6 +10,7 @@
import java.util.HashMap;
import java.util.List;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -19,9 +20,27 @@
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.openmeetings.app.batik.beans.PrintBean;
+import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
+import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
+import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
+import org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl;
+import org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl;
+import
org.openmeetings.app.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.openmeetings.app.data.calendar.daos.MeetingMemberDaoImpl;
+import org.openmeetings.app.data.conference.Roommanagement;
+import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
+import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
+import org.openmeetings.app.data.flvrecord.FlvRecordingDaoImpl;
+import org.openmeetings.app.data.flvrecord.FlvRecordingMetaDataDaoImpl;
import org.openmeetings.app.data.record.WhiteboardMapToSVG;
+import org.openmeetings.app.data.user.Organisationmanagement;
+import org.openmeetings.app.data.user.Statemanagement;
import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.data.user.dao.PrivateMessageFolderDaoImpl;
+import org.openmeetings.app.data.user.dao.PrivateMessagesDaoImpl;
+import org.openmeetings.app.data.user.dao.UserContactsDaoImpl;
+import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.documents.GenerateImage;
import org.openmeetings.app.remote.PrintService;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -36,10 +55,16 @@
public class ExportToImage extends HttpServlet {
private static final long serialVersionUID = -3535998254746084297L;
private static final Logger log =
Red5LoggerFactory.getLogger(ExportToImage.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ }
/*
* (non-Javadoc)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
Sat Aug 13 22:42:00 2011
@@ -6,6 +6,7 @@
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -14,7 +15,6 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -22,9 +22,14 @@
private static final long serialVersionUID = 2848421357849982426L;
private static final Logger log =
Red5LoggerFactory.getLogger(FileExplorerUploadHandler.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
private FileExplorerItemDaoImpl fileExplorerItemDao;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ fileExplorerItemDao =
(FileExplorerItemDaoImpl)config.getServletContext().getAttribute("fileExplorerItemDao");
+ }
+
@Override
protected void fileService(HttpServletRequest httpServletRequest,
String sid, Long userId, Map<String, Object> hs)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/HttpServletRequestEx.java
Mon Oct 26 08:27:13 2009
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/HttpServletRequestEx.java
Sat Aug 13 22:42:00 2011
@@ -1,19 +1,16 @@
package org.openmeetings.servlet.outputhandler;
-import java.io.*;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
-import java.util.Map;
import java.util.HashMap;
-import java.util.Collections;
-import java.util.ArrayList;
-
-import org.slf4j.Logger; // FIXME
-import org.red5.logging.Red5LoggerFactory; // FIXME
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
public class HttpServletRequestEx extends HttpServletRequestWrapper {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Import.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Import.java
Sat Aug 13 22:42:00 2011
@@ -7,6 +7,7 @@
import java.util.Date;
import java.util.LinkedHashMap;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -21,17 +22,22 @@
import org.openmeetings.app.xmlimport.UserImport;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
public class Import extends HttpServlet {
private static final long serialVersionUID = 582610358088411294L;
private static final Logger log =
Red5LoggerFactory.getLogger(Import.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private UsersDaoImpl usersDao;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ usersDao =
(UsersDaoImpl)config.getServletContext().getAttribute("usersDao");
+ }
/*
* (non-Javadoc)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
Sat Aug 13 02:49:39 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
Sat Aug 13 22:42:00 2011
@@ -6,6 +6,7 @@
import java.util.Iterator;
import java.util.List;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -26,7 +27,6 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -35,17 +35,22 @@
*/
public class LangExport extends HttpServlet {
private static final long serialVersionUID = 243294279856160463L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- LangExport.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+ private static final Logger log =
Red5LoggerFactory.getLogger(LangExport.class,
ScopeApplicationAdapter.webAppRootKey);
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Fieldmanagment fieldmanagment;
- @Autowired
private FieldLanguageDaoImpl fieldLanguageDaoImpl;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ fieldmanagment =
(Fieldmanagment)config.getServletContext().getAttribute("fieldmanagment");
+ fieldLanguageDaoImpl =
(FieldLanguageDaoImpl)config.getServletContext().getAttribute("fieldLanguageDaoImpl");
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
Sat Aug 13 05:23:09 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
Sat Aug 13 22:42:00 2011
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -19,7 +20,6 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
@@ -27,16 +27,20 @@
public class MethodGateway extends HttpServlet {
private static final long serialVersionUID = -2954875038645746731L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- MethodGateway.class,
ScopeApplicationAdapter.webAppRootKey);
-
- @Autowired
+ private static final Logger log =
Red5LoggerFactory.getLogger(MethodGateway.class,
ScopeApplicationAdapter.webAppRootKey);
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Roommanagement roommanagement;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ roommanagement =
(Roommanagement)config.getServletContext().getAttribute("roommanagement");
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java
Fri Aug 12 11:20:41 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java
Sat Aug 13 22:42:00 2011
@@ -4,6 +4,8 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
+
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -15,10 +17,8 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.app.rtp.RTPScreenSharingSession;
import org.openmeetings.app.rtp.RTPStreamingHandler;
-import org.openmeetings.servlet.outputhandler.ScreenRequestHandler;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -26,14 +26,19 @@
*
*/
public class RTPMethodServlet extends HttpServlet{
-
+ private static final long serialVersionUID = 6781441755140201613L;
+
private static final Logger log =
Red5LoggerFactory.getLogger(ScreenRequestHandler.class,
ScopeApplicationAdapter.webAppRootKey);
-
public static final String METHOD_START = "streamer_start";
-
public static final String METHOD_STOP = "streamer_stop";
- @Autowired
+
private Sessionmanagement sessionManagement;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ }
@Override
protected void service(HttpServletRequest request, HttpServletResponse
response)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Sat Aug 13 22:42:00 2011
@@ -6,25 +6,21 @@
import java.util.HashMap;
import java.util.Iterator;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
-import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
-import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.app.rtp.RTPScreenSharingSession;
import org.openmeetings.app.rtp.RTPStreamingHandler;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -37,10 +33,16 @@
public class RTPSharerServlet extends VelocityViewServlet{
private static final long serialVersionUID = -3803050458625713769L;
private static final Logger log =
Red5LoggerFactory.getLogger(RTPSharerServlet.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ }
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sat Aug 13 22:42:00 2011
@@ -2,6 +2,7 @@
import java.io.IOException;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -22,21 +23,25 @@
import org.openmeetings.server.socket.ServerSocketMinaProcess;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
public class ScreenRequestHandler extends VelocityViewServlet {
private static final long serialVersionUID = 2381722235536488913L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- ScreenRequestHandler.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+ private static final Logger log =
Red5LoggerFactory.getLogger(ScreenRequestHandler.class,
ScopeApplicationAdapter.webAppRootKey);
+
private Sessionmanagement sessionManagement;
- @Autowired
private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private Fieldmanagment fieldmanagment;
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ cfgManagement =
(Configurationmanagement)config.getServletContext().getAttribute("cfgManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ fieldmanagment =
(Fieldmanagment)config.getServletContext().getAttribute("fieldmanagment");
+ }
+
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse, Context ctx)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
Sat Aug 13 22:42:00 2011
@@ -18,6 +18,7 @@
import java.util.LinkedHashMap;
import javax.imageio.ImageIO;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -48,16 +49,21 @@
public class ScreenServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
private static final Logger log =
Red5LoggerFactory.getLogger(ScreenServlet.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+
private Sessionmanagement sessionManagement;
- @Autowired
private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private UsersDaoImpl usersDao;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ cfgManagement =
(Configurationmanagement)config.getServletContext().getAttribute("cfgManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ usersDao =
(UsersDaoImpl)config.getServletContext().getAttribute("usersDao");
+ }
/* (non-Javadoc)
* @see
javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest,
javax.servlet.http.HttpServletResponse)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java
Sat Aug 13 22:42:00 2011
@@ -5,6 +5,7 @@
import java.io.OutputStream;
import java.io.RandomAccessFile;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -21,10 +22,16 @@
public class ScreenViewHandler extends HttpServlet {
private static final long serialVersionUID = -2221780306064491855L;
private static final Logger log =
Red5LoggerFactory.getLogger(ScreenViewHandler.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ }
/*
* (non-Javadoc)
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java
Sat Aug 13 22:42:00 2011
@@ -10,6 +10,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -36,20 +37,22 @@
private static final long serialVersionUID = 8955335681521483484L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- UploadHandler.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(UploadHandler.class,
ScopeApplicationAdapter.webAppRootKey);
private String filesString[] = null;
- @Autowired
+
private Sessionmanagement sessionManagement;
- @Autowired
private Usermanagement userManagement;
- @Autowired
private UsersDaoImpl usersDao;
- public UploadHandler() {
- }
-
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ sessionManagement =
(Sessionmanagement)config.getServletContext().getAttribute("sessionManagement");
+ userManagement =
(Usermanagement)config.getServletContext().getAttribute("userManagement");
+ usersDao =
(UsersDaoImpl)config.getServletContext().getAttribute("usersDao");
+ }
+
protected void service(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) throws
ServletException,
IOException {
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
