Revision: 4131
Author: seba.wagner
Date: Mon Aug 29 13:59:30 2011
Log: Fixes: AcitvateUser, BackupImport/BackupExport Servlets and some
Error in Backup Queries
http://code.google.com/p/openmeetings/source/detail?r=4131
Added:
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExportFacade.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImportFacade.java
Modified:
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
/branches/dev/injection/WebContent/WEB-INF/web.xml
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/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
=======================================
--- /dev/null
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExportFacade.java
Mon Aug 29 13:59:30 2011
@@ -0,0 +1,80 @@
+package org.openmeetings.servlet.outputhandler;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ *
+ * @author sebastianwagner
+ *
+ */
+public class BackupExportFacade extends HttpServlet {
+
+ private static final long serialVersionUID = -928315730609302260L;
+
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ BackupExportFacade.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ private BackupExport getBackupExport() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (BackupExport) context.getBean("backupExport");
+ } catch (Exception err) {
+ log.error("[getBackupExport]", err);
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ *
javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest
+ * , javax.servlet.http.HttpServletResponse)
+ */
+ @Override
+ protected void service(HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse) throws
ServletException,
+ IOException {
+
+ try {
+
+ if (getBackupExport() == null) {
+ OutputStream out =
httpServletResponse.getOutputStream();
+
+ String msg = "Server is not booted yet";
+
+ out.write(msg.getBytes());
+
+ out.flush();
+ out.close();
+
+ return;
+ }
+
+ getBackupExport().service(httpServletRequest,
httpServletResponse,
+ getServletContext());
+
+ } catch (Exception er) {
+ log.error("ERROR ", er);
+ log.debug("Error exporting: " + er);
+ er.printStackTrace();
+ }
+ }
+
+}
=======================================
--- /dev/null
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImportFacade.java
Mon Aug 29 13:59:30 2011
@@ -0,0 +1,75 @@
+package org.openmeetings.servlet.outputhandler;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+public class BackupImportFacade extends HttpServlet {
+
+ private static final long serialVersionUID = 2786696080712127872L;
+
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ BackupImportFacade.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ private BackupImport getBackupImport() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (BackupImport) context.getBean("backupImport");
+ } catch (Exception err) {
+ log.error("[getBackupImport]", err);
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ *
javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest
+ * , javax.servlet.http.HttpServletResponse)
+ */
+ @Override
+ protected void service(HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse) throws
ServletException,
+ IOException {
+
+ try {
+
+ if (getBackupImport() == null) {
+ OutputStream out =
httpServletResponse.getOutputStream();
+
+ String msg = "Server is not booted yet";
+
+ out.write(msg.getBytes());
+
+ out.flush();
+ out.close();
+
+ return;
+ }
+
+ getBackupImport().service(httpServletRequest,
httpServletResponse,
+ getServletContext());
+
+ } catch (Exception er) {
+ log.error("ERROR ", er);
+ log.debug("Error importing: " + er);
+ er.printStackTrace();
+ }
+ }
+
+}
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Aug 29 08:34:37 2011
+++
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Aug 29 13:59:30 2011
@@ -262,6 +262,10 @@
<bean id="userWebService"
class="org.openmeetings.axis.services.UserWebService" />
<bean id="roomWebService"
class="org.openmeetings.axis.services.RoomWebService" />
<bean id="fileWebService"
class="org.openmeetings.axis.services.FileWebService" />
+
+ <!-- Servlet Facade Beans -->
+ <bean id="backupExport"
class="org.openmeetings.servlet.outputhandler.BackupExport" />
+ <bean id="backupImport"
class="org.openmeetings.servlet.outputhandler.BackupImport" />
<tx:annotation-driven transaction-manager="jpaTransactionManager"/>
=======================================
--- /branches/dev/injection/WebContent/WEB-INF/web.xml Sun Aug 28 09:53:59
2011
+++ /branches/dev/injection/WebContent/WEB-INF/web.xml Mon Aug 29 13:59:30
2011
@@ -189,13 +189,13 @@
<description>BackupExport</description>
<display-name>BackupExport</display-name>
<servlet-name>BackupExport</servlet-name>
-
<servlet-class>org.openmeetings.servlet.outputhandler.BackupExport</servlet-class>
+
<servlet-class>org.openmeetings.servlet.outputhandler.BackupExportFacade</servlet-class>
</servlet>
<servlet>
<description>BackupImport</description>
<display-name>BackupImport</display-name>
<servlet-name>BackupImport</servlet-name>
-
<servlet-class>org.openmeetings.servlet.outputhandler.BackupImport</servlet-class>
+
<servlet-class>org.openmeetings.servlet.outputhandler.BackupImportFacade</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>DownloadHandler</servlet-name>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Sat Aug 27 03:27:19 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Mon Aug 29 13:59:30 2011
@@ -165,8 +165,7 @@
if (room != null) {
HashMap<String, RoomClient> map =
clientListManager
- .getClientListByRoom(
-
room.getRooms_id());
+
.getClientListByRoom(room.getRooms_id());
room.setCurrentusers(new
LinkedList<RoomClient>());
@@ -297,8 +296,7 @@
for (Rooms room : rooms) {
HashMap<String, RoomClient> map =
clientListManager
- .getClientListByRoom(
-
room.getRooms_id());
+
.getClientListByRoom(room.getRooms_id());
room.setCurrentusers(new
LinkedList<RoomClient>());
@@ -329,8 +327,7 @@
for (Rooms room : rooms) {
HashMap<String, RoomClient> map =
clientListManager
- .getClientListByRoom(
-
room.getRooms_id());
+
.getClientListByRoom(room.getRooms_id());
room.setCurrentusers(new
LinkedList<RoomClient>());
@@ -362,8 +359,7 @@
for (Rooms room : rooms) {
HashMap<String, RoomClient> map =
clientListManager
- .getClientListByRoom(
-
room.getRooms_id());
+
.getClientListByRoom(room.getRooms_id());
room.setCurrentusers(new
LinkedList<RoomClient>());
@@ -506,6 +502,7 @@
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Rooms> cq = cb.createQuery(Rooms.class);
+ Root<Rooms> c = cq.from(Rooms.class);
TypedQuery<Rooms> q = em.createQuery(cq);
List<Rooms> ll = q.getResultList();
return ll;
@@ -1190,6 +1187,7 @@
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Rooms_Organisation> cq = cb
.createQuery(Rooms_Organisation.class);
+ Root<Rooms_Organisation> c =
cq.from(Rooms_Organisation.class);
TypedQuery<Rooms_Organisation> q = em.createQuery(cq);
List<Rooms_Organisation> ll = q.getResultList();
return ll;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sun Aug 28 09:53:59 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Mon Aug 29 13:59:30 2011
@@ -2,9 +2,7 @@
import java.util.Date;
-import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -19,28 +17,69 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
public class ActivateUser extends VelocityViewServlet {
private static final long serialVersionUID = -8892729047921796170L;
- private static Logger log =
Red5LoggerFactory.getLogger(ActivateUser.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private Configurationmanagement cfgManagement;
- private Usermanagement userManagement;
- 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");
- }
-
+ private static Logger log =
Red5LoggerFactory.getLogger(ActivateUser.class,
+ ScopeApplicationAdapter.webAppRootKey);
+
+ private Configurationmanagement getConfigurationmanagement() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (Configurationmanagement)
context.getBean("cfgManagement");
+ } catch (Exception err) {
+ log.error("[getConfigurationmanagement]", err);
+ }
+ return null;
+ }
+
+ private Usermanagement getUsermanagement() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (Usermanagement)
context.getBean("userManagement");
+ } catch (Exception err) {
+ log.error("[getUsermanagement]", err);
+ }
+ return null;
+ }
+
+ private Fieldmanagment getFieldmanagment() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (Fieldmanagment)
context.getBean("fieldmanagment");
+ } catch (Exception err) {
+ log.error("[getgetFieldmanagment()]", err);
+ }
+ return null;
+ }
+
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse, Context ctx) {
try {
+
+ if (getConfigurationmanagement() == null
+ || getUsermanagement() == null
+ || getFieldmanagment() == null) {
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "booting.vm");
+ }
+
String hash = httpServletRequest.getParameter("u");
ServletContext context = getServletContext();
String loginURL =
context.getInitParameter("webAppRootKey");
@@ -49,97 +88,97 @@
if (hash == null) {
// No hash
Long default_lang_id = Long.valueOf(
- cfgManagement.getConfKey(3,
"default_lang_id")
-
.getConf_value()).longValue();
- Fieldlanguagesvalues labelid669 = fieldmanagment
+
getConfigurationmanagement().getConfKey(3,
+
"default_lang_id").getConf_value()).longValue();
+ Fieldlanguagesvalues labelid669 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(669), default_lang_id);
- Fieldlanguagesvalues labelid672 = fieldmanagment
+ Fieldlanguagesvalues labelid672 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(672), default_lang_id);
ctx.put("message", labelid669.getValue());
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityView().getVelocityEngine()
-
.getTemplate("activation_template.vm");
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "activation_template.vm");
}
//
- Users user =
userManagement.getUserByActivationHash(hash);
+ Users user =
getUsermanagement().getUserByActivationHash(hash);
if (user == null) {
// No User Found with this Hash
Long default_lang_id = Long.valueOf(
- cfgManagement.getConfKey(3,
"default_lang_id")
-
.getConf_value()).longValue();
-
- Fieldlanguagesvalues labelid669 = fieldmanagment
+
getConfigurationmanagement().getConfKey(3,
+
"default_lang_id").getConf_value()).longValue();
+
+ Fieldlanguagesvalues labelid669 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(669), default_lang_id);
- Fieldlanguagesvalues labelid672 = fieldmanagment
+ Fieldlanguagesvalues labelid672 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(672), default_lang_id);
ctx.put("message", labelid669.getValue());
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityView().getVelocityEngine()
-
.getTemplate("activation_template.vm");
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "activation_template.vm");
} else if (user.getStatus() == 1) {
// already activated
Long default_lang_id = Long.valueOf(
- cfgManagement.getConfKey(3,
"default_lang_id")
-
.getConf_value()).longValue();
-
- Fieldlanguagesvalues labelid670 = fieldmanagment
+
getConfigurationmanagement().getConfKey(3,
+
"default_lang_id").getConf_value()).longValue();
+
+ Fieldlanguagesvalues labelid670 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(670), default_lang_id);
- Fieldlanguagesvalues labelid672 = fieldmanagment
+ Fieldlanguagesvalues labelid672 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(672), default_lang_id);
ctx.put("message", labelid670.getValue());
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityView().getVelocityEngine()
-
.getTemplate("activation_template.vm");
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "activation_template.vm");
} else if (user.getStatus() == 0) {
// activate
user.setStatus(1);
user.setUpdatetime(new Date());
- userManagement.updateUser(user);
+ getUsermanagement().updateUser(user);
Long default_lang_id = Long.valueOf(
- cfgManagement.getConfKey(3,
"default_lang_id")
-
.getConf_value()).longValue();
-
- Fieldlanguagesvalues labelid671 = fieldmanagment
+
getConfigurationmanagement().getConfKey(3,
+
"default_lang_id").getConf_value()).longValue();
+
+ Fieldlanguagesvalues labelid671 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(671), default_lang_id);
- Fieldlanguagesvalues labelid672 = fieldmanagment
+ Fieldlanguagesvalues labelid672 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(672), default_lang_id);
ctx.put("message", labelid671.getValue());
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityView().getVelocityEngine()
-
.getTemplate("activation_template.vm");
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "activation_template.vm");
} else {
// unkown Status
Long default_lang_id = Long.valueOf(
- cfgManagement.getConfKey(3,
"default_lang_id")
-
.getConf_value()).longValue();
-
- Fieldlanguagesvalues labelid672 = fieldmanagment
+
getConfigurationmanagement().getConfKey(3,
+
"default_lang_id").getConf_value()).longValue();
+
+ Fieldlanguagesvalues labelid672 =
getFieldmanagment()
.getFieldByIdAndLanguage(new
Long(672), default_lang_id);
ctx.put("message", "Unkown Status");
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityView().getVelocityEngine()
-
.getTemplate("activation_template.vm");
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "activation_template.vm");
}
@@ -149,5 +188,4 @@
}
return null;
}
-
-}
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Mon Aug 29 13:59:30 2011
@@ -15,9 +15,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -61,54 +60,51 @@
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
/**
*
* @author sebastianwagner
*
*/
-public class BackupExport extends HttpServlet {
- private static final long serialVersionUID = -928315730609302260L;
- private static final Logger log =
Red5LoggerFactory.getLogger(BackupExport.class,
ScopeApplicationAdapter.webAppRootKey);
-
+public class BackupExport {
+
+ 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;
+ @Autowired
private AuthLevelmanagement authLevelManagement;
-
- @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");
- authLevelManagement =
(AuthLevelmanagement)config.getServletContext().getAttribute("authLevelManagement");
- }
-
+
/*
* (non-Javadoc)
*
@@ -116,10 +112,9 @@
*
javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest
* , javax.servlet.http.HttpServletResponse)
*/
- @Override
- protected void service(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse) throws
ServletException,
- IOException {
+ public void service(HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse, ServletContext
servletCtx)
+ throws ServletException, IOException {
try {
String sid = httpServletRequest.getParameter("sid");
@@ -156,7 +151,7 @@
* ##################### Create Base
Folder structure
*/
- String current_dir =
getServletContext().getRealPath("/");
+ String current_dir =
servletCtx.getRealPath("/");
String working_dir = current_dir +
"upload"
+ File.separatorChar +
"backup"
+ File.separatorChar;
@@ -271,7 +266,8 @@
/*
* ##################### Backup Meeting
Members
*/
- List<MeetingMember> membersList =
meetingMemberDao.getMeetingMembers();
+ List<MeetingMember> membersList =
meetingMemberDao
+ .getMeetingMembers();
if (membersList != null) {
Document doc = this
@@ -288,7 +284,8 @@
/*
* ##################### LDAP Configs
*/
- List<LdapConfig> ldapConfigList =
ldapConfigDao.getLdapConfigs();
+ List<LdapConfig> ldapConfigList =
ldapConfigDao
+ .getLdapConfigs();
if (ldapConfigList != null) {
Document doc = this
@@ -305,7 +302,8 @@
/*
* ##################### Private
Messages
*/
- List<PrivateMessages> privateMessages =
privateMessagesDao.getPrivateMessages();
+ List<PrivateMessages> privateMessages =
privateMessagesDao
+ .getPrivateMessages();
if (privateMessages != null) {
Document doc = this
@@ -321,7 +319,8 @@
/*
* ##################### Private
Message Folders
*/
- List<PrivateMessageFolder> privateMessageFolders =
privateMessageFolderDao.getPrivateMessageFolders();
+ List<PrivateMessageFolder> privateMessageFolders =
privateMessageFolderDao
+
.getPrivateMessageFolders();
if (privateMessageFolders != null) {
Document doc = this
@@ -338,7 +337,8 @@
/*
* ##################### User Contacts
*/
- List<UserContacts> userContacts =
userContactsDao.getUserContacts();
+ List<UserContacts> userContacts =
userContactsDao
+ .getUserContacts();
if (privateMessageFolders != null) {
Document doc = this
@@ -354,11 +354,13 @@
/*
* ##################### File-Explorer
*/
- List<FileExplorerItem> fileExplorerList =
fileExplorerItemDao.getFileExplorerItems();
+ List<FileExplorerItem> fileExplorerList
= fileExplorerItemDao
+ .getFileExplorerItems();
if (fileExplorerList != null) {
- Document doc =
this.createFileExplorerItemDocument(fileExplorerList);
+ Document doc = this
+
.createFileExplorerItemDocument(fileExplorerList);
String aListXML = backup_dir +
"fileExplorerItems.xml";
@@ -371,13 +373,14 @@
/*
* ##################### Recordings
*/
- List<FlvRecording> flvRecordings =
flvRecordingDao.getAllFlvRecordings();
+ List<FlvRecording> flvRecordings =
flvRecordingDao
+ .getAllFlvRecordings();
for (FlvRecording flvRecording :
flvRecordings) {
flvRecording
-
.setFlvRecordingMetaData(flvRecordingMetaDataDao.getFlvRecordingMetaDataByRecording(
-
flvRecording
-
.getFlvRecordingId()));
+
.setFlvRecordingMetaData(flvRecordingMetaDataDao
+
.getFlvRecordingMetaDataByRecording(flvRecording
+
.getFlvRecordingId()));
}
if (privateMessageFolders != null) {
@@ -849,7 +852,8 @@
room.addElement("isClosed").addCDATA("" +
r.getIsClosed());
room.addElement("redirectURL").addCDATA("" +
r.getRedirectURL());
- List<RoomModerators> roomModeratorsList =
roomModeratorsDao.getRoomModeratorByRoomId(r.getRooms_id());
+ List<RoomModerators> roomModeratorsList =
roomModeratorsDao
+
.getRoomModeratorByRoomId(r.getRooms_id());
Element room_moderators =
room.addElement("room_moderators");
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Mon Aug 29 13:59:30 2011
@@ -19,9 +19,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -75,33 +74,56 @@
import org.openmeetings.utils.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-
-public class BackupImport extends HttpServlet {
- private static final long serialVersionUID = 2786696080712127872L;
-
- private static final Logger log =
Red5LoggerFactory.getLogger(BackupImport.class,
ScopeApplicationAdapter.webAppRootKey);
-
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class BackupImport {
+
+ 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;
+ @Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
+ @Autowired
private AuthLevelmanagement authLevelManagement;
private final HashMap<Long, Long> usersMap = new HashMap<Long, Long>();
@@ -116,44 +138,9 @@
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");
- scopeApplicationAdapter =
(ScopeApplicationAdapter)config.getServletContext().getAttribute("scopeApplicationAdapter");
- authLevelManagement =
(AuthLevelmanagement)config.getServletContext().getAttribute("authLevelManagement");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- *
javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest
- * , javax.servlet.http.HttpServletResponse)
- */
- @Override
- protected void service(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse) throws
ServletException,
- IOException {
+ public void service(HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse, ServletContext
servletCtx)
+ throws ServletException, IOException {
try {
@@ -176,10 +163,9 @@
Long users_id =
sessionManagement.checkSession(sid);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkAdminLevel(
- user_level)) {
-
- String current_dir =
getServletContext().getRealPath("/");
+ if
(authLevelManagement.checkAdminLevel(user_level)) {
+
+ String current_dir =
servletCtx.getRealPath("/");
String working_dir = current_dir +
"upload"
+ File.separatorChar +
"import"
+ File.separatorChar;
@@ -490,7 +476,8 @@
hs.put("error", "");
hs.put("fileName", completeName);
- scopeApplicationAdapter.sendMessageWithClientByPublicSID(hs,
publicSID);
+
scopeApplicationAdapter.sendMessageWithClientByPublicSID(
+ hs, publicSID);
}
@@ -891,16 +878,19 @@
for (FlvRecording flvRecording : flvRecordings) {
- Long flvRecordingId =
flvRecordingDao.addFlvRecordingObj(flvRecording);
+ Long flvRecordingId = flvRecordingDao
+ .addFlvRecordingObj(flvRecording);
for (FlvRecordingMetaData flvRecordingMetaData :
flvRecording
.getFlvRecordingMetaData()) {
- FlvRecording flvRecordingSaved =
flvRecordingDao.getFlvRecordingById(flvRecordingId);
+ FlvRecording flvRecordingSaved = flvRecordingDao
+
.getFlvRecordingById(flvRecordingId);
flvRecordingMetaData.setFlvRecording(flvRecordingSaved);
-
flvRecordingMetaDataDao.addFlvRecordingMetaDataObj(flvRecordingMetaData);
+ flvRecordingMetaDataDao
+
.addFlvRecordingMetaDataObj(flvRecordingMetaData);
}
@@ -1126,10 +1116,12 @@
for (PrivateMessageFolder privateMessageFolder :
privateMessageFolders) {
Long folderId =
privateMessageFolder.getPrivateMessageFolderId();
- PrivateMessageFolder storedFolder =
privateMessageFolderDao.getPrivateMessageFolderById(folderId);
+ PrivateMessageFolder storedFolder =
privateMessageFolderDao
+ .getPrivateMessageFolderById(folderId);
if (storedFolder == null) {
privateMessageFolder.setPrivateMessageFolderId(0);
- Long newFolderId =
privateMessageFolderDao.addPrivateMessageFolderObj(privateMessageFolder);
+ Long newFolderId = privateMessageFolderDao
+
.addPrivateMessageFolderObj(privateMessageFolder);
messageFoldersMap.put(folderId, newFolderId);
}
}
@@ -1297,7 +1289,8 @@
for (UserContacts uc : ucList) {
Long userContactId = uc.getUserContactId();
- UserContacts storedUC =
userContactsDao.getUserContacts(userContactId);
+ UserContacts storedUC = userContactsDao
+ .getUserContacts(userContactId);
if (storedUC == null) {
uc.setUserContactId(0);
@@ -1968,7 +1961,8 @@
roomModerators
.setIsSuperModerator(is_supermoderator);
-
roomModeratorsDao.addRoomModeratorByObj(roomModerators);
+
roomModeratorsDao
+
.addRoomModeratorByObj(roomModerators);
}
@@ -1996,7 +1990,8 @@
long itemId = fileExplorerItem.getFileExplorerItemId();
fileExplorerItem.setFileExplorerItemId(0);
- long newItemId =
fileExplorerItemDao.addFileExplorerItem(fileExplorerItem);
+ long newItemId = fileExplorerItemDao
+ .addFileExplorerItem(fileExplorerItem);
fileExplorerItemsMap.put(itemId, newItemId);
}
--
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.
