You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/10/04 19:02:19 UTC
svn commit: r1529218 [6/7] - in /openmeetings/trunk/singlewebapp: ./
.settings/ docs/ src/axis/ src/axis/java/ src/axis/java/org/
src/axis/java/org/apache/ src/axis/java/org/apache/openmeetings/
src/axis/java/org/apache/openmeetings/axis/ src/axis/java...
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java Fri Oct 4 17:02:13 2013
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.servlet.outputhandler;
-import static org.apache.openmeetings.utils.OmFileHelper.bigImagePrefix;
-import static org.apache.openmeetings.utils.OmFileHelper.chatImagePrefix;
-import static org.apache.openmeetings.utils.OmFileHelper.profileImagePrefix;
-import static org.apache.openmeetings.utils.OmFileHelper.thumbImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.profileImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
import java.io.File;
import java.io.InputStream;
@@ -34,19 +34,20 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.converter.GenerateImage;
+import org.apache.openmeetings.converter.GenerateThumbs;
import org.apache.openmeetings.data.file.FileProcessor;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.documents.GenerateImage;
import org.apache.openmeetings.documents.GeneratePDF;
-import org.apache.openmeetings.documents.GenerateThumbs;
-import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
-import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.utils.OmFileHelper;
-import org.apache.openmeetings.utils.StoredFile;
-import org.apache.openmeetings.utils.stringhandlers.StringComparer;
+import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.StoredFile;
+import org.apache.openmeetings.util.process.ConverterProcessResultList;
+import org.apache.openmeetings.util.process.UploadCompleteMessage;
+import org.apache.openmeetings.util.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -120,7 +121,7 @@ public class UploadController extends Ab
uploadCompleteMessage.setMessage("library");
uploadCompleteMessage.setAction("newFile");
- uploadCompleteMessage.setFileExplorerItem(
+ setFileExplorerItem(uploadCompleteMessage,
fileExplorerItemDao.getFileExplorerItemsById(
returnError.getFileExplorerItemId()));
@@ -141,6 +142,20 @@ public class UploadController extends Ab
}
}
+ public void setFileExplorerItem(UploadCompleteMessage msg, FileExplorerItem fileExplorerItem) {
+ if (fileExplorerItem.getIsImage() != null) {
+ msg.setIsImage(fileExplorerItem.getIsImage());
+ }
+ if (fileExplorerItem.getIsVideo() != null) {
+ msg.setIsVideo(fileExplorerItem.getIsVideo());
+ }
+ if (fileExplorerItem.getIsPresentation() != null) {
+ msg.setIsPresentation(fileExplorerItem.getIsPresentation());
+ }
+ msg.setFileSystemName(fileExplorerItem.getFileName());
+ msg.setFileHash(fileExplorerItem.getFileHash());
+ }
+
@RequestMapping(value = "/remotelog.upload", method = RequestMethod.POST)
public void handleRemoteLog(HttpServletRequest request, HttpServletResponse response) throws ServletException {
String message = request.getParameter("message");
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java Fri Oct 4 17:02:13 2013
@@ -29,11 +29,13 @@ import java.util.Map.Entry;
import java.util.Random;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.db.dao.server.ISessionManager;
+import org.apache.openmeetings.db.dto.basic.SearchResult;
+import org.apache.openmeetings.db.dto.server.ClientSessionInfo;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.session.store.IClientPersistenceStore;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +55,6 @@ public class SessionManager implements I
@Autowired
private ServerUtil serverUtil;
- @Autowired
- private ManageCryptStyle manageCryptStyle;
/**
* Injected via Spring, needs a getter/setter because it can be configured
@@ -85,7 +85,7 @@ public class SessionManager implements I
rcm.setScope(scopeName);
long random = System.currentTimeMillis() + new BigInteger(256, new Random()).longValue();
- rcm.setPublicSID(manageCryptStyle.getInstanceOfCrypt()
+ rcm.setPublicSID(ManageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(String.valueOf(random).toString()));
rcm.setServer(server);
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Fri Oct 4 17:02:13 2013
@@ -86,7 +86,7 @@
<bean id="userservice.service" class="org.apache.openmeetings.remote.UserService" />
<bean id="fileservice.service" class="org.apache.openmeetings.remote.ConferenceLibrary" />
<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.data.file.FileProcessor" />
- <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.data.flvrecord.converter.FlvExplorerConverter" />
+ <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.converter.FlvExplorerConverter" />
<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" />
@@ -94,8 +94,8 @@
<bean id="openmeetings.FlvRecorderConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask" />
<bean id="openmeetings.FlvInterviewConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask" />
<bean id="openmeetings.FlvInterviewReConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask" />
- <bean id="openmeetings.FlvInterviewConverter" class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverter" />
- <bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverter" />
+ <bean id="openmeetings.FlvInterviewConverter" class="org.apache.openmeetings.converter.FlvInterviewConverter" />
+ <bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.converter.FlvRecorderConverter" />
<bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.cluster.SlaveHTTPConnectionManager" />
<bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.quartz.scheduler.SessionClearJob" />
@@ -170,7 +170,7 @@
</bean>
<!-- Mail related jobs -->
- <bean id="mailHandler" class="org.apache.openmeetings.utils.mail.MailHandler" />
+ <bean id="mailHandler" class="org.apache.openmeetings.mail.MailHandler" />
<bean id="resetSendingMailStatus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="mailHandler" />
@@ -257,6 +257,8 @@
<bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
<bean id="userManagement" class="org.apache.openmeetings.data.user.UserManager" />
<bean id="roomModeratorsDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorsDao" />
+ <bean id="roomOrganisationDao" class="org.apache.openmeetings.db.dao.room.RoomOrganisationDao"/>
+ <bean id="roomTypeDao" class="org.apache.openmeetings.db.dao.room.RoomTypeDao" />
<bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
<bean id="conferenceLogTypeDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogTypeDao" />
<bean id="emailManagement" class="org.apache.openmeetings.data.user.EmailManager" />
@@ -275,6 +277,7 @@
<bean id="dao" class="org.apache.openmeetings.db.dao.user.AbstractUserDao" />
<bean id="usersDao" class="org.apache.openmeetings.db.dao.user.UserDao" />
<bean id="adminUserDao" class="org.apache.openmeetings.db.dao.user.AdminUserDao" />
+ <bean id="userLevelDao" class="org.apache.openmeetings.db.dao.user.UserLevelDao" />
<bean id="serverDao" class="org.apache.openmeetings.db.dao.server.ServerDao" />
<bean id="chatDao" class="org.apache.openmeetings.db.dao.basic.ChatDao" />
<bean id="clientDao" class="org.apache.openmeetings.db.dao.room.ClientDao" />
@@ -282,22 +285,20 @@
<bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" />
<!-- No Interface -->
- <bean id="manageCryptStyle" class="org.apache.openmeetings.utils.crypt.ManageCryptStyle" />
- <bean id="generateImage" class="org.apache.openmeetings.documents.GenerateImage" />
- <bean id="generateThumbs" class="org.apache.openmeetings.documents.GenerateThumbs" />
+ <bean id="generateImage" class="org.apache.openmeetings.converter.GenerateImage" />
+ <bean id="generateThumbs" class="org.apache.openmeetings.converter.GenerateThumbs" />
<bean id="generatePDF" class="org.apache.openmeetings.documents.GeneratePDF" />
- <bean id="smsHandler" class="org.apache.openmeetings.utils.sms.SMSHandler" />
+ <bean id="smsHandler" class="org.apache.openmeetings.mail.SMSHandler" />
<bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" />
- <bean id="languageImport" class="org.apache.openmeetings.xmlimport.LanguageImport" />
+ <bean id="languageImport" class="org.apache.openmeetings.backup.LanguageImport" />
<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" />
+ <bean id="generateSWF" class="org.apache.openmeetings.converter.GenerateSWF" />
<bean id="fileUtils" class="org.apache.openmeetings.data.file.FileUtils" />
<bean id="ldapLoginManagement" class="org.apache.openmeetings.ldap.LdapLoginManagement" />
- <bean id="timezoneUtil" class="org.apache.openmeetings.utils.TimezoneUtil" />
+ <bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" />
<bean id="whiteboardManagement" class="org.apache.openmeetings.data.whiteboard.WhiteboardManager" />
- <bean id="backupExport" class="org.apache.openmeetings.utils.BackupExport" />
- <bean id="backupImport" class="org.apache.openmeetings.utils.BackupImport" />
+ <bean id="backupExport" class="org.apache.openmeetings.backup.BackupExport" />
+ <bean id="backupImport" class="org.apache.openmeetings.backup.BackupImport" />
<!-- Thread Executor -->
<bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/web.xml?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/web.xml Fri Oct 4 17:02:13 2013
@@ -31,7 +31,7 @@
-->
<listener>
- <listener-class>org.apache.openmeetings.utils.OMContextListener</listener-class>
+ <listener-class>org.apache.openmeetings.util.OMContextListener</listener-class>
</listener>
<filter>
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Fri Oct 4 17:02:13 2013
@@ -32,8 +32,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
-import org.apache.openmeetings.utils.OmFileHelper;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.OmFileHelper;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.red5.logging.Red5LoggerFactory;
@@ -66,8 +65,6 @@ public abstract class AbstractOpenmeetin
private ImportInitvalues importInitvalues;
@Autowired
private ConfigurationDao configurationDao;
- @Autowired
- private ManageCryptStyle cryptManager;
@Before
public void setUp() throws Exception {
@@ -117,7 +114,7 @@ public abstract class AbstractOpenmeetin
u.setFirstname("firstname" + rnd);
u.setLastname("lastname" + rnd);
u.setLogin("login");
- u.updatePassword(cryptManager, configurationDao, "pass" + rnd);
+ u.updatePassword(configurationDao, "pass" + rnd);
u.setLanguage_id(1L);
Long user_id = userManager.addUser(u);
assertTrue("Cann't add user", user_id > 0);
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Fri Oct 4 17:02:13 2013
@@ -25,14 +25,15 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
+import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.room.RoomOrganisationDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
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;
@@ -55,6 +56,8 @@ public class TestOldBackups extends Abst
private AppointmentDao appointmentDao;
@Autowired
private MeetingMemberDao meetingMemberDao;
+ @Autowired
+ private RoomOrganisationDao roomOrganisationDao;
@Test
public void importOldVersions() {
@@ -77,7 +80,7 @@ public class TestOldBackups extends Abst
long newOrgCount = organisationDao.count();
long newUserCount = usersDao.count();
long newRoomCount = roomDao.count();
- long newRoomOrgCount = roomManager.getRoomsOrganisations().size();
+ long newRoomOrgCount = roomOrganisationDao.get().size();
long newApptCount = appointmentDao.getAppointments().size();
long newMeetingMembersCount = meetingMemberDao.getMeetingMembers().size();
assertTrue("Zero organizations were imported", newOrgCount > orgCount);
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Fri Oct 4 17:02:13 2013
@@ -19,8 +19,8 @@
package org.apache.openmeetings.test.calendar;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Fri Oct 4 17:02:13 2013
@@ -63,9 +63,9 @@ import net.fortuna.ical4j.util.UidGenera
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
-import org.apache.openmeetings.utils.mail.ByteArrayDataSource;
-import org.apache.openmeetings.utils.mail.IcalHandler;
-import org.apache.openmeetings.utils.mail.SmtpAuthenticator;
+import org.apache.openmeetings.util.mail.ByteArrayDataSource;
+import org.apache.openmeetings.util.mail.IcalHandler;
+import org.apache.openmeetings.util.mail.SmtpAuthenticator;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java Fri Oct 4 17:02:13 2013
@@ -35,8 +35,8 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
-import org.apache.openmeetings.utils.LangExport;
-import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.util.LangExport;
+import org.apache.openmeetings.util.OmFileHelper;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java Fri Oct 4 17:02:13 2013
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNot
import java.util.Random;
-import org.apache.openmeetings.session.ISessionManager;
+import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java Fri Oct 4 17:02:13 2013
@@ -30,7 +30,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.session.store.HashMapStore;
import org.apache.openmeetings.session.store.IClientPersistenceStore;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -44,9 +44,6 @@ public class TestHashMapSession extends
@Autowired
private HashMapStore cache;
- @Autowired
- private ManageCryptStyle manageCryptStyle;
-
@Test
public void testHashMapSession() {
@@ -63,7 +60,7 @@ public class TestHashMapSession extends
rcm.setScope("scopeName");
long random = System.currentTimeMillis() + new BigInteger(256, new Random()).longValue();
- rcm.setPublicSID(manageCryptStyle.getInstanceOfCrypt()
+ rcm.setPublicSID(ManageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(String.valueOf(random).toString()));
rcm.setUserport(0);
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java Fri Oct 4 17:02:13 2013
@@ -33,7 +33,7 @@ import javax.mail.internet.InternetAddre
import javax.mail.internet.MimeMessage;
import javax.mail.util.ByteArrayDataSource;
-import org.apache.openmeetings.utils.mail.SmtpAuthenticator;
+import org.apache.openmeetings.util.mail.SmtpAuthenticator;
import org.junit.Test;
import com.sun.mail.util.MailSSLSocketFactory;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Fri Oct 4 17:02:13 2013
@@ -57,7 +57,7 @@ public class TestUserContact extends Abs
assertFalse("Contacts list should not be empty for admin ", l.isEmpty());
// check that contact is visible for owner
- l = usersDao.get(contact.getAdresses().getEmail());
+ l = usersDao.get(contact.getAdresses().getEmail(), getUserId());
assertTrue("Contacts list should not be empty for admin ", !l.isEmpty());
//delete contact
adminUserDao.delete(contact, getUserId());
@@ -67,7 +67,7 @@ public class TestUserContact extends Abs
User u = createUser(random.nextInt());
contact = createUserContact(random.nextInt(), u.getUser_id());
// check that contact is not visible for user that is not owner of this contact
- l = usersDao.get(contact.getAdresses().getEmail());
+ l = usersDao.get(contact.getAdresses().getEmail(), getUserId());
assertTrue("Contacts list should be empty for admin ", !l.isEmpty());
//delete contact
adminUserDao.delete(contact, getUserId());
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1529218&r1=1529217&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java Fri Oct 4 17:02:13 2013
@@ -21,14 +21,12 @@ package org.apache.openmeetings.test.use
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.remote.MainService;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestAuth extends AbstractOpenmeetingsSpringTest {
@Autowired
- private ManageCryptStyle manageCryptStyle;
- @Autowired
private MainService mService;
@Test
@@ -37,8 +35,7 @@ public class TestAuth extends AbstractOp
System.out.println("sessionData: " + sessionData.getSession_id());
- String tTemp = manageCryptStyle.getInstanceOfCrypt().createPassPhrase(
- "test");
+ String tTemp = ManageCryptStyle.getInstanceOfCrypt().createPassPhrase("test");
System.out.println("tTemp: " + tTemp);
Added: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java (added)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings;
+
+public class InitializationContainer {
+ public static boolean initComplete = false;
+}
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/OpenmeetingsVariables.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/OpenmeetingsVariables.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/OpenmeetingsVariables.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java Fri Oct 4 17:02:13 2013
@@ -19,7 +19,22 @@
package org.apache.openmeetings;
public class OpenmeetingsVariables {
+ public static final String CONFIG_CRYPT_KEY = "crypt_ClassName";
+ public static final String CONFIG_DASHBOARD_SHOW_MYROOMS_KEY = "dashboard.show.myrooms";
+ public static final String CONFIG_DASHBOARD_SHOW_RSS_KEY = "dashboard.show.rssfeed";
+ public static final String CONFIG_DEFAUT_LANG_KEY = "default_lang_id";
+ public static final String CONFIG_FRONTEND_REGISTER_KEY = "allow_frontend_register";
+ public static final String CONFIG_LOGIN_MIN_LENGTH_KEY = "user.login.minimum.length";
+ public static final String CONFIG_MAX_UPLOAD_SIZE_KEY = "max_upload_size";
+ public static final String CONFIG_PASS_MIN_LENGTH_KEY = "user.pass.minimum.length";
+ public static final String CONFIG_RSS_FEED1_KEY = "rss_feed1";
+ public static final String CONFIG_RSS_FEED2_KEY = "rss_feed2";
+ public static final String CONFIG_IGNORE_BAD_SSL = "oauth2.ignore_bad_ssl";
public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based
public static String webAppRootKey = null;
public static String webAppRootPath = null;
+ public static String configKeyCryptClassName = null;
+ public static final int USER_LOGIN_MINIMUM_LENGTH = 4;
+ public static final int USER_PASSWORD_MINIMUM_LENGTH = 4;
+ public static Boolean whiteboardDrawStatus = null;
}
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/AuthLevelUtil.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/AuthLevelUtil.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/AuthLevelUtil.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java Fri Oct 4 17:02:13 2013
@@ -16,24 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.basic;
+package org.apache.openmeetings.util;
public class AuthLevelUtil {
- public boolean checkUserLevel(Long user_level) {
+ public static boolean checkUserLevel(Long user_level) {
return user_level == 1 || user_level == 2 || user_level == 3;
}
- public boolean checkModLevel(Long user_level) {
+ public static boolean checkModLevel(Long user_level) {
return user_level == 2 || user_level == 3;
}
- public boolean checkAdminLevel(Long user_level) {
+ public static boolean checkAdminLevel(Long user_level) {
return user_level == 3;
}
- public boolean checkWebServiceLevel(Long user_level) {
+ public static boolean checkWebServiceLevel(Long user_level) {
return user_level == 3 || user_level == 4;
}
-
}
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/CalendarPatterns.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/math/CalendarPatterns.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/CalendarPatterns.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/CalendarPatterns.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/math/CalendarPatterns.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/math/CalendarPatterns.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/CalendarPatterns.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.math;
+package org.apache.openmeetings.util;
import java.text.SimpleDateFormat;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/DaoHelper.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/DaoHelper.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/DaoHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util;
import org.apache.commons.lang3.StringUtils;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/ImportHelper.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/ImportHelper.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/ImportHelper.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/ImportHelper.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/ImportHelper.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/ImportHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/ImportHelper.java Fri Oct 4 17:02:13 2013
@@ -16,18 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
-
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.db.entity.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
+package org.apache.openmeetings.util;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
/**
*
* Get some of the default values for the upload
@@ -36,25 +29,6 @@ import org.slf4j.Logger;
*
*/
public class ImportHelper {
- private static final Logger log = Red5LoggerFactory.getLogger(ImportHelper.class, webAppRootKey);
- public static final long DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB
-
- /**
- * returns the max upload size configured by max_upload_size config key
- *
- * @param configurationDao
- * @return
- */
- public static final long getMaxUploadSize(ConfigurationDao configurationDao) {
- try {
- return configurationDao.getConfValue(MAX_UPLOAD_SIZE_KEY,
- Long.class, "" + DEFAULT_MAX_UPLOAD_SIZE);
- } catch (Exception e) {
- log.error("Invalid value saved for max_upload_size conf key: ", e);
- }
- return DEFAULT_MAX_UPLOAD_SIZE;
- }
-
/**
* returns a list of all timezones as a {@link Map}
*
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/LangExport.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/LangExport.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/LangExport.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/LangExport.java Fri Oct 4 17:02:13 2013
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util;
import java.io.OutputStream;
import java.io.Writer;
-import java.util.List;
-import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
@@ -79,33 +77,6 @@ public class LangExport {
return root;
}
- public static Document createDocument(List<Fieldlanguagesvalues> flvList, List<Fieldlanguagesvalues> untranslatedList) throws Exception {
- Document document = createDocument();
- Element root = createRoot(document);
-
- for (Fieldlanguagesvalues flv : flvList) {
- Element eTemp = root.addElement("string")
- .addAttribute("id", flv.getFieldvalues().getFieldvalues_id().toString())
- .addAttribute("name", flv.getFieldvalues().getName());
- Element value = eTemp.addElement("value");
- value.addText(flv.getValue());
- }
-
- //untranslated
- if (untranslatedList.size() > 0) {
- root.addComment("Untranslated strings");
- for (Fieldlanguagesvalues flv : untranslatedList) {
- Element eTemp = root.addElement("string")
- .addAttribute("id", flv.getFieldvalues().getFieldvalues_id().toString())
- .addAttribute("name", flv.getFieldvalues().getName());
- Element value = eTemp.addElement("value");
- value.addText(flv.getValue());
- }
- }
-
- return document;
- }
-
public static void serializetoXML(Writer out, String aEncodingScheme, Document doc) throws Exception {
OutputFormat outformat = OutputFormat.createPrettyPrint();
outformat.setEncoding(aEncodingScheme);
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/Logger.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/Logger.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/Logger.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/OMContextListener.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/OMContextListener.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/OMContextListener.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util;
import javax.servlet.ServletContextEvent;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/OmFileHelper.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/OmFileHelper.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/OmFileHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util;
import java.io.File;
import java.io.FileInputStream;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/StoredFile.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/StoredFile.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/StoredFile.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/StoredFile.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/StoredFile.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/StoredFile.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/StoredFile.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util;
import java.util.Arrays;
import java.util.HashSet;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ICryptString.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ICryptString.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ICryptString.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ICryptString.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.crypt;
+package org.apache.openmeetings.util.crypt;
/**
* interface for Encryption-Class
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.crypt;
+package org.apache.openmeetings.util.crypt;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Crypt.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Crypt.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Crypt.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.crypt;
+package org.apache.openmeetings.util.crypt;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.crypt;
+package org.apache.openmeetings.util.crypt;
import java.security.NoSuchAlgorithmException;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.crypt;
+package org.apache.openmeetings.util.crypt;
import java.security.NoSuchAlgorithmException;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java Fri Oct 4 17:02:13 2013
@@ -16,39 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.crypt;
+package org.apache.openmeetings.util.crypt;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.configKeyCryptClassName;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
public class ManageCryptStyle {
+ private static final Logger log = Red5LoggerFactory.getLogger(ManageCryptStyle.class, webAppRootKey);
- private static final Logger log = Red5LoggerFactory.getLogger(
- ManageCryptStyle.class, OpenmeetingsVariables.webAppRootKey);
-
- @Autowired
- private ScopeApplicationAdapter scopeApplicationAdapter;
-
- public ICryptString getInstanceOfCrypt() {
+ public static ICryptString getInstanceOfCrypt() {
try {
+ log.debug("getInstanceOfCrypt:: configKeyCryptClassName: " + configKeyCryptClassName);
- log.debug("getInstanceOfCrypt: " + this);
-
- String configKeyCryptClassName = scopeApplicationAdapter
- .getCryptKey();
-
- log.debug("configKeyCryptClassName: " + configKeyCryptClassName);
-
- return (ICryptString) Class.forName(
- configKeyCryptClassName).newInstance();
-
+ return configKeyCryptClassName == null ? null : (ICryptString) Class.forName(configKeyCryptClassName).newInstance();
} catch (Exception err) {
log.error("[getInstanceOfCrypt]", err);
}
return null;
}
-
}
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/ArrowStyle.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/ArrowStyle.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/ArrowStyle.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/ArrowStyle.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.geom;
+package org.apache.openmeetings.util.geom;
public class ArrowStyle {
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.geom;
+package org.apache.openmeetings.util.geom;
import java.awt.Point;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.mail;
+package org.apache.openmeetings.util.mail;
import java.io.*;
import javax.activation.*;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.mail;
+package org.apache.openmeetings.util.mail;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
@@ -46,7 +48,6 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.model.property.Version;
import net.fortuna.ical4j.util.UidGenerator;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -56,9 +57,7 @@ import org.slf4j.Logger;
*
*/
public class IcalHandler {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- MailHandler.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(IcalHandler.class, webAppRootKey);
/** ICal instance */
private final net.fortuna.ical4j.model.Calendar icsCalendar;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/MailUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/MailUtil.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/MailUtil.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/MailUtil.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.mail;
+package org.apache.openmeetings.util.mail;
import java.util.regex.Pattern;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/SmtpAuthenticator.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/SmtpAuthenticator.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/SmtpAuthenticator.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/SmtpAuthenticator.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.mail;
+package org.apache.openmeetings.util.mail;
import javax.mail.Authenticator;
import javax.mail.PasswordAuthentication;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResult.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/ConverterProcessResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResult.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResult.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/ConverterProcessResult.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/ConverterProcessResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResult.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents.beans;
+package org.apache.openmeetings.util.process;
/**
* Object created by each conversion step,
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/ConverterProcessResultList.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/ConverterProcessResultList.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/ConverterProcessResultList.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java Fri Oct 4 17:02:13 2013
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents.beans;
+package org.apache.openmeetings.util.process;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.red5.logging.Red5LoggerFactory.getLogger;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.axis.services.FileImportError;
-import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
/**
@@ -36,10 +36,7 @@ import org.slf4j.Logger;
*
*/
public class ConverterProcessResultList {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- ConverterProcessResultList.class,
- OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = getLogger(ConverterProcessResultList.class, webAppRootKey);
private Map<String, ConverterProcessResult> jobslist = new HashMap<String, ConverterProcessResult>();
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/FileImportError.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileImportError.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/FileImportError.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/FileImportError.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileImportError.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileImportError.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/FileImportError.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.util.process;
public class FileImportError {
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/ProcessHelper.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/ProcessHelper.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/ProcessHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils;
+package org.apache.openmeetings.util.process;
import java.io.BufferedReader;
import java.io.IOException;
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.concurrent.TimeoutException;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/UploadCompleteMessage.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/UploadCompleteMessage.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/UploadCompleteMessage.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/UploadCompleteMessage.java Fri Oct 4 17:02:13 2013
@@ -16,10 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents.beans;
-
-import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-
+package org.apache.openmeetings.util.process;
/**
* Helper bean that is send to client(s) once the servlet has completed the
@@ -29,7 +26,6 @@ import org.apache.openmeetings.db.entity
*
*/
public class UploadCompleteMessage {
-
private Long userId;
private String message;
private String action;
@@ -162,19 +158,4 @@ public class UploadCompleteMessage {
public void setFileHash(String fileHash) {
this.fileHash = fileHash;
}
-
- public void setFileExplorerItem(FileExplorerItem fileExplorerItem) {
- if (fileExplorerItem.getIsImage() != null) {
- isImage = fileExplorerItem.getIsImage();
- }
- if (fileExplorerItem.getIsVideo() != null) {
- isVideo = fileExplorerItem.getIsVideo();
- }
- if (fileExplorerItem.getIsPresentation() != null) {
- isPresentation = fileExplorerItem.getIsPresentation();
- }
- fileSystemName = fileExplorerItem.getFileName();
- fileHash = fileExplorerItem.getFileHash();
- }
-
}
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.stringhandlers;
+package org.apache.openmeetings.util.stringhandlers;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.stringhandlers;
+package org.apache.openmeetings.util.stringhandlers;
public class StringComparer {
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/BaseConverter.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/BaseConverter.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/BaseConverter.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/BaseConverter.java Fri Oct 4 17:02:13 2013
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.converter;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.utils.OmFileHelper.MP4_EXTENSION;
-import static org.apache.openmeetings.utils.OmFileHelper.OGG_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.OGG_EXTENSION;
import java.io.File;
import java.io.IOException;
@@ -32,10 +32,9 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
-import org.apache.openmeetings.documents.GenerateSWF;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.utils.OmFileHelper;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvExplorerConverter.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvExplorerConverter.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvExplorerConverter.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvExplorerConverter.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.converter;
import java.io.File;
import java.util.ArrayList;
@@ -28,8 +28,8 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvInterviewConverter.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvInterviewConverter.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvInterviewConverter.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvInterviewConverter.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.converter;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
@@ -30,9 +30,8 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
-import org.apache.openmeetings.documents.GenerateThumbs;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvRecorderConverter.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvRecorderConverter.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvRecorderConverter.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/FlvRecorderConverter.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.converter;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
@@ -30,8 +30,8 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateImage.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateImage.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateImage.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateImage.java Fri Oct 4 17:02:13 2013
@@ -16,29 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.converter;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.utils.OmFileHelper.bigImagePrefix;
-import static org.apache.openmeetings.utils.OmFileHelper.chatImagePrefix;
-import static org.apache.openmeetings.utils.OmFileHelper.getUploadProfilesUserDir;
-import static org.apache.openmeetings.utils.OmFileHelper.profileFileExt;
-import static org.apache.openmeetings.utils.OmFileHelper.profileFileName;
-import static org.apache.openmeetings.utils.OmFileHelper.profileImagePrefix;
-import static org.apache.openmeetings.utils.OmFileHelper.thumbImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir;
+import static org.apache.openmeetings.util.OmFileHelper.profileFileExt;
+import static org.apache.openmeetings.util.OmFileHelper.profileFileName;
+import static org.apache.openmeetings.util.OmFileHelper.profileImagePrefix;
+import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.data.flvrecord.converter.BaseConverter;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
-import org.apache.openmeetings.utils.OmFileHelper;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ConverterProcessResultList;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateSWF.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateSWF.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateSWF.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateSWF.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.converter;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
@@ -26,8 +26,8 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateThumbs.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateThumbs.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateThumbs.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateThumbs.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateThumbs.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateThumbs.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/converter/GenerateThumbs.java Fri Oct 4 17:02:13 2013
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.converter;
import java.io.File;
import java.io.IOException;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.converter.BaseConverter;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/MailHandler.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/mail/MailHandler.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/MailHandler.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/MailHandler.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/mail/MailHandler.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/mail/MailHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/MailHandler.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.mail;
+package org.apache.openmeetings.mail;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -40,11 +42,12 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.util.ByteArrayDataSource;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
+import org.apache.openmeetings.util.mail.MailUtil;
+import org.apache.openmeetings.util.mail.SmtpAuthenticator;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,8 +64,7 @@ import com.sun.mail.util.MailSSLSocketFa
*
*/
public class MailHandler {
- private static final Logger log = Red5LoggerFactory.getLogger(
- MailHandler.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(MailHandler.class, webAppRootKey);
private static final int MAIL_SEND_TIMEOUT = 60 * 60 * 1000; // 1 hour
private static final int MAXIMUM_ERROR_COUNT = 5;
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/SMSHandler.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/sms/SMSHandler.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/SMSHandler.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/SMSHandler.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/sms/SMSHandler.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/sms/SMSHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/mail/SMSHandler.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.sms;
+package org.apache.openmeetings.mail;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Fri Oct 4 17:02:13 2013
@@ -26,12 +26,11 @@ import java.io.IOException;
import java.text.DecimalFormat;
import java.util.Date;
+import org.apache.openmeetings.backup.BackupExport;
+import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-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;
+import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -83,7 +82,7 @@ public class BackupPanel extends AdminPa
setMultiPart(true);
// set max upload size in form as info text
- Long maxBytes = ImportHelper.getMaxUploadSize(getBean(ConfigurationDao.class));
+ Long maxBytes = getBean(ConfigurationDao.class).getMaxUploadSize();
double megaBytes = maxBytes.doubleValue() / 1024 / 1024;
DecimalFormat formatter = new DecimalFormat("#,###.00");
add(new Label("MaxUploadSize", formatter.format(megaBytes)));
@@ -97,7 +96,7 @@ public class BackupPanel extends AdminPa
add(includeFilesInBackup);
// Set maximum size controlled by configuration
- setMaxSize(Bytes.bytes(ImportHelper.getMaxUploadSize(getBean(ConfigurationDao.class))));
+ setMaxSize(Bytes.bytes(maxBytes));
// Add a component to download a file without page refresh
final AjaxDownload download = new AjaxDownload();