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 2015/11/03 23:25:39 UTC
svn commit: r1712427 [2/9] - in /openmeetings/branches/3.1.x: ./ .settings/
WebContent/ openmeetings-core/ openmeetings-core/src/
openmeetings-core/src/main/ openmeetings-core/src/main/java/
openmeetings-core/src/main/java/org/ openmeetings-core/src/ma...
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.record;
+package org.apache.openmeetings.core.data.record;
import java.awt.Color;
import java.awt.Font;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.util.HashMap;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.util.HashMap;
import java.util.Map;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.util.HashMap;
import java.util.Iterator;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java Tue Nov 3 22:25:34 2015
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.converter.GenerateSWF;
-import org.apache.openmeetings.converter.GenerateThumbs;
+import org.apache.openmeetings.core.converter.GenerateSWF;
+import org.apache.openmeetings.core.converter.GenerateThumbs;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.File;
import java.io.FileWriter;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.File;
import java.io.FileInputStream;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.util.Iterator;
import java.util.LinkedList;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.ldap;
+package org.apache.openmeetings.core.ldap;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.mail;
+package org.apache.openmeetings.core.mail;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.mail;
+package org.apache.openmeetings.core.mail;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.OpenmeetingsVariables;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.ArrayList;
import java.util.Calendar;
@@ -26,13 +26,13 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
-import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.core.data.whiteboard.EmoticonsManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.stringhandlers.ChatString;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.io.File;
import java.util.ArrayList;
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -33,11 +33,11 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dto.file.LibraryPresentation;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.documents.LibraryChartLoader;
-import org.apache.openmeetings.documents.LibraryDocumentConverter;
-import org.apache.openmeetings.documents.LibraryWmlLoader;
-import org.apache.openmeetings.documents.LoadLibraryPresentation;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.core.documents.LibraryChartLoader;
+import org.apache.openmeetings.core.documents.LibraryDocumentConverter;
+import org.apache.openmeetings.core.documents.LibraryWmlLoader;
+import org.apache.openmeetings.core.documents.LoadLibraryPresentation;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.MD5;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -26,9 +26,9 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -43,7 +43,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.RoomOrganisation;
import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +57,7 @@ public class ConferenceService {
private static final Logger log = Red5LoggerFactory.getLogger(ConferenceService.class, webAppRootKey);
@Autowired
- private AppointmentLogic appointmentLogic;
+ private AppointmentDao appointmentDao;
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
@@ -241,7 +241,7 @@ public class ConferenceService {
return null;
try {
- Appointment ment = appointmentLogic.getAppointmentByRoom(room_id);
+ Appointment ment = appointmentDao.getAppointmentByRoom(room_id);
return ment;
} catch (Exception e) {
@@ -264,8 +264,7 @@ public class ConferenceService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- List<Appointment> points = appointmentLogic
- .getTodaysAppointmentsForUser(users_id);
+ List<Appointment> points = appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id);
List<Room> result = new ArrayList<Room>();
if (points != null) {
@@ -302,8 +301,7 @@ public class ConferenceService {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- List<Appointment> appointments = appointmentLogic
- .getTodaysAppointmentsForUser(users_id);
+ List<Appointment> appointments = appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id);
List<Room> result = new ArrayList<Room>();
if (appointments != null) {
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
/**
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.List;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -24,10 +24,10 @@ import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.openmeetings.converter.BaseConverter;
-import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask;
-import org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask;
-import org.apache.openmeetings.data.flvrecord.listener.StreamListener;
+import org.apache.openmeetings.core.converter.BaseConverter;
+import org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewConverterTask;
+import org.apache.openmeetings.core.data.flvrecord.converter.FlvRecorderConverterTask;
+import org.apache.openmeetings.core.data.flvrecord.listener.StreamListener;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
@@ -38,7 +38,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
public class GroupService {
Added: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java?rev=1712427&view=auto
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java (added)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java Tue Nov 3 22:25:34 2015
@@ -0,0 +1,25 @@
+/*
+ * 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.core.remote;
+
+import org.apache.openmeetings.db.entity.server.Server;
+
+public interface ISlaveHTTPConnectionManager {
+ void kickSlaveUser(Server server, String publicSID) throws Exception;
+}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Tue Nov 3 22:25:34 2015
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Date;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType;
+import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation.MessageType;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarHelper;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.service.IPendingServiceCall;
@@ -46,7 +46,7 @@ public class InvitationService implement
@Autowired
private UserDao userDao;
@Autowired
- private InvitationManager invitationManager;
+ private IInvitationManager invitationManager;
@Autowired
private RoomDao roomDao;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
@@ -28,8 +28,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
@@ -37,6 +38,7 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -52,10 +54,8 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.Userdata;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
-import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -84,7 +84,7 @@ public class MainService implements IPen
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private RoomManager roomManager;
@Autowired
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
@@ -49,8 +49,8 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java Tue Nov 3 22:25:34 2015
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import org.apache.openmeetings.batik.beans.PrintBean;
+import org.apache.openmeetings.core.batik.beans.PrintBean;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
@@ -29,7 +29,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.TimeZone;
-import org.apache.openmeetings.cluster.SlaveHTTPConnectionManager;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
@@ -51,14 +50,10 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.mail.MailHandler;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.core.mail.MailHandler;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebClient;
-import org.apache.openmeetings.web.mail.template.AbstractTemplatePanel;
-import org.apache.openmeetings.web.util.ContactsHelper;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
@@ -98,7 +93,7 @@ public class UserService implements IUse
@Autowired
private ServerDao serverDao;
@Autowired
- private SlaveHTTPConnectionManager slaveHTTPConnectionManager;
+ private ISlaveHTTPConnectionManager slaveHTTPConnectionManager;
@Autowired
private LabelDao labelDao;
@Autowired
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.io.File;
import java.io.FilenameFilter;
@@ -29,8 +29,9 @@ import java.util.LinkedList;
import java.util.Map;
import org.apache.commons.collections.ComparatorUtils;
-import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById;
-import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager;
+import org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectListManagerById;
+import org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectSyncManager;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -39,8 +40,7 @@ import org.apache.openmeetings.db.dto.ro
import org.apache.openmeetings.db.dto.room.WhiteboardObjectList;
import org.apache.openmeetings.db.dto.room.WhiteboardSyncLockObject;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote.red5;
+package org.apache.openmeetings.core.remote.red5;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -32,11 +32,14 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
-import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.remote.FLVRecorderService;
+import org.apache.openmeetings.core.remote.WhiteBoardService;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
@@ -53,9 +56,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.remote.FLVRecorderService;
-import org.apache.openmeetings.remote.WhiteBoardService;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.OmFileHelper;
@@ -94,7 +94,7 @@ public class ScopeApplicationAdapter ext
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private AppointmentLogic appointmentLogic;
+ private AppointmentDao appointmentDao;
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
@@ -1265,7 +1265,7 @@ public class ScopeApplicationAdapter ext
} else {
// If this is an Appointment then the Moderator will be set to the Invitor
- Appointment ment = appointmentLogic.getAppointmentByRoom(room_id);
+ Appointment ment = appointmentDao.getAppointmentByRoom(room_id);
Long userIdInRoomClient = currentClient.getUser_id();
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote.util;
+package org.apache.openmeetings.core.remote.util;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.rss;
+package org.apache.openmeetings.core.rss;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet;
+package org.apache.openmeetings.core.servlet;
import java.io.IOException;
import java.io.OutputStream;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
public abstract class BaseHttpServlet extends HttpServlet {
- private static final long serialVersionUID = -2713422496723115524L;
+ private static final long serialVersionUID = 1L;
private BeanUtil beanUtil = new BeanUtil();
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet;
+package org.apache.openmeetings.core.servlet;
import javax.servlet.ServletContext;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet;
+package org.apache.openmeetings.core.servlet;
public class ServerNotInitializedException extends Exception {
private static final long serialVersionUID = 1L;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import java.util.Set;
@@ -27,7 +27,7 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public abstract class AbstractUploadCont
@Autowired
protected ConfigurationDao configurationDao;
- protected class UploadInfo {
+ protected static class UploadInfo {
MultipartFile file;
Long userId;
String sid;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
@@ -34,13 +34,13 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
+import org.apache.openmeetings.core.servlet.BaseHttpServlet;
+import org.apache.openmeetings.core.servlet.ServerNotInitializedException;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.servlet.BaseHttpServlet;
-import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import java.io.File;
import java.io.FileOutputStream;
@@ -37,14 +37,14 @@ import org.apache.batik.svggen.SVGGraphi
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.JPEGTranscoder;
-import org.apache.openmeetings.batik.beans.PrintBean;
-import org.apache.openmeetings.data.record.WhiteboardMapToSVG;
+import org.apache.openmeetings.core.batik.beans.PrintBean;
+import org.apache.openmeetings.core.data.record.WhiteboardMapToSVG;
+import org.apache.openmeetings.core.remote.PrintService;
+import org.apache.openmeetings.core.servlet.BaseHttpServlet;
+import org.apache.openmeetings.core.servlet.ServerNotInitializedException;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.remote.PrintService;
-import org.apache.openmeetings.servlet.BaseHttpServlet;
-import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
@@ -56,7 +56,7 @@ import org.w3c.dom.Element;
public class ExportToImage extends BaseHttpServlet {
- private static final long serialVersionUID = -3535998254746084297L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(
ExportToImage.class, OpenmeetingsVariables.webAppRootKey);
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import java.io.IOException;
import java.util.Arrays;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
@@ -33,15 +33,15 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.converter.GenerateImage;
-import org.apache.openmeetings.converter.GenerateThumbs;
-import org.apache.openmeetings.data.file.FileProcessor;
+import org.apache.openmeetings.core.converter.GenerateImage;
+import org.apache.openmeetings.core.converter.GenerateThumbs;
+import org.apache.openmeetings.core.data.file.FileProcessor;
+import org.apache.openmeetings.core.documents.GeneratePDF;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
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.GeneratePDF;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session;
+package org.apache.openmeetings.core.session;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.server.Server;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session;
+package org.apache.openmeetings.core.session;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -28,12 +28,12 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
+import org.apache.openmeetings.core.session.store.IClientPersistenceStore;
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.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session.store;
+package org.apache.openmeetings.core.session.store;
import java.util.ArrayList;
import java.util.Collection;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session.store;
+package org.apache.openmeetings.core.session.store;
import java.util.ArrayList;
import java.util.Collection;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/IClientPersistenceStore.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/IClientPersistenceStore.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/IClientPersistenceStore.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/IClientPersistenceStore.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session.store;
+package org.apache.openmeetings.core.session.store;
import java.util.Collection;
import java.util.List;
Added: openmeetings/branches/3.1.x/openmeetings-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/site/site.xml?rev=1712427&view=auto
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/site/site.xml (added)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/site/site.xml Tue Nov 3 22:25:34 2015
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
+ name="Apache OpenMeetings Project">
+
+ <body>
+ <menu ref="parent"/>
+ <menu name="Project">
+ <item name="About" href="/index.html" />
+ <item name="Info" href="/project-info.html" />
+ <item name="Summary" href="/project-summary.html" />
+ <item name="License" href="/license.html" />
+ <item name="Dependencies" href="/dependencies.html" />
+ <item name="Dependency Convergence" href="/dependency-convergence.html" />
+ <item name="RAT Report" href="/rat-report.html" />
+ <item name="JavaDoc" href="/apidocs/index.html" target="_blank" />
+ </menu>
+ </body>
+</project>
Copied: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java (from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java)
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java?p2=openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java&p1=openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java&r1=1711723&r2=1712427&rev=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java Tue Nov 3 22:25:34 2015
@@ -23,6 +23,8 @@ package org.apache.openmeetings.test;
* Intern, SETLabs, Infosys Technologies Ltd. May 2004 - Jul 2004
* Ecole des Mines de Nantes, France
*/
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
@@ -42,6 +44,9 @@ import javax.swing.text.html.HTMLEditorK
import javax.swing.text.html.StyleSheet;
import javax.swing.text.html.parser.ParserDelegator;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
/**
* A "HTML" JEditorPane embedded with a special HTMLDocument that detects urls
* and displays them as hyperlinks. When CTRL is pressed, the urls are
@@ -51,7 +56,8 @@ import javax.swing.text.html.parser.Pars
*
*/
public class EditorPaneLinkDetector extends JEditorPane {
- private static final long serialVersionUID = 2811878994346374017L;
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Red5LoggerFactory.getLogger(EditorPaneLinkDetector.class, webAppRootKey);
/**
* Creates a <code>EditorPaneLinkDetector</code>.
@@ -105,11 +111,13 @@ public class EditorPaneLinkDetector exte
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
- if (isEditable())
+ if (isEditable()) {
setEditable(false);
+ }
} else {
- if (!isEditable())
+ if (!isEditable()) {
setEditable(true);
+ }
}
}
@@ -125,11 +133,7 @@ public class EditorPaneLinkDetector exte
}
protected class HTMLDocLinkDetector extends HTMLDocument {
-
- /**
- *
- */
- private static final long serialVersionUID = 1226244167782160437L;
+ private static final long serialVersionUID = 1L;
public HTMLDocLinkDetector(StyleSheet ss) {
super(ss);
@@ -170,7 +174,7 @@ public class EditorPaneLinkDetector exte
else
createLink(e);
} catch (IOException ex) {
- ex.printStackTrace();
+ log.error("Error", ex);
}
setCaretPosition(Math.min(caretPos, getLength()));
}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java Tue Nov 3 22:25:34 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.test.asf;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -27,7 +29,11 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class AsfCopyRightReplace {
+ private static final Logger log = Red5LoggerFactory.getLogger(AsfCopyRightReplace.class, webAppRootKey);
String asf_copyright = "/*\n"
+ " * Licensed to the Apache Software Foundation (ASF) under one\n"
@@ -166,7 +172,7 @@ public class AsfCopyRightReplace {
out.close();
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error while scanAndWriteXMLFile", err);
}
}
@@ -203,7 +209,7 @@ public class AsfCopyRightReplace {
out.close();
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error while scanAndWriteJavaFile", err);
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java Tue Nov 3 22:25:34 2015
@@ -18,14 +18,19 @@
*/
package org.apache.openmeetings.test.chat;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.TestCase;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class TestChatLinking extends TestCase {
+ private static final Logger log = Red5LoggerFactory.getLogger(TestChatLinking.class, webAppRootKey);
@Test
public void testChatParser(){
@@ -36,7 +41,7 @@ public class TestChatLinking extends Tes
System.out.println(link(text));
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
@@ -75,7 +80,7 @@ public class TestChatLinking extends Tes
return tReturn;
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Error", e);
}
return "";
}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java Tue Nov 3 22:25:34 2015
@@ -22,9 +22,9 @@ import static org.apache.openmeetings.ut
import java.io.File;
-import org.apache.openmeetings.cli.ConnectionProperties.DbType;
import org.apache.openmeetings.cli.ConnectionPropertiesPatcher;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.ConnectionProperties.DbType;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java Tue Nov 3 22:25:34 2015
@@ -18,14 +18,18 @@
*/
package org.apache.openmeetings.test.emotes;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.LinkedList;
import junit.framework.TestCase;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class TestChatParsing extends TestCase {
-
+ private static final Logger log = Red5LoggerFactory.getLogger(TestChatParsing.class, webAppRootKey);
public static LinkedList<LinkedList<String>> emotfilesList = new LinkedList<LinkedList<String>>();
@Test
@@ -37,7 +41,7 @@ public class TestChatParsing extends Tes
this.loadEmot(filePath);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
@@ -61,8 +65,7 @@ public class TestChatParsing extends Tes
System.out.println("loadEmot completed");
} catch (Exception err) {
- System.out.println("[loadEmot]"+err);
- err.printStackTrace();
+ log.error("Error", err);
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java Tue Nov 3 22:25:34 2015
@@ -18,14 +18,15 @@
*/
package org.apache.openmeetings.test.jai;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class TestInterpolation extends TestCase {
-
- private static final Logger log = Logger.getLogger(TestInterpolation.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestInterpolation.class, webAppRootKey);
@Test
public void testInterpolate() {
@@ -54,8 +55,6 @@ public class TestInterpolation extends T
//
} catch (Exception er) {
log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java Tue Nov 3 22:25:34 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.test.jai;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -26,15 +28,15 @@ import junit.framework.TestCase;
import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.log4j.Logger;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class TestSVGTextExporterArrow extends TestCase {
-
- private static final Logger log = Logger.getLogger(TestSVGTextExporterArrow.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestSVGTextExporterArrow.class, webAppRootKey);
@Test
public void testGetDiagramList() {
@@ -96,11 +98,6 @@ public class TestSVGTextExporterArrow ex
svgGenerator.stream(out, useCSS);
} catch (Exception er) {
log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
}
}
-
-
-
}
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java Tue Nov 3 22:25:34 2015
@@ -30,7 +30,7 @@ class WindowClosingAdapter extends Windo
}
public class KeyCodesTest extends Frame implements KeyListener {
- private static final long serialVersionUID = -1706968644784929402L;
+ private static final long serialVersionUID = 1L;
String msg1 = "";
String msg2 = "";
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java Tue Nov 3 22:25:34 2015
@@ -22,7 +22,7 @@ import java.awt.*;
import java.awt.event.*;
public class ReadKeyCodesTest extends Frame implements KeyListener {
- private static final long serialVersionUID = -1722917067803656922L;
+ private static final long serialVersionUID = 1L;
String msg1 = "";
String msg2 = "";
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java Tue Nov 3 22:25:34 2015
@@ -18,16 +18,18 @@
*/
package org.apache.openmeetings.test.rdc;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.awt.event.KeyEvent;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class TestKeyCodesNumber extends TestCase {
-
- private static final Logger log = Logger.getLogger(TestKeyCodesNumber.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestKeyCodesNumber.class, webAppRootKey);
@Test
public void testKeyCodes() {