You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/12 19:03:39 UTC
svn commit: r1513201 - in /openmeetings/trunk/singlewebapp: WebContent/
WebContent/openmeetings/public/ WebContent/src/base/
WebContent/src/base/hibernate/ WebContent/src/modules/
WebContent/src/modules/chat/ WebContent/src/modules/dashboard/ WebConten...
Author: solomax
Date: Mon Aug 12 17:03:38 2013
New Revision: 1513201
URL: http://svn.apache.org/r1513201
Log:
[OPENMEETINGS-760] calendar and recordings are removed from Flash UI
Removed:
openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
openmeetings/trunk/singlewebapp/WebContent/project.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml Mon Aug 12 17:03:38 2013
@@ -291,15 +291,6 @@ To disable AEC please specify 0.
<moderatorModuleRoom>roomModerate</moderatorModuleRoom>
-<!-- #############################################
- Dashboard Modules
- -->
-
-<dashboardModuleStartScreen>mainDashboard</dashboardModuleStartScreen>
-
-<dashboardModuleCalendar>lzCalendar</dashboardModuleCalendar>
-
-
<!-- Conference Room Modules -->
<conferenceModuleRoomList>allmeetings</conferenceModuleRoomList>
@@ -331,8 +322,6 @@ To disable AEC please specify 0.
Event Room Modules
-->
-<recordModule>lzRecordContent</recordModule>
-
<!-- #############################################
Profiles Panel Modules
-->
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd Mon Aug 12 17:03:38 2013
@@ -54,13 +54,10 @@
<xs:element ref="availableCameraResolutions"/>
<xs:element ref="moderatorModuleUser"/>
<xs:element ref="moderatorModuleRoom"/>
- <xs:element ref="dashboardModuleStartScreen"/>
- <xs:element ref="dashboardModuleCalendar"/>
<xs:element ref="conferenceModuleRoomList"/>
<xs:element ref="conferenceRoomModule"/>
<xs:element ref="restrictedRoomModule"/>
<xs:element ref="interviewRoomModule"/>
- <xs:element ref="recordModule"/>
<xs:element ref="userSettingsModule"/>
</xs:sequence>
</xs:complexType>
@@ -166,12 +163,9 @@
</xs:element>
<xs:element name="moderatorModuleUser" type="xs:NCName"/>
<xs:element name="moderatorModuleRoom" type="xs:NCName"/>
- <xs:element name="dashboardModuleStartScreen" type="xs:NCName"/>
- <xs:element name="dashboardModuleCalendar" type="xs:NCName"/>
<xs:element name="conferenceModuleRoomList" type="xs:NCName"/>
<xs:element name="conferenceRoomModule" type="xs:NCName"/>
<xs:element name="restrictedRoomModule" type="xs:NCName"/>
<xs:element name="interviewRoomModule" type="xs:NCName"/>
- <xs:element name="recordModule" type="xs:NCName"/>
<xs:element name="userSettingsModule" type="xs:NCName"/>
</xs:schema>
Modified: openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/project.xsd Mon Aug 12 17:03:38 2013
@@ -76,16 +76,6 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="labeledTabpane" type="project:labeledTabpane" >
-</xs:element>
- <xs:complexType name="labeledTabpane" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:tabpane">
- <xs:attribute name="labelid" type="lzx:number" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="editRecordStream" type="project:editRecordStream" >
</xs:element>
<xs:complexType name="editRecordStream" mixed="true">
@@ -722,18 +712,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="overAllChatOutput" type="project:overAllChatOutput" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- chat output area. It shows chat history on-init. </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="overAllChatOutput" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="answerPoll" type="project:answerPoll" >
</xs:element>
<xs:complexType name="answerPoll" mixed="true">
@@ -947,26 +925,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="attendeeListItem" type="project:attendeeListItem" >
-</xs:element>
- <xs:complexType name="attendeeListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="userId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="memberId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="lastName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="jNameTimeZone" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="firstName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="email" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="labelTooltip" type="project:labelTooltip" >
</xs:element>
<xs:complexType name="labelTooltip" mixed="true">
@@ -1267,18 +1225,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="messageRecordingWin" type="project:messageRecordingWin" >
-</xs:element>
- <xs:complexType name="messageRecordingWin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:guiPresenter">
- <xs:attribute name="labelTitleId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="error" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="chatOutputRoomsList" type="project:chatOutputRoomsList" >
</xs:element>
<xs:complexType name="chatOutputRoomsList" mixed="true">
@@ -1443,26 +1389,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="addExternalAttendee" type="project:addExternalAttendee" >
-</xs:element>
- <xs:complexType name="addExternalAttendee" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- <xs:attribute name="selectionActive" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="loginWeb" type="project:loginWeb" >
-</xs:element>
- <xs:complexType name="loginWeb" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:explorerBox">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="applyForModeration" type="project:applyForModeration" >
</xs:element>
<xs:complexType name="applyForModeration" mixed="true">
@@ -1654,14 +1580,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="rootFLVExplorerItem" type="project:rootFLVExplorerItem" >
-</xs:element>
- <xs:complexType name="rootFLVExplorerItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseFLVExplorerItem">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="rootFileExplorerItem" type="project:rootFileExplorerItem" >
</xs:element>
<xs:complexType name="rootFileExplorerItem" mixed="true">
@@ -1694,54 +1612,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="lzRecordingsViewMain" type="project:lzRecordingsViewMain" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
-
- View for recorded contents list.
- When you select 'Recordings' on the top menu, this class shows the list.
-</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="lzRecordingsViewMain" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:conferenceBox">
- <xs:attribute name="timerDelegateStarted" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="timerDelegate" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="rightTime" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="right" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="recordingName" type="xs:string" default="" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
-
- View for recorded contents list.
- When you select 'Recordings' on the top menu, this class shows the list.
-</xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="recordingLog" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="leftTime" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="left" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="isPaused" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="initW" type="lzx:number" default="640" >
-</xs:attribute>
- <xs:attribute name="initH" type="lzx:number" default="480" >
-</xs:attribute>
- <xs:attribute name="flvRecordingId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="deltaInSeconds" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="dateSelectorMonth" type="project:dateSelectorMonth" >
</xs:element>
<xs:complexType name="dateSelectorMonth" mixed="true">
@@ -1920,21 +1790,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="lzRecordContent" type="project:lzRecordContent" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
-
- View for recorded contents list.
- When you select 'Recordings' on the top menu, this class shows the list.
-</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="lzRecordContent" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="subMenuIconToolsToUpload" type="project:subMenuIconToolsToUpload" >
</xs:element>
<xs:complexType name="subMenuIconToolsToUpload" mixed="true">
@@ -2083,14 +1938,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="folderFLVExplorerItem" type="project:folderFLVExplorerItem" >
-</xs:element>
- <xs:complexType name="folderFLVExplorerItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseFLVExplorerItem">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="autoLoader" type="project:autoLoader" >
</xs:element>
<xs:complexType name="autoLoader" mixed="true">
@@ -2395,20 +2242,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="baseChooseIconFLVView" type="project:baseChooseIconFLVView" >
-</xs:element>
- <xs:complexType name="baseChooseIconFLVView" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="resourceN" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="labelid" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="isselected" type="lzx:boolean" default="false" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="menuListItemUserProfile" type="project:menuListItemUserProfile" >
</xs:element>
<xs:complexType name="menuListItemUserProfile" mixed="true">
@@ -2523,50 +2356,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="baseFLVExplorerItem" type="project:baseFLVExplorerItem" >
-</xs:element>
- <xs:complexType name="baseFLVExplorerItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="singleClickStarted" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="singleClickDelegate" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="selected" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="refObjListRoot" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="open" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="mouseDownClickUsed" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="mouseDownClickDelegate" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="isTrashCan" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isRoot" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isPresentation" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isOwner" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isMouseDownDragAction" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isImage" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isFolder" type="lzx:boolean" default="true" >
-</xs:attribute>
- <xs:attribute name="fileName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="fileIcon" type="xs:string" default="string" >
-</xs:attribute>
- <xs:attribute name="fileHash" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="fileExplorerItemId" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="videoObjectTestBroadcast" type="project:videoObjectTestBroadcast" >
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -2703,14 +2492,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="flvExplorerItem" type="project:flvExplorerItem" >
-</xs:element>
- <xs:complexType name="flvExplorerItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseFLVExplorerItem">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="pendingUserStatus" type="project:pendingUserStatus" >
</xs:element>
<xs:complexType name="pendingUserStatus" mixed="true">
@@ -2725,16 +2506,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userActivityItem" type="project:userActivityItem" >
-</xs:element>
- <xs:complexType name="userActivityItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="userText" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawDrawarrowTools" type="project:drawDrawarrowTools" >
</xs:element>
<xs:complexType name="drawDrawarrowTools" mixed="true">
@@ -2857,16 +2628,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userActivityDevider" type="project:userActivityDevider" >
-</xs:element>
- <xs:complexType name="userActivityDevider" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="deviderText" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="paintToolsPalette" type="project:paintToolsPalette" >
</xs:element>
<xs:complexType name="paintToolsPalette" mixed="true">
@@ -2875,18 +2636,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="addAttendee" type="project:addAttendee" >
-</xs:element>
- <xs:complexType name="addAttendee" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="isSuperModerator" type="lzx:boolean" default="false" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="testSetup" type="project:testSetup" >
</xs:element>
<xs:complexType name="testSetup" mixed="true">
@@ -3553,26 +3302,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="attendeItemListItem" type="project:attendeItemListItem" >
-</xs:element>
- <xs:complexType name="attendeItemListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="userId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="omTimeZone" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="login" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="lastname" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="firstname" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="email" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="calendarWeekView" type="project:calendarWeekView" >
</xs:element>
<xs:complexType name="calendarWeekView" mixed="true">
@@ -3731,34 +3460,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="lzRecordingsViewBottom" type="project:lzRecordingsViewBottom" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
-
- View for recorded contents list.
- When you select 'Recordings' on the top menu, this class shows the list.
-</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="lzRecordingsViewBottom" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:conferenceBox">
- <xs:attribute name="pixelFactor" type="lzx:number" default="5" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
-
- View for recorded contents list.
- When you select 'Recordings' on the top menu, this class shows the list.
-</xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="deltaInSeconds" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="currentRecording" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="turnoverlistheaderitemIcon" type="project:turnoverlistheaderitemIcon" >
</xs:element>
<xs:complexType name="turnoverlistheaderitemIcon" mixed="true">
@@ -4716,18 +4417,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="mainDashboardSponsored" type="project:mainDashboardSponsored" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- modules:dashboard </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="mainDashboardSponsored" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="debugPinCode" type="project:debugPinCode" >
</xs:element>
<xs:complexType name="debugPinCode" mixed="true">
@@ -5381,20 +5070,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="profilesPanel" type="project:profilesPanel" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Logged-in User Profile Panel on the dashboard </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="profilesPanel" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:guiPresenter">
- <xs:attribute name="link" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="fillColorChoose" type="project:fillColorChoose" >
</xs:element>
<xs:complexType name="fillColorChoose" mixed="true">
@@ -5515,16 +5190,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="flvMetaInfoContentArea" type="project:flvMetaInfoContentArea" >
-</xs:element>
- <xs:complexType name="flvMetaInfoContentArea" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="baseWidthForPointer" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawDocumentItem" type="project:drawDocumentItem" >
</xs:element>
<xs:complexType name="drawDocumentItem" mixed="true">
@@ -5779,14 +5444,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="lzCalendar" type="project:lzCalendar" >
-</xs:element>
- <xs:complexType name="lzCalendar" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="activityListRestrictedRoomAV" type="project:activityListRestrictedRoomAV" >
</xs:element>
<xs:complexType name="activityListRestrictedRoomAV" mixed="true">
@@ -6421,28 +6078,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="lzCalendarContent" type="project:lzCalendarContent" >
-</xs:element>
- <xs:complexType name="lzCalendarContent" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="viewstyle" type="xs:string" default="month" >
-</xs:attribute>
- <xs:attribute name="viewmode" type="xs:string" default="month" >
-</xs:attribute>
- <xs:attribute name="selectionActive" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="keepinfoopen" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="jName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="isloaded" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="firstDay" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="confirmationBox" type="project:confirmationBox" >
</xs:element>
<xs:complexType name="confirmationBox" mixed="true">
@@ -6497,22 +6132,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="overAllChatTabBottom" type="project:overAllChatTabBottom" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- View of the buttom area of chat. It contains buttons of message,emoticons,clear. </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="overAllChatTabBottom" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="objMessage" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="doUpdate" type="lzx:boolean" default="false" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="dateField" type="project:dateField" >
</xs:element>
<xs:complexType name="dateField" mixed="true">
@@ -7741,42 +7360,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="overAllChat" type="project:overAllChat" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Chat module of the dashboard. The fixed size is 810x280 </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="overAllChat" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="mainDashboard" type="project:mainDashboard" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- modules:dashboard </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="mainDashboard" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- <xs:attribute name="refObjItem" type="xs:string" default="null" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Chat module of the dashboard. The fixed size is 810x280
- <class name="overAllChat" extends="guiPresenter" resizeable="false"
- width="${ canvas.width-20 }" height="${ canvas.height-360 }"
- y="240" x="10" closable="true" labelid="443"
- isdragable="false" minimizable="false"
- maximizable="false" closable="false">
- </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="innerlistViewEventUserListTable" type="project:innerlistViewEventUserListTable" >
</xs:element>
<xs:complexType name="innerlistViewEventUserListTable" mixed="true">
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Mon Aug 12 17:03:38 2013
@@ -967,10 +967,6 @@
if (canvas.currentActivityList != null) {
canvas.currentActivityList.addMessageRequest(value, canvas.getLabelName(1367), new Date().getTime());
}
- if (canvas._overallchatcontent!=null){
- var parentObj = canvas._overallchatcontent.parent.parent.parent._chatparticipants;
- parentObj.removeItemById(value.user_id);
- }
parent.roomDisconnectUser(value, value.publicSID);
]]>
</handler>
@@ -1377,8 +1373,6 @@
canvas.startBrowser(value);
} else if(value[0]=='closeBrowserURL'){
canvas.closeBrowser(value);
- } else if(value[0]=='clearOverallChatHistory'){
- canvas._overallchatcontent.clear();
}
]]>
@@ -1715,22 +1709,9 @@
</handler>
</netRemoteCallHib>
- <!-- notifications for Overall-Chat -->
- <netRemoteCallHib name="sendVarsToOverallChat" funcname="sendVarsToOverallChat" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("sendVarsToOverallChat: ",value);
- if (canvas._overallchatcontent!=null){
- canvas._overallchatcontent.addChatHistory(value.message,value.client);
- }
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="roomConnect" funcname="roomConnect" >
<handler name="ondata" args="value">
if ($debug) Debug.write("roomConnect: ",value);
- if (canvas._overallchatcontent != null){
- canvas._overallchatcontent.parent.parent.parent._chatparticipants.addItem(value);
- }
</handler>
</netRemoteCallHib>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Mon Aug 12 17:03:38 2013
@@ -402,8 +402,6 @@ and some more references to temp-objects
<attribute name="isAllowedToGiveExclusiveAudio" value="false" type="boolean" />
-<attribute name="lzCalendarInfoTab" value="null"/>
-
<attribute name="roomJumpId" value="0" type="number" />
<attribute name="userContacts" value="null" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx Mon Aug 12 17:03:38 2013
@@ -38,8 +38,6 @@ these properties can be overwritten by p
Dashboard Modules
-->
-<attribute name="dashboardModuleStartScreen" value="mainDashboard" type="string" />
-
<attribute name="dashboardModuleCalendar" value="myScheduledMeetings" type="string" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx Mon Aug 12 17:03:38 2013
@@ -32,7 +32,4 @@
<!--- chat modules: chat content -->
<attribute name="_currentChatPanel" value="null" />
-<!--- chat modules: overall chat content -->
-<attribute name="_overallchatcontent" value="null" />
-
</library>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx Mon Aug 12 17:03:38 2013
@@ -31,8 +31,5 @@
<include href="chatParticipants.lzx" />
<include href="fontOptions.lzx" />
<include href="emotIconsSelector.lzx" />
- <include href="overAllChatOutput.lzx" />
- <include href="overAllChatTabBottom.lzx" />
- <include href="overAllChat.lzx" />
</library>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx Mon Aug 12 17:03:38 2013
@@ -21,7 +21,5 @@
<library>
<include href="tabButtonMain.lzx" />
- <include href="profilesPanel.lzx" />
- <include href="mainDashboard.lzx" />
</library>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx Mon Aug 12 17:03:38 2013
@@ -26,10 +26,8 @@
<include href="settings/" />
-->
<include href="invitation/" />
- <include href="lzrecordcontent/" />
<include href="dashboard/" />
<include href="meetings/" />
<include href="sipintegration/" />
- <include href="lzcalendar/" />
</library>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java Mon Aug 12 17:03:38 2013
@@ -20,7 +20,6 @@ package org.apache.openmeetings.remote;
import java.util.Date;
import java.util.List;
-import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
@@ -35,8 +34,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
@@ -123,195 +120,6 @@ public class CalendarService {
}
- public Long saveAppointment(String SID, String appointmentName,
- String appointmentLocation, String appointmentDescription,
- String appointmentstartStr, String appointmentendStr, Boolean isDaily,
- Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
- Long categoryId, Long remind, @SuppressWarnings("rawtypes") List mmClient, Long roomType,
- String baseUrl, Long language_id, Boolean isPasswordProtected,
- String password, long roomId) {
-
- log.debug("saveAppointMent SID:" + SID + ", baseUrl : " + baseUrl);
-
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- log.debug("saveAppointMent users_id:" + users_id);
-
- Long user_level = userManager.getUserLevelByID(users_id);
-
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- User us = userManager.getUserById(users_id);
-
- // Refactor the given time ignoring the Date is always UTC!
- TimeZone timezone = timezoneUtil.getTimezoneByUser(us);
-
- //Transform the user time in a local time of the server
- //machines locale timeZone and store that to the db
- Date appointmentstart = new Date(TimezoneUtil.getCalendarInTimezone(appointmentstartStr, timezone).getTime().getTime());
- Date appointmentend = new Date(TimezoneUtil.getCalendarInTimezone(appointmentendStr, timezone).getTime().getTime());
-
- log.debug("timezone "+timezone);
- log.debug("appointmentstartStr "+appointmentstartStr);
- log.debug("appointmentendStr "+appointmentendStr);
- log.debug("appointmentstart "+appointmentstart);
- log.debug("appointmentend "+appointmentend);
-
- Long id = appointmentLogic.saveAppointment(appointmentName,
- users_id, appointmentLocation, appointmentDescription,
- appointmentstart, appointmentend, isDaily, isWeekly,
- isMonthly, isYearly, categoryId, remind, mmClient,
- roomType, baseUrl, language_id, isPasswordProtected, password, roomId);
-
- return id;
- } else {
- log.error("saveAppointment : wrong user level");
- }
- } catch (Exception err) {
- log.error("[saveAppointment]", err);
- }
- return null;
-
- }
-
- public Long updateAppointmentTimeOnly(String SID, Long appointmentId,
- String appointmentstartStr, String appointmentendStr, String baseurl,
- Long language_id) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("updateAppointment");
-
- log.debug("appointmentId " + appointmentId);
-
- User us = userManager.getUserById(users_id);
-
- // Refactor the given time ignoring the Date is always UTC!
- TimeZone timezone = timezoneUtil.getTimezoneByUser(us);
-
- //Transform the user time in a local time of the server
- //machines locale timeZone and store that to the db
- Date appointmentstart = new Date(TimezoneUtil.getCalendarInTimezone(appointmentstartStr, timezone).getTime().getTime());
- Date appointmentend = new Date(TimezoneUtil.getCalendarInTimezone(appointmentendStr, timezone).getTime().getTime());
-
- log.debug("up timezone "+timezone);
- log.debug("up appointmentstartStr "+appointmentstartStr);
- log.debug("up appointmentendStr "+appointmentendStr);
- log.debug("up appointmentstart "+appointmentstart);
- log.debug("up appointmentend "+appointmentend);
-
- appointmentLogic
- .getAppointMentById(appointmentId);
-
- return appointmentDao.updateAppointmentByTime(appointmentId,
- appointmentstart, appointmentend, users_id, baseurl,
- language_id);
-
- }
- } catch (Exception err) {
- log.error("[updateAppointment]", err);
- err.printStackTrace();
- }
- return null;
-
- }
-
- public Long updateAppointment(String SID, Long appointmentId,
- String appointmentName,
- String appointmentLocation, String appointmentDescription,
- String appointmentstartStr, String appointmentendStr, Boolean isDaily,
- Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
- Long categoryId, Long remind, @SuppressWarnings("rawtypes") List mmClient, Long roomType,
- String baseUrl, Long language_id, Boolean isPasswordProtected,
- String password, long roomId) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("updateAppointment");
-
- Appointment app = appointmentLogic.getAppointMentById(appointmentId);
- Room room = app.getRoom();
- if (roomId > 0) {
- if ( room.getRooms_id() != roomId) {
- app.setRoom(roomDao.get(roomId));
- appointmentDao.updateAppointment(app);
- boolean isAppRoom = room.getAppointment();
- if (isAppRoom) {
- roomDao.delete(room, users_id);
- }
- }
- } else {
- RoomType rt = roomManager.getRoomTypesById(roomType);
-
- if (room != null) {
-
- room.setComment(appointmentDescription);
- room.setName(appointmentName);
- room.setRoomtype(rt);
-
- roomDao.update(room, users_id);
- }
- }
- User user = userManager.getUserById(users_id);
-
- // Refactor the given time ignoring the Date is always UTC!
- TimeZone timezone = timezoneUtil.getTimezoneByUser(user);
-
- //Transform the user time in a local time of the server
- //machines locale timeZone and store that to the db
- Date appointmentstart = new Date(TimezoneUtil.getCalendarInTimezone(appointmentstartStr, timezone).getTime().getTime());
- Date appointmentend = new Date(TimezoneUtil.getCalendarInTimezone(appointmentendStr, timezone).getTime().getTime());
-
- log.debug("up2 timezone "+timezone);
- log.debug("up2 appointmentstartStr "+appointmentstartStr);
- log.debug("up2 appointmentendStr "+appointmentendStr);
- log.debug("up2 appointmentstart "+appointmentstart);
- log.debug("up2 appointmentend "+appointmentend);
-
- return appointmentDao.updateAppointment(appointmentId,
- appointmentName, appointmentDescription,
- appointmentstart, appointmentend, isDaily, isWeekly,
- isMonthly, isYearly, categoryId, remind, mmClient,
- users_id, baseUrl, language_id, isPasswordProtected, password,
- appointmentLocation);
- }
- } catch (Exception err) {
- log.error("[updateAppointment]", err);
- err.printStackTrace();
- }
- return null;
-
- }
-
- public Long deleteAppointment(String SID, Long appointmentId,
- Long language_id) {
-
- log.debug("deleteAppointment : " + appointmentId);
-
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- return appointmentLogic.deleteAppointment(appointmentId,
- users_id, language_id);
-
- }
-
- } catch (Exception err) {
- log.error("[deleteAppointment]", err);
- }
- return null;
-
- }
-
public Appointment getAppointmentByRoomId(String SID, Long room_id) {
try {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java Mon Aug 12 17:03:38 2013
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.conference.RoomManager;
@@ -66,9 +65,6 @@ public class ChatService implements IPen
@Autowired
private UserManager userManager;
- //the overall chat room is just another room
- private static final Long overallChatRoomName = new Long(-1);
-
//number of items in the chat room history
private static final int chatRoomHistory = 50;
@@ -332,98 +328,6 @@ public class ChatService implements IPen
log.error("resultReceived ChatService "+arg0);
}
- /**
- * sends a message to all connected users
- *
- * @param newMessage
- * @return - 1 in case of success, -1 otherwise
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public int sendMessageToOverallChat(Object newMessage) {
- try {
- IConnection current = Red5.getConnectionLocal();
- Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
-
- //log.error(newMessage.getClass().getName());
- ArrayList messageMap = (ArrayList) newMessage;
- //adding delimiter space, cause otherwise an emoticon in the last string would not be found
- String messageText = messageMap.get(4).toString()+" ";
- //log.error("messageText"+messageText);
- //add server time
- messageMap.set(1,parseDateAsTimeString());
- LinkedList<String[]> parsedStringObjects = ChatString.parseChatString(messageText, emoticonsManager.getEmotfilesList(), true);
- //log.error("parsedStringObjects"+parsedStringObjects.size());
- log.debug("size:" + messageMap.size());
- messageMap.add(parsedStringObjects);
- newMessage = messageMap;
-
-
- HashMap<String,Object> hsm = new HashMap<String,Object>();
- hsm.put("client", currentClient);
- hsm.put("message", newMessage);
-
- List<HashMap<String,Object>> myChatList = myChats.get(overallChatRoomName);
- if (myChatList==null) myChatList = new LinkedList<HashMap<String,Object>>();
-
- if (myChatList.size()==chatRoomHistory) myChatList.remove(0);
- myChatList.add(hsm);
- myChats.put(overallChatRoomName,myChatList);
-
- log.debug("SET CHATROOM: "+overallChatRoomName);
-
- scopeApplicationAdapter.syncMessageToCurrentScope("sendVarsToOverallChat", hsm, true);
-
- } catch (Exception err) {
- log.error("[ChatService sendMessageToOverallChat] ",err);
- return -1;
- }
- return 1;
- }
-
-
- /**
- * gets the chat history of overallChat
- *
- * @return - overall chat history
- */
- public List<HashMap<String,Object>> getOverallChatHistory() {
- try {
-
- List<HashMap<String,Object>> myChatList = myChats.get(overallChatRoomName);
- if (myChatList==null) myChatList = new LinkedList<HashMap<String,Object>>();
-
- return myChatList;
- } catch (Exception err) {
- log.error("[getRoomChatHistory] ",err);
- return null;
- }
- }
-
- /**
- * clear the overallChat history
- * @return - all messages being cleaned, null in case of error
- */
- public List<HashMap<String,Object>> clearOverallChat() {
- try {
-
- List<HashMap<String,Object>> myChatList = myChats.get(overallChatRoomName);
- myChatList = new LinkedList<HashMap<String,Object>>();
-
- myChats.put(overallChatRoomName,myChatList);
-
- //Send event to clear to all participants
- Map<Integer,String> newMessage = new HashMap<Integer,String>();
- newMessage.put(0, "clearOverallChatHistory");
- scopeApplicationAdapter.sendMessageToMembers(newMessage);
-
- return myChatList;
-
- } catch (Exception err) {
- log.error("[clearChat] ",err);
- return null;
- }
- }
-
public LinkedList<LinkedList<String>> getAllPublicEmoticons(){
try {
LinkedList<LinkedList<String>> publicemotes = new LinkedList<LinkedList<String>>();
@@ -452,27 +356,4 @@ public class ChatService implements IPen
}
}
- public LinkedHashMap<String,LinkedList<Client>> getChatOverallUsers(){
- try {
- LinkedHashMap<String,LinkedList<Client>> clientList = new LinkedHashMap<String,LinkedList<Client>>();
- LinkedList<Client> guestList = new LinkedList<Client>();
- LinkedList<Client> overallList = new LinkedList<Client>();
-
- for (Client rcl : sessionManager.getClients()) {
- if (rcl.getUser_id()==null || rcl.getUser_id()<=0) {
- guestList.add(rcl);
- } else {
- overallList.add(rcl);
- }
- }
-
- clientList.put("guestList", guestList);
- clientList.put("overallList", overallList);
- return clientList;
- } catch (Exception err) {
- log.error("[getChatOverallUsers]",err);
- }
- return null;
- }
-
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java Mon Aug 12 17:03:38 2013
@@ -18,10 +18,8 @@
*/
package org.apache.openmeetings.remote;
-import java.io.File;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
@@ -32,7 +30,6 @@ import org.apache.openmeetings.data.flvr
import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
-import org.apache.openmeetings.data.flvrecord.beans.FLVRecorderObject;
import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask;
import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask;
import org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask;
@@ -42,12 +39,10 @@ import org.apache.openmeetings.data.flvr
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
import org.apache.openmeetings.persistence.beans.room.Client;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
-import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
@@ -688,316 +683,6 @@ public class FLVRecorderService implemen
}
}
- public FlvRecording getFlvRecordingWithMetaData(String SID,
- Long flvRecordingId) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- FlvRecording flvRecording = this.flvRecordingDaoImpl
- .getFlvRecordingById(flvRecordingId);
-
- flvRecording
- .setFlvRecordingMetaData(this.flvRecordingMetaDataDao
- .getFlvRecordingMetaDataByRecording(flvRecordingId));
-
- if (flvRecording.getInsertedBy() != null) {
- flvRecording.setCreator(this.usersDaoImpl
- .get(flvRecording.getInsertedBy()));
- }
-
- if (flvRecording.getRoom_id() != null) {
- flvRecording.setRoom(roomDao.get(flvRecording.getRoom_id()));
- }
-
- flvRecording.setFlvRecordingLog(this.flvRecordingLogDaoImpl
- .getFLVRecordingLogByRecordingId(flvRecordingId));
-
- return flvRecording;
-
- }
- } catch (Exception err) {
- log.error("[getFlvRecordingWithMetaData] ", err);
- err.printStackTrace();
- }
- return null;
- }
-
- public List<FlvRecordingLog> getFlvRecordingLog(String SID,
- Long flvRecordingId) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- return this.flvRecordingLogDaoImpl
- .getFLVRecordingLogByRecordingId(flvRecordingId);
-
- }
- } catch (Exception err) {
- log.error("[getFlvRecordingLog] ", err);
- err.printStackTrace();
- }
- return null;
- }
-
- public Long deleteFLVOrFolder(String SID, Long flvRecordingId) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
-
- System.out.println("deleteFLVOrFolder " + flvRecordingId);
-
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("deleteFLVOrFolder " + flvRecordingId);
-
- this.flvRecordingDaoImpl.deleteFlvRecording(flvRecordingId);
-
- return flvRecordingId;
- }
- } catch (Exception err) {
- log.error("[deleteFLVOrFolder] ", err);
- }
- return null;
- }
-
- public List<FlvRecording> getFLVExplorerByParent(String SID,
- Long parentFileExplorerItemId, Boolean isOwner) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("parentFileExplorerItemId "
- + parentFileExplorerItemId);
-
- if (parentFileExplorerItemId == 0) {
- if (isOwner) {
-
- return this.flvRecordingDaoImpl.getFlvRecordingByOwner(
- users_id, parentFileExplorerItemId);
-
- } else {
-
- return this.flvRecordingDaoImpl
- .getFlvRecordingsPublic();
-
- }
- } else {
-
- return this.flvRecordingDaoImpl
- .getFlvRecordingByParent(parentFileExplorerItemId);
- }
-
- }
- } catch (Exception err) {
- log.error("[getFLVExplorerByParent] ", err);
- }
- return null;
- }
-
- public Long addFolder(String SID, Long parentFileExplorerItemId,
- String fileName, Boolean isOwner, Long organization_id) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("addFolder " + parentFileExplorerItemId);
-
- if (parentFileExplorerItemId == 0 && isOwner) {
-
- return this.flvRecordingDaoImpl.addFlvFolderRecording("",
- fileName, null, // FileSize
- users_id, null, null, null, // Long room_id, Date
- // recordStart, Date
- // recordEnd
- users_id, // OwnerID => only set if its directly
- // root in Owner Directory, other
- // Folders and Files
- // maybe are also in a Home directory but just
- // because their parent is
- "", parentFileExplorerItemId, organization_id);
-
- } else {
-
- return this.flvRecordingDaoImpl.addFlvFolderRecording("",
- fileName, null, // FileSize
- users_id, null, null, null, // Long room_id, Date
- // recordStart, Date
- // recordEnd
- null, // OwnerID => only set if its directly root in
- // Owner Directory, other Folders and Files
- // maybe are also in a Home directory but just
- // because their parent is
- "", parentFileExplorerItemId, organization_id);
-
- }
-
- }
- } catch (Exception err) {
- log.error("[addFolder] ", err);
- }
- return null;
- }
-
- public Long moveFile(String SID, Long flvRecordingId,
- Long newParentFileExplorerItemId, Boolean isOwner,
- Boolean moveToHome) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
-
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("moveFile " + flvRecordingId);
-
- this.flvRecordingDaoImpl.moveFile(flvRecordingId,
- newParentFileExplorerItemId, isOwner, users_id);
-
- FlvRecording flvRecording = this.flvRecordingDaoImpl
- .getFlvRecordingById(flvRecordingId);
-
- if (moveToHome) {
- // set this file and all subfiles and folders the ownerId
- this.setFileToOwnerOrRoomByParent(flvRecording, users_id);
-
- } else {
- // set this file and all subfiles and folders the room_id
- this.setFileToOwnerOrRoomByParent(flvRecording, null);
-
- }
- }
- } catch (Exception err) {
- log.error("[moveFile] ", err);
- }
- return null;
- }
-
- private void setFileToOwnerOrRoomByParent(FlvRecording flvRecording,
- Long usersId) {
- try {
-
- flvRecording.setOwnerId(usersId);
-
- this.flvRecordingDaoImpl.updateFlvRecording(flvRecording);
-
- List<FlvRecording> subFLVItems = this.flvRecordingDaoImpl
- .getFlvRecordingByParent(flvRecording.getFlvRecordingId());
-
- for (FlvRecording subFLVItem : subFLVItems) {
- this.setFileToOwnerOrRoomByParent(subFLVItem, usersId);
- }
-
- } catch (Exception err) {
- log.error("[setFileToOwnerOrRoomByParent] ", err);
- }
- }
-
- public Long updateFileOrFolderName(String SID, Long flvRecordingId,
- String fileName) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- log.debug("updateFileOrFolderName " + flvRecordingId);
-
- this.flvRecordingDaoImpl.updateFileOrFolderName(flvRecordingId,
- fileName);
-
- return flvRecordingId;
- }
- } catch (Exception err) {
- log.error("[updateFileOrFolderName] ", err);
- }
- return null;
- }
-
- public FLVRecorderObject getFLVExplorerByRoom(String SID,
- Long organization_id) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- FLVRecorderObject fileExplorerObject = new FLVRecorderObject();
-
- // User Home Recordings
- List<FlvRecording> homeFlvRecordings = this.flvRecordingDaoImpl
- .getFlvRecordingRootByOwner(users_id);
- long homeFileSize = 0;
-
- for (FlvRecording homeFlvRecording : homeFlvRecordings) {
- homeFileSize += this
- .getSizeOfDirectoryAndSubs(homeFlvRecording);
- }
-
- fileExplorerObject.setUserHome(homeFlvRecordings);
- fileExplorerObject.setUserHomeSize(homeFileSize);
-
- // Public Recordings by Organization
- List<FlvRecording> publicFlvRecordings = this.flvRecordingDaoImpl
- .getFlvRecordingRootByPublic(organization_id);
- long publicFileSize = 0;
-
- for (FlvRecording publicFlvRecording : publicFlvRecordings) {
- publicFileSize += this
- .getSizeOfDirectoryAndSubs(publicFlvRecording);
- }
- fileExplorerObject.setRoomHome(publicFlvRecordings);
- fileExplorerObject.setRoomHomeSize(publicFileSize);
-
- return fileExplorerObject;
-
- }
- } catch (Exception err) {
- log.error("[getFileExplorerByRoom] ", err);
- }
- return null;
- }
-
- private long getSizeOfDirectoryAndSubs(FlvRecording rec) {
- try {
- long fileSize = 0;
-
- if (rec.getFileHash() != null) {
- File tFile = new File(OmFileHelper.getStreamsHibernateDir(), rec.getFileHash());
- if (tFile.exists()) {
- fileSize += tFile.length();
- }
- }
-
- if (rec.getAlternateDownload() != null) {
- File dFile = new File(OmFileHelper.getStreamsHibernateDir(), rec.getAlternateDownload());
- if (dFile.exists()) {
- fileSize += dFile.length();
- }
- }
- if (rec.getPreviewImage() != null) {
- File iFile = new File(OmFileHelper.getStreamsHibernateDir(), rec.getPreviewImage());
- if (iFile.exists()) {
- fileSize += iFile.length();
- }
- }
-
- List<FlvRecording> flvRecordings = flvRecordingDaoImpl.getFlvRecordingByParent(
- rec.getFlvRecordingId());
-
- for (FlvRecording flvRecording : flvRecordings) {
- fileSize += getSizeOfDirectoryAndSubs(flvRecording);
- }
-
- return fileSize;
-
- } catch (Exception err) {
- log.error("[getSizeOfDirectoryAndSubs] ", err);
- }
- return 0;
- }
-
public Long restartConversion(String SID, Long flvRecordingId,
Integer leftSideLoud, Integer rightSideLoud, Integer leftSideTime,
Integer rightSideTime) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1513201&r1=1513200&r2=1513201&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Mon Aug 12 17:03:38 2013
@@ -137,27 +137,6 @@ public class UserService {
private SlaveHTTPConnectionManager slaveHTTPConnectionManager;
/**
- * get your own user-object
- *
- * @param SID
- * @return get the user bound to this session
- */
- public User getUserSelf(String SID) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- User us = usersDao.get(users_id);
-
- //reset some objects that the client should not know
- us.setSipUser(null);
-
- return us;
- } catch (Exception err) {
- log.error("[getUserSelf]", err);
- }
- return null;
- }
-
- /**
* refreshes the current SID
*
* @param SID
@@ -262,22 +241,6 @@ public class UserService {
}
/**
- * gets a user-list by search criteria
- *
- * @param SID
- * @param search
- * @param start
- * @param max
- * @param orderby
- * @return user-list by search criteria
- */
- public SearchResult<User> getAllUserBySearchRange(String SID,
- String search, int start, int max, String orderby, boolean asc) {
- return userManager.getAllUserByRange(search, start, max, orderby,
- asc);
- }
-
- /**
* kicks a user from the server, also from slaves if needed, this method is
* only invoked by the connection administration UI
*
@@ -855,25 +818,6 @@ public class UserService {
}
- public Long getNumberUnreadMessages(String SID) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- SearchResult<PrivateMessage> searchResult = new SearchResult<PrivateMessage>();
- searchResult.setObjectName(User.class.getName());
- return privateMessagesDao.count(users_id, null, false, false);
-
- }
- } catch (Exception err) {
- log.error("[getNumberUnreadMessages]", err);
- }
- return null;
- }
-
public SearchResult<PrivateMessage> getInbox(String SID, String search,
String orderBy, int start, Boolean asc, Integer max) {
try {
@@ -1288,24 +1232,6 @@ public class UserService {
return null;
}
- public List<UserContact> getUserContactsWithShareCalendar(String SID) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- return userContactsDao.getContactsByShareCalendar(users_id,
- true);
-
- }
-
- } catch (Exception err) {
- log.error("[getContactsByShareCalendar]", err);
- }
- return null;
- }
-
/**
* Kick a user by its publicSID.<br/>
* <br/>