Author: solomax
Date: Tue Aug 13 06:01:33 2013
New Revision: 1513359
URL: http://svn.apache.org/r1513359
Log:
[OPENMEETINGS-760] code cleanup
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
- copied, changed from r1513344,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
- copied, changed from r1513344,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/LangExport.java
- copied, changed from r1513344,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MeetingMemberService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Tue Aug 13 06:01:33 2013
@@ -80,7 +80,6 @@
<bean id="xmlcrm.service"
class="org.apache.openmeetings.remote.MainService" />
<bean id="printservice.service"
class="org.apache.openmeetings.remote.PrintService" />
<bean id="pollservice.service"
class="org.apache.openmeetings.remote.PollService" />
- <bean id="meetingmemberservice.service"
class="org.apache.openmeetings.remote.MeetingMemberService" />
<bean id="languageservice.service"
class="org.apache.openmeetings.remote.LanguageService" />
<bean id="invitationservice.service"
class="org.apache.openmeetings.remote.InvitationService" />
<bean id="whiteboardservice.service"
class="org.apache.openmeetings.remote.WhiteBoardService" />
@@ -91,7 +90,6 @@
<bean id="errorservice.service"
class="org.apache.openmeetings.remote.ErrorService" />
<bean id="conferenceservice.service"
class="org.apache.openmeetings.remote.ConferenceService" />
<bean id="chatservice.service"
class="org.apache.openmeetings.remote.ChatService" />
- <bean id="calendarservice.service"
class="org.apache.openmeetings.remote.CalendarService" />
<bean id="flvrecorderservice.service"
class="org.apache.openmeetings.remote.FLVRecorderService" />
<bean id="openmeetings.FlvRecorderConverterTask"
class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask"
/>
<bean id="openmeetings.FlvInterviewConverterTask"
class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask"
/>
@@ -292,7 +290,6 @@
<bean id="feedbackManagement"
class="org.apache.openmeetings.data.conference.FeedbackManager" />
<bean id="importInitvalues"
class="org.apache.openmeetings.installation.ImportInitvalues" />
<bean id="languageImport"
class="org.apache.openmeetings.xmlimport.LanguageImport" />
- <bean id="userImport"
class="org.apache.openmeetings.xmlimport.UserImport" />
<bean id="libraryWmlLoader"
class="org.apache.openmeetings.documents.LibraryWmlLoader" />
<bean id="authLevelManagement"
class="org.apache.openmeetings.data.basic.AuthLevelUtil" />
<bean id="generateSWF"
class="org.apache.openmeetings.documents.GenerateSWF" />
@@ -323,7 +320,6 @@
<bean id="calendarWebService"
class="org.apache.openmeetings.axis.services.CalendarWebService" />
<bean id="jabberWebService"
class="org.apache.openmeetings.axis.services.JabberWebService" />
<bean id="serverWebService"
class="org.apache.openmeetings.axis.services.ServerWebService" />
-
<!-- Servlet Facade Beans -->
- <bean id="backupExport"
class="org.apache.openmeetings.servlet.outputhandler.BackupExport" />
+ <bean id="backupExport"
class="org.apache.openmeetings.utils.BackupExport" />
</beans>
Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Tue Aug 13
06:01:33 2013
@@ -92,21 +92,9 @@
<servlet-class>org.apache.openmeetings.servlet.outputhandler.DownloadHandler</servlet-class>
</servlet>
<servlet>
- <servlet-name>LangExport</servlet-name>
-
<servlet-class>org.apache.openmeetings.servlet.outputhandler.LangExport</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>Export</servlet-name>
-
<servlet-class>org.apache.openmeetings.servlet.outputhandler.Export</servlet-class>
- </servlet>
- <servlet>
<servlet-name>ExportToImage</servlet-name>
<servlet-class>org.apache.openmeetings.servlet.outputhandler.ExportToImage</servlet-class>
</servlet>
- <servlet>
- <servlet-name>ActivateUser</servlet-name>
-
<servlet-class>org.apache.openmeetings.servlet.outputhandler.ActivateUser</servlet-class>
- </servlet>
<!-- Axis2 Settings -->
<servlet>
<servlet-name>AxisServlet</servlet-name>
@@ -123,21 +111,9 @@
<url-pattern>/DownloadHandler</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>LangExport</servlet-name>
- <url-pattern>/LangExport</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Export</servlet-name>
- <url-pattern>/Export</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
<servlet-name>ExportToImage</servlet-name>
<url-pattern>/ExportToImage</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>ActivateUser</servlet-name>
- <url-pattern>/activateUser</url-pattern>
- </servlet-mapping>
<!-- Axis2 -->
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
Tue Aug 13 06:01:33 2013
@@ -50,8 +50,8 @@ import org.apache.openmeetings.installat
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.servlet.outputhandler.BackupExport;
-import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
+import org.apache.openmeetings.utils.BackupExport;
+import org.apache.openmeetings.utils.BackupImport;
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OMContextListener;
import org.apache.openmeetings.utils.OmFileHelper;
@@ -602,7 +602,7 @@ public class Admin {
private void restoreOm(String ctxName, File backup) {
try {
- BackupImportController importCtrl =
getApplicationContext(ctxName).getBean(BackupImportController.class);
+ BackupImport importCtrl =
getApplicationContext(ctxName).getBean(BackupImport.class);
importCtrl.performImport(new FileInputStream(backup));
} catch (Exception e) {
handleError("Restore failed", e);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
Tue Aug 13 06:01:33 2013
@@ -59,7 +59,7 @@ public class LdapConfig implements Seria
public String name;
@Column(name="config_file_name")
- @Element(data=true)
+ @Element(data=true, required = false)
public String configFileName;
@Column(name="add_domain_to_user_name")
@@ -67,7 +67,7 @@ public class LdapConfig implements Seria
public boolean addDomainToUserName;
@Column(name="domain")
- @Element(data=true)
+ @Element(data=true, required = false)
public String domain;
@Column(name="is_active")
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
Tue Aug 13 06:01:33 2013
@@ -150,19 +150,19 @@ public class Appointment implements Seri
private AppointmentReminderTyps remind;
@Column(name = "isdaily")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isDaily;
@Column(name = "isweekly")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isWeekly;
@Column(name = "ismonthly")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isMonthly;
@Column(name = "isyearly")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isYearly;
@ManyToOne(fetch = FetchType.EAGER)
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
Tue Aug 13 06:01:33 2013
@@ -129,7 +129,7 @@ public class PrivateMessage implements S
private boolean isTrash;
@Column(name="parent_message_id")
- @Element(data=true)
+ @Element(data=true, required = false)
private Long parentMessage;
@Column(name="private_message_folder_id")
@@ -141,7 +141,7 @@ public class PrivateMessage implements S
private boolean isContactRequest;
@Column(name="user_contact_id")
- @Element(data=true)
+ @Element(data=true, required = false)
private Long userContactId;
public long getPrivateMessageId() {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
Tue Aug 13 06:01:33 2013
@@ -118,7 +118,7 @@ public class User implements Serializabl
private Long user_id;
@Column(name = "age")
- @Element(data = true)
+ @Element(data = true, required = false)
private Date age;
@Column(name = "availible")
@@ -145,7 +145,7 @@ public class User implements Serializabl
private Long level_id;
@Column(name = "login")
- @Element(data = true)
+ @Element(data = true, required = false)
private String login;
@Basic(fetch = FetchType.LAZY)
@@ -155,7 +155,7 @@ public class User implements Serializabl
private String password;
@Column(name = "regdate")
- @Element(data = true)
+ @Element(data = true, required = false)
private Date regdate;
@Column(name = "status")
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
Tue Aug 13 06:01:33 2013
@@ -31,8 +31,8 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.utils.BackupImport;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -43,7 +43,7 @@ public class TestOldBackups extends Abst
TestOldBackups.class,
OpenmeetingsVariables.webAppRootKey);
@Autowired
- private BackupImportController backupController;
+ private BackupImport backupController;
@Autowired
private OrganisationDao organisationDao;
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
Tue Aug 13 06:01:33 2013
@@ -23,8 +23,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
+import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.remote.CalendarService;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,13 +35,13 @@ public class TestDatabaseStructureGetApp
private static final Logger log =
Logger.getLogger(TestDatabaseStructureGetAppointmentByRange.class);
@Autowired
- private CalendarService calendarService;
+ private AppointmentLogic appointmentLogic;
@Test
public void testAddingGroup(){
try {
- List<Appointment> listAppoints =
calendarService.getAppointmentByRange("SID",Calendar.getInstance().getTime(),
Calendar.getInstance().getTime());
+ List<Appointment> listAppoints =
appointmentLogic.getAppointmentByRange(1L, Calendar.getInstance().getTime(),
Calendar.getInstance().getTime());
//List<Appointment> listAppoints =
AppointmentDaoImpl.getInstance().getAppointmentsByRange(Calendar.getInstance().getTime(),
Calendar.getInstance().getTime());
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
Tue Aug 13 06:01:33 2013
@@ -29,7 +29,7 @@ import java.util.Map.Entry;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
-import org.apache.openmeetings.servlet.outputhandler.LangExport;
+import org.apache.openmeetings.utils.LangExport;
import org.apache.openmeetings.utils.OmFileHelper;
import org.dom4j.Document;
import org.dom4j.DocumentException;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
(from r1513344,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java&r1=1513344&r2=1513359&rev=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
Tue Aug 13 06:01:33 2013
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.utils;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.io.FileOutputStream;
@@ -35,7 +37,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.backup.AppointmentCategoryConverter;
import org.apache.openmeetings.backup.AppointmentConverter;
import org.apache.openmeetings.backup.AppointmentReminderTypeConverter;
@@ -78,7 +79,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
import org.apache.openmeetings.persistence.beans.user.State;
import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.simpleframework.xml.Serializer;
@@ -98,9 +98,7 @@ import org.springframework.beans.factory
*
*/
public class BackupExport {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- BackupExport.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(BackupExport.class, webAppRootKey);
private static final String BACKUP_COMMENT =
"###############################################\n"
+ "This File is auto-generated by the Backup Tool \n"
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
(from r1513344,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java&r1=1513344&r2=1513359&rev=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
Tue Aug 13 06:01:33 2013
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.utils;
import static org.apache.commons.transaction.util.FileHelper.copyRec;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.CRYPT_KEY;
import static
org.apache.openmeetings.utils.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.utils.OmFileHelper.getUploadDir;
@@ -40,9 +41,6 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Transformer;
@@ -51,7 +49,6 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.backup.AppointmentCategoryConverter;
import org.apache.openmeetings.backup.AppointmentConverter;
import org.apache.openmeetings.backup.AppointmentReminderTypeConverter;
@@ -84,7 +81,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UserContactsDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
@@ -110,7 +106,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.UserContact;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.MD5Implementation;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -124,20 +119,14 @@ import org.simpleframework.xml.stream.No
import org.simpleframework.xml.transform.RegistryMatcher;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-@Controller
-public class BackupImportController extends AbstractUploadController {
+public class BackupImport {
- private static final Logger log = Red5LoggerFactory.getLogger(
- BackupImportController.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(BackupImport.class, webAppRootKey);
@Autowired
private AppointmentDao appointmentDao;
@@ -283,7 +272,9 @@ public class BackupImportController exte
{
List<User> list = readUserList(f, "users.xml", "users");
for (User u : list) {
-
+ if (u.getLogin() == null) {
+ continue;
+ }
//FIXME: OPENMEETINGS-750
//Convert old Backups with OmTimeZone to new
schema
@@ -615,38 +606,6 @@ public class BackupImportController exte
FileHelper.removeRec(f);
}
- @RequestMapping(value = "/backup.upload", method = RequestMethod.POST)
- public void service(HttpServletRequest request,
- HttpServletResponse httpServletResponse)
- throws ServletException, IOException {
-
- UploadInfo info = validate(request, true);
- try {
- MultipartFile multipartFile = info.file;
- InputStream is = multipartFile.getInputStream();
- performImport(is);
-
- UploadCompleteMessage uploadCompleteMessage = new
UploadCompleteMessage(
- info.userId,
- "library", //message
- "import", //action
- "", //error
- info.filename);
-
-
scopeApplicationAdapter.sendUploadCompletMessageByPublicSID(
- uploadCompleteMessage, info.publicSID);
-
- } catch (Exception e) {
-
- log.error("[ImportExport]", e);
-
- e.printStackTrace();
- throw new ServletException(e);
- }
-
- return;
- }
-
private <T> List<T> readList(Serializer ser, File baseDir, String
fileName, String listNodeName, Class<T> clazz) throws Exception {
return readList(ser, baseDir, fileName, listNodeName, clazz,
false);
}
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/LangExport.java
(from r1513344,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/LangExport.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/LangExport.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java&r1=1513344&r2=1513359&rev=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/LangExport.java
Tue Aug 13 06:01:33 2013
@@ -16,47 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.utils;
-import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
-import java.util.Date;
import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.FieldLanguageDao;
-import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.servlet.BaseHttpServlet;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
/**
*
* @author sebastianwagner
*
*/
-public class LangExport extends BaseHttpServlet {
-
- private static final long serialVersionUID = 243294279856160463L;
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- LangExport.class, OpenmeetingsVariables.webAppRootKey);
-
+public class LangExport {
public static final String FILE_COMMENT = ""
+ "\n"
+ " Licensed to the Apache Software Foundation (ASF)
under one\n"
@@ -84,84 +63,6 @@ public class LangExport extends BaseHttp
+ "see
http://openmeetings.apache.org/LanguageEditor.html for Details \n"
+ "###############################################";
- /*
- * (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 (getBean(UserManager.class) == null
- || getBean(FieldLanguageDao.class) ==
null
- || getBean(FieldManager.class) == null
- || getBean(SessiondataDao.class) ==
null) {
- return;
- }
-
- String sid = httpServletRequest.getParameter("sid");
- if (sid == null) {
- sid = "default";
- }
- log.debug("sid: " + sid);
-
- String language =
httpServletRequest.getParameter("language");
- if (language == null) {
- language = "0";
- }
- Long language_id = Long.valueOf(language).longValue();
- log.debug("language_id: " + language_id);
-
- Long users_id =
getBean(SessiondataDao.class).checkSession(sid);
- Long user_level =
getBean(UserManager.class).getUserLevelByID(users_id);
-
- log.debug("users_id: " + users_id);
- log.debug("user_level: " + user_level);
-
- if (user_level != null && user_level > 0) {
- FieldLanguage fl =
getBean(FieldLanguageDao.class)
-
.getFieldLanguageById(language_id);
-
- List<Fieldlanguagesvalues> flvList =
getBean(FieldManager.class).getMixedFieldValuesList(language_id);
-
- if (fl != null && flvList != null) {
- Document doc = createDocument(flvList,
getBean(FieldManager.class).getUntranslatedFieldValuesList(language_id));
-
- String requestedFile = fl.getName() +
".xml";
-
- httpServletResponse.reset();
- httpServletResponse.resetBuffer();
- OutputStream out =
httpServletResponse.getOutputStream();
- httpServletResponse
-
.setContentType("APPLICATION/OCTET-STREAM");
-
httpServletResponse.setHeader("Content-Disposition",
- "attachment;
filename=\"" + requestedFile + "\"");
- //
httpServletResponse.setHeader("Content-Length", ""+
- // rf.length());
-
- serializetoXML(out, "UTF-8", doc);
-
- out.flush();
- out.close();
- }
- } else {
- log.debug("ERROR LangExport: not authorized
FileDownload "
- + (new Date()));
- }
-
- } catch (Exception er) {
- log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
- }
- }
-
public static Document createDocument() {
Document document = DocumentHelper.createDocument();
document.setXMLEncoding("UTF-8");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
Tue Aug 13 06:01:33 2013
@@ -41,9 +41,9 @@
</div>
<div class="formelement">
<!-- Perform Download -->
- <input type="submit"
wicket:ommessage="value:1536" wicket:id="upload" />
+ <input type="submit"
wicket:ommessage="value:1536" wicket:id="upload" class="ui-button ui-widget
ui-state-default ui-corner-all"/>
<!-- Perform Upload -->
- <input type="submit"
wicket:ommessage="value:1066" wicket:id="download" />
+ <input type="submit"
wicket:ommessage="value:1066" wicket:id="download" class="ui-button ui-widget
ui-state-default ui-corner-all"/>
</div>
<div class="formelement">
<!-- Max upload size -->
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
Tue Aug 13 06:01:33 2013
@@ -27,8 +27,8 @@ import java.text.DecimalFormat;
import java.util.Date;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.servlet.outputhandler.BackupExport;
-import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
+import org.apache.openmeetings.utils.BackupExport;
+import org.apache.openmeetings.utils.BackupImport;
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
@@ -156,7 +156,7 @@ public class BackupPanel extends AdminPa
uploadFeedback.error("File is empty");
return;
}
-
getBean(BackupImportController.class).performImport(upload.getInputStream());
+
getBean(BackupImport.class).performImport(upload.getInputStream());
} catch (IOException e) {
log.error("IOException on panel
backup upload ", e);
uploadFeedback.error(e);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1513359&r1=1513358&r2=1513359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
Tue Aug 13 06:01:33 2013
@@ -34,8 +34,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
-import org.apache.openmeetings.servlet.outputhandler.ImportController;
-import org.apache.openmeetings.servlet.outputhandler.LangExport;
+import org.apache.openmeetings.utils.LangExport;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
@@ -43,6 +42,7 @@ import org.apache.openmeetings.web.data.
import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.util.AjaxDownload;
+import org.apache.openmeetings.xmlimport.LanguageImport;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -177,7 +177,7 @@ public class LangPanel extends AdminPane
importFeedback.error("File is
empty");
return;
}
-
getBean(ImportController.class).importLanguage(language.getLanguage_id(),
download.getInputStream());
+
getBean(LanguageImport.class).addLanguageByDocument(language.getLanguage_id(),
download.getInputStream());
} catch (IOException e) {
log.error("IOException on panel
language editor import ", e);
importFeedback.error(e);
