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 2014/04/07 18:20:03 UTC
svn commit: r1585514 [1/4] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-axis/
openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/
openmeetings-core/
openmeetings-core/src/main/java/org/apache/openmeetings/batik/ openmeeting...
Author: solomax
Date: Mon Apr 7 16:19:59 2014
New Revision: 1585514
URL: http://svn.apache.org/r1585514
Log:
[OPENMEETINGS-940] Maven artifacts are almost buildable
Added:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/batik/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/cluster/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/converter/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/data/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/documents/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/ldap/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/mail/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/quartz/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/remote/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/rss/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/servlet/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/session/
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/
- copied from r1584946, openmeetings/trunk/singlewebapp/src/test/java/
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
- copied, changed from r1584946, openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/IInvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/ (with props)
openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-service/src/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
- copied, changed from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
- copied, changed from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/NoValidationApplicationContext.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java
- copied, changed from r1584630, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
- copied, changed from r1584630, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
- copied, changed from r1584630, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
- copied unchanged from r1584630, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu-functions.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/mail/EmailManager.java
- copied, changed from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/LinkHelper.java
- copied, changed from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/util/LinkHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/
- copied from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/webapp/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
- copied unchanged from r1584946, openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/
- copied from r1584946, openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/selenium/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
- copied unchanged from r1584946, openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/web/
- copied from r1584946, openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/web/
Removed:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/batik/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/cluster/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/converter/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/EmailManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/data/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/documents/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/ldap/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/mail/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/quartz/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/remote/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/rss/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/servlet/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/session/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/util/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/webapp/
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/selenium/
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/web/
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/IInvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu-functions.js
openmeetings/trunk/singlewebapp/src/test/java/
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/openmeetings-axis/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/BaseWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewReConverterTask.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/OrganisationManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapAuthBase.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/config/ConfigReader.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PollService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/IClientPersistenceStore.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Mon Apr 7 16:19:59 2014
@@ -24,11 +24,13 @@
<classpathentry kind="src" path="src/doc/java"/>
<classpathentry kind="src" path="openmeetings-install/src/main/java"/>
<classpathentry kind="src" path="openmeetings-core/src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="openmeetings-core/src/main/webapp/WEB-INF/classes"/>
+ <classpathentry kind="src" path="openmeetings-core/src/test/java"/>
<classpathentry kind="src" path="openmeetings-screenshare/src/main/java"/>
<classpathentry kind="src" path="openmeetings-util/src/main/java"/>
<classpathentry kind="src" path="openmeetings-web/src/main/java"/>
+ <classpathentry kind="src" path="openmeetings-web/src/main/webapp/WEB-INF/classes"/>
+ <classpathentry kind="src" path="openmeetings-web/src/test/java"/>
+ <classpathentry kind="src" path="openmeetings-service/src/main/java"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Mon Apr 7 16:19:59 2014
@@ -44,7 +44,7 @@
<property name="screenshare.resources.dir" value="${basedir}/openmeetings-screenshare/src/main/resources" />
<property name="axis.resources.dir" value="${basedir}/openmeetings-axis/src/main/resources" />
- <property name="webapp.dir" value="${basedir}/openmeetings-core/src/main/webapp" />
+ <property name="webapp.dir" value="${basedir}/openmeetings-web/src/main/webapp" />
<property name="junit.lib.dir" value="${project.lib.dir}/junit" />
<property name="junit.backups.dir" value="${junit.lib.dir}/backups" />
<property name="rat.lib.dir" value="${project.lib.dir}/rat" />
@@ -468,8 +468,8 @@
<tstamp prefix="doc">
<format property="TODAY_YEAR" pattern="yyyy" locale="en" />
</tstamp>
- <javadoc packagenames="org.apache.openmeetings.remote.*"
- sourcepath="${basedir}/openmeetings-axis/src/main/java:${basedir}/openmeetings-db/src/main/java:${src.base.dir}/doc/java:${basedir}/openmeetings-install/src/main/java:${basedir}/openmeetings-core/src/main/java:${basedir}/openmeetings-screenshare/src/main/java:${basedir}/openmeetings-util/src/main/java:${basedir}/openmeetings-web/src/main/java"
+ <javadoc packagenames="org.apache.openmeetings.core.remote.*"
+ sourcepath="${basedir}/openmeetings-axis/src/main/java:${basedir}/openmeetings-db/src/main/java:${src.base.dir}/doc/java:${basedir}/openmeetings-install/src/main/java:${basedir}/openmeetings-core/src/main/java:${basedir}/openmeetings-screenshare/src/main/java:${basedir}/openmeetings-util/src/main/java:${basedir}/openmeetings-web/src/main/java:${basedir}/openmeetings-service/src/main/java"
excludepackagenames="org.apache.openmeetings.test.*"
defaultexcludes="yes"
destdir="build/api"
@@ -692,10 +692,12 @@
<src path="${src.base.dir}/doc/java" />
<src path="${basedir}/openmeetings-install/src/main/java" />
<src path="${basedir}/openmeetings-core/src/main/java" />
- <src path="${src.base.dir}/test/java" />
+ <src path="${basedir}/openmeetings-core/src/test/java" />
<src path="${basedir}/openmeetings-screenshare/src/main/java" />
<src path="${basedir}/openmeetings-util/src/main/java" />
<src path="${basedir}/openmeetings-web/src/main/java" />
+ <src path="${basedir}/openmeetings-web/src/test/java" />
+ <src path="${basedir}/openmeetings-service/src/main/java" />
<classpath refid="compile.classpath" />
<compilerarg value="-Aopenjpa.metamodel=true" />
<!-- compilerarg value="-Xlint:deprecation"/ -->
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/pom.xml?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/pom.xml Mon Apr 7 16:19:59 2014
@@ -49,5 +49,10 @@
<artifactId>openmeetings-core</artifactId>
<version>${openmeetings.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-web</artifactId>
+ <version>${openmeetings.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/BaseWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/BaseWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/BaseWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/BaseWebService.java Mon Apr 7 16:19:59 2014
@@ -23,8 +23,8 @@ import javax.servlet.ServletContext;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.openmeetings.servlet.BeanUtil;
-import org.apache.openmeetings.servlet.ServerNotInitializedException;
+import org.apache.openmeetings.core.servlet.BeanUtil;
+import org.apache.openmeetings.core.servlet.ServerNotInitializedException;
public abstract class BaseWebService {
private BeanUtil beanUtil = new BeanUtil();
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java Mon Apr 7 16:19:59 2014
@@ -27,9 +27,8 @@ import java.util.Date;
import java.util.List;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
@@ -37,6 +36,7 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
@@ -66,7 +66,7 @@ public class CalendarWebService {
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private AdminUserDao userDao;
@Autowired
@@ -593,7 +593,7 @@ public class CalendarWebService {
Long user_level = userManager.getUserLevelByID(users_id);
if (AuthLevelUtil.checkUserLevel(user_level)) {
- User user = userManager.getUserById(users_id);
+ User user = userDao.get(users_id);
long language_id = (user == null) ? 1 : user.getLanguage_id();
List<AppointmentReminderTyps> res = appointmentReminderTypDao
.getAppointmentReminderTypList(language_id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java Mon Apr 7 16:19:59 2014
@@ -26,16 +26,17 @@ import java.net.URLConnection;
import java.util.LinkedHashMap;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.file.FileProcessor;
-import org.apache.openmeetings.data.file.FileUtils;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.file.FileProcessor;
+import org.apache.openmeetings.core.data.file.FileUtils;
+import org.apache.openmeetings.core.documents.LoadLibraryPresentation;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
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.dto.file.FileExplorerObject;
import org.apache.openmeetings.db.dto.file.LibraryPresentation;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.documents.LoadLibraryPresentation;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
@@ -62,7 +63,9 @@ public class FileWebService {
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
+ @Autowired
+ private UserDao userDao;
@Autowired
private FileExplorerItemDao fileExplorerItemDao;
@Autowired
@@ -124,8 +127,7 @@ public class FileWebService {
InputStream inputstream = new BufferedInputStream(
uc.getInputStream());
- User externalUser = userManager.getUserByExternalIdAndType(
- externalUserId, externalType);
+ User externalUser = userDao.getExternalUser(externalUserId, externalType);
LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
hs.put("user", externalUser);
@@ -210,7 +212,7 @@ public class FileWebService {
InputStream inputstream = new BufferedInputStream(
uc.getInputStream());
- User internalUser = userManager.getUserById(internalUserId);
+ User internalUser = userDao.get(internalUserId);
LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
hs.put("user", internalUser);
@@ -277,8 +279,7 @@ public class FileWebService {
if (AuthLevelUtil.checkWebServiceLevel(User_level)) {
- User userExternal = userManager.getUserByExternalIdAndType(
- externalUserId, externalType);
+ User userExternal = userDao.getExternalUser(externalUserId, externalType);
Long userId = userExternal.getUser_id();
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java Mon Apr 7 16:19:59 2014
@@ -21,12 +21,13 @@ package org.apache.openmeetings.axis.ser
import java.util.ArrayList;
import java.util.List;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.remote.ConferenceService;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+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.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
@@ -35,7 +36,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -54,7 +54,7 @@ public class JabberWebService {
JabberWebService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private AdminUserDao userDao;
@Autowired
@@ -62,7 +62,7 @@ public class JabberWebService {
@Autowired
private ConferenceService conferenceService;
@Autowired
- private InvitationManager invitationManager;
+ private IInvitationManager invitationManager;
@Autowired
private ConfigurationDao configurationDao;
@Autowired
@@ -92,7 +92,7 @@ public class JabberWebService {
}
Long users_id = sessiondataDao.checkSession(SID);
- User u = userManager.getUserById(users_id);
+ User u = userDao.get(users_id);
for (Organisation_Users ou : u.getOrganisation_users()) {
List<RoomOrganisation> rol = conferenceService.getRoomsByOrganisationWithoutType(SID
, ou.getOrganisation().getOrganisation_id().longValue());
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java Mon Apr 7 16:19:59 2014
@@ -31,19 +31,21 @@ import java.util.List;
import java.util.Map;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.remote.ConferenceService;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
-import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.room.IInvitationManager;
+import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dto.file.RecordingObject;
import org.apache.openmeetings.db.dto.room.RoomSearchResult;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -51,13 +53,12 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.room.Client;
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.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.remote.ConferenceService;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -87,7 +88,7 @@ public class RoomWebService {
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private AdminUserDao userDao;
@Autowired
@@ -95,7 +96,9 @@ public class RoomWebService {
@Autowired
private FlvRecordingDao flvRecordingDao;
@Autowired
- private InvitationManager invitationManager;
+ private InvitationDao invitationDao;
+ @Autowired
+ private IInvitationManager invitationManager;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java Mon Apr 7 16:19:59 2014
@@ -19,9 +19,9 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
@@ -44,7 +44,7 @@ public class ServerWebService {
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private ServerDao serversDao;
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java Mon Apr 7 16:19:59 2014
@@ -21,15 +21,16 @@ package org.apache.openmeetings.axis.ser
import java.util.Date;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.basic.FieldManager;
+import org.apache.openmeetings.core.data.user.OrganisationManager;
+import org.apache.openmeetings.core.remote.MainService;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dto.basic.ErrorResult;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.entity.basic.ErrorType;
@@ -37,7 +38,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.remote.MainService;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -63,7 +63,7 @@ public class UserWebService {
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UserManager userManagement;
+ private IUserManager userManagement;
@Autowired
private FieldManager fieldManager;
@Autowired
@@ -220,13 +220,13 @@ public class UserWebService {
return user_id;
}
- User user = userManagement.getUserById(user_id);
+ User user = usersDao.get(user_id);
// activate the User
user.setStatus(1);
user.setUpdatetime(new Date());
- userManagement.updateUser(user);
+ usersDao.update(user, users_id);
return user_id;
@@ -307,13 +307,13 @@ public class UserWebService {
return user_id;
}
- User user = userManagement.getUserById(user_id);
+ User user = usersDao.get(user_id);
// activate the User
user.setStatus(1);
user.setUpdatetime(new Date());
- userManagement.updateUser(user);
+ usersDao.update(user, users_id);
return user_id;
@@ -382,8 +382,7 @@ public class UserWebService {
if (AuthLevelUtil.checkAdminLevel(user_level)) {
- User testUser = userManagement.getUserByExternalIdAndType(
- externalUserId, externalUserType);
+ User testUser = usersDao.getExternalUser(externalUserId, externalUserType);
if (testUser != null) {
throw new Exception("User does already exist!");
@@ -400,7 +399,7 @@ public class UserWebService {
return user_id;
}
- User user = userManagement.getUserById(user_id);
+ User user = usersDao.get(user_id);
// activate the User
user.setStatus(1);
@@ -408,7 +407,7 @@ public class UserWebService {
user.setExternalUserId(externalUserId);
user.setExternalUserType(externalUserType);
- userManagement.updateUser(user);
+ usersDao.update(user, users_id);
return user_id;
@@ -478,8 +477,7 @@ public class UserWebService {
if (AuthLevelUtil.checkAdminLevel(user_level)) {
- User userExternal = userManagement.getUserByExternalIdAndType(
- externalUserId, externalUserType);
+ User userExternal = usersDao.getExternalUser(externalUserId, externalUserType);
Long userId = userExternal.getUser_id();
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Mon Apr 7 16:19:59 2014
@@ -37,6 +37,7 @@
<velocity.version>1.7</velocity.version>
<batik.version>1.7</batik.version>
<smslib.version>3.5.4</smslib.version>
+ <derby.version>10.10.1.1</derby.version>
</properties>
<repositories>
<repository>
@@ -44,6 +45,27 @@
<url>http://smslib.org/maven2/v3</url>
</repository>
</repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!-- configuration>
+ <excludes>
+ <exclude>**/*.class</exclude>
+ </excludes>
+ </configuration-->
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
@@ -55,11 +77,6 @@
<artifactId>openmeetings-db</artifactId>
<version>${openmeetings.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-web</artifactId>
- <version>${openmeetings.version}</version>
- </dependency-->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
@@ -100,5 +117,30 @@
<artifactId>smslib</artifactId>
<version>${smslib.version}</version>
</dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-install</artifactId>
+ <version>${openmeetings.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.red5</groupId>
+ <artifactId>red5-client</artifactId>
+ <version>${red5.client.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.thaiopensource</groupId>
+ <artifactId>trang</artifactId>
+ <version>20091111</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.batik.beans;
+package org.apache.openmeetings.core.batik.beans;
import java.util.List;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java Mon Apr 7 16:19:59 2014
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.cluster;
+package org.apache.openmeetings.core.cluster;
import java.util.HashMap;
import java.util.Map;
-import org.apache.openmeetings.cluster.sync.RestClient;
+import org.apache.openmeetings.core.cluster.sync.RestClient;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.cluster.sync;
+package org.apache.openmeetings.core.cluster.sync;
import java.util.Iterator;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.OGG_EXTENSION;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java Mon Apr 7 16:19:59 2014
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION;
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.JPG_EXTENTION;
import static org.apache.openmeetings.util.OmFileHelper.profileFileName;
import static org.apache.openmeetings.util.OmFileHelper.profileImagePrefix;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.basic;
+package org.apache.openmeetings.core.data.basic;
import java.util.Collection;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.beans.rooms;
+package org.apache.openmeetings.core.data.beans.rooms;
import org.apache.openmeetings.db.entity.room.Room;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.calendar.management;
+package org.apache.openmeetings.core.data.calendar.management;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -26,15 +26,14 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.conference.RoomManager;
+import org.apache.openmeetings.core.data.basic.FieldManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
-import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -42,6 +41,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation.MessageType;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.CalendarPatterns;
@@ -65,7 +65,7 @@ public class AppointmentLogic {
@Autowired
private RoomDao roomDao;
@Autowired
- private InvitationManager invitationManager;
+ private IInvitationManager invitationManager;
@Autowired
private TimezoneUtil timezoneUtil;
@Autowired
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.conference;
+package org.apache.openmeetings.core.data.conference;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -34,8 +34,8 @@ import javax.persistence.criteria.Criter
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.user.OrganisationManager;
+import org.apache.openmeetings.core.data.basic.FieldManager;
+import org.apache.openmeetings.core.data.user.OrganisationManager;
import org.apache.openmeetings.db.dao.room.IRoomManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.file;
+package org.apache.openmeetings.core.data.file;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
@@ -26,12 +26,12 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.converter.FlvExplorerConverter;
-import org.apache.openmeetings.converter.GenerateImage;
-import org.apache.openmeetings.converter.GenerateThumbs;
+import org.apache.openmeetings.core.converter.FlvExplorerConverter;
+import org.apache.openmeetings.core.converter.GenerateImage;
+import org.apache.openmeetings.core.converter.GenerateThumbs;
+import org.apache.openmeetings.core.documents.GeneratePDF;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.documents.GeneratePDF;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.file;
+package org.apache.openmeetings.core.data.file;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java Mon Apr 7 16:19:59 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.core.data.flvrecord.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.converter.FlvInterviewConverter;
+import org.apache.openmeetings.core.converter.FlvInterviewConverter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewReConverterTask.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewReConverterTask.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewReConverterTask.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewReConverterTask.java Mon Apr 7 16:19:59 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.core.data.flvrecord.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.converter.FlvInterviewConverter;
+import org.apache.openmeetings.core.converter.FlvInterviewConverter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java Mon Apr 7 16:19:59 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.core.data.flvrecord.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.converter.FlvRecorderConverter;
+import org.apache.openmeetings.core.converter.FlvRecorderConverter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java Mon Apr 7 16:19:59 2014
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener;
+package org.apache.openmeetings.core.data.flvrecord.listener;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Date;
-import org.apache.openmeetings.data.flvrecord.listener.async.BaseStreamWriter;
-import org.apache.openmeetings.data.flvrecord.listener.async.CachedEvent;
-import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
-import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.BaseStreamWriter;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.CachedEvent;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.StreamAudioWriter;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.StreamVideoWriter;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.red5.io.IoConstants.TYPE_AUDIO;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.red5.server.net.rtmp.event.VideoData.FrameType.KEYFRAME;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java Mon Apr 7 16:19:59 2014
@@ -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.AlphaComposite;
import java.awt.BasicStroke;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java Mon Apr 7 16:19:59 2014
@@ -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/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/OrganisationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/OrganisationManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/OrganisationManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/OrganisationManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.user;
+package org.apache.openmeetings.core.data.user;
import java.util.Collections;
import java.util.Comparator;