You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/11 17:20:51 UTC
svn commit: r1324812 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/src/modules/admin/orgadmin/
WebContent/src/modules/conference/
WebContent/src/modules/conference/flexibleConferenceRoom/
WebContent/src/modules/confe...
Author: sebawagner
Date: Wed Apr 11 15:20:48 2012
New Revision: 1324812
URL: http://svn.apache.org/viewvc?rev=1324812&view=rev
Log:
OPENMEETINGS-129 Conference user rights and status icons to APL compatible
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/cancel.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/tick.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_add.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_delete.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_add.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_delete.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/micro_small.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_add.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_delete.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/user_add.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/error.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/arrow_refresh.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/error.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound_mute.png (with props)
incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/button_ok.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/process-stop.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/background_small.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/background_small_no.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/background_small_no.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mic.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_remote_control.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_remote_control.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_remote_control_no.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/color_line.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/color_line_dis.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/color_line_dis.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/decrypted.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/encrypted.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/exclusive_audio_permission.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/kdmconfig.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/microphone2.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/warning.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/icon_mute.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/icon_mute_red.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/loader.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/micro_off.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/micro_on.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/noatunloopsong.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/warning.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/1downarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/bgitemvideochat.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/icon_mute.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/icon_mute_red.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/messagebox_warning.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro_off.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro_on.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/noatunloopsong.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/error.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectPlayBroadcast.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Wed Apr 11 15:20:48 2012
@@ -4363,7 +4363,7 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1083" name="user list">
- <value>User is Moderator, he can do anything. [Remote Desktop Control]</value>
+ <value>User is Moderator, he can do anything.</value>
</string>
<string id="1084" name="user list">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx Wed Apr 11 15:20:48 2012
@@ -132,10 +132,12 @@
<orgUsersRecordValueList name="_userlist" y="130" x="120" width="300" height="200" />
- <blueButton resourceItem="edit_add_rsc" labelid="178" y="100" x="400"
+ <blueButton resourceItem="edit_add_rsc" y="100" x="400"
x_insetResource="2" y_insetResource="2" width="20" height="20"
width_insetResource="16" height_insetResource="16"
- onclick="this.parent.addOrganisationToUser()" />
+ onclick="this.parent.addOrganisationToUser()">
+ <labelTooltip labelid="178" />
+ </blueButton>
<method name="addOrganisationToUser">
if (this.organisation_id!=0) {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/library.lzx Wed Apr 11 15:20:48 2012
@@ -20,8 +20,10 @@
-->
<library>
- <resource name="allow_ok_icon_rsc" src="resources/button_ok.png" />
- <resource name="allow_deny_icon_rsc" src="resources/process-stop.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="allow_ok_icon_rsc" src="resources/tick.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="allow_deny_icon_rsc" src="resources/cancel.png" />
<include href="activityList.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/cancel.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/cancel.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/cancel.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/tick.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/tick.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/resources/tick.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx Wed Apr 11 15:20:48 2012
@@ -28,17 +28,35 @@
<resource name="chat_message_incoming_rsc" src="resources/ledlightgreen.png" />
- <resource name="screen_allow_rsc" src="resources/background_small.png" />
- <resource name="screen_deny_rsc" src="resources/background_small_no.png" />
-
- <resource name="remote_allow_rsc" src="resources/mouse_remote_control.png" />
- <resource name="remote_deny_rsc" src="resources/mouse_remote_control_no.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="screen_allow_rsc" src="resources/monitor_add.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="screen_deny_rsc" src="resources/monitor_delete.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="remote_allow_rsc" src="resources/mouse_add.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="remote_deny_rsc" src="resources/mouse_delete.png" />
- <resource name="mic_rsc" src="resources/mic.png" />
+ <!-- FamFam Icon Set -->
<resource name="av_allow_rsc" src="resources/audio_and_video.png" />
+ <!-- FamFam Icon Set -->
<resource name="av_deny_rsc" src="resources/audio_and_video_no.png" />
+
+ <!-- APL author sebawagner -->
<resource name="kick_user_rsc" src="resources/cancel_icon.png" />
+ <!-- APL author sebawagner -->
+ <resource name="mute_micro_btn_rsc">
+ <frame src="resources/mute_micro.png" />
+ <frame src="resources/mute_micro_red.png" />
+ </resource>
+
+ <!-- APL author sebawagner -->
+ <resource name="mute_btn_rsc" src="resources/mute_micro.png" />
+ <!-- APL author sebawagner -->
+ <resource name="unmute_btn_rsc" src="resources/mute_micro_red.png" />
+
+ <!-- APL author sebawagner -->
<resource name="sidebar_tab_btn">
<frame src="resources/sidebar_close.png" />
<frame src="resources/sidebar_open.png" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.png?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.png?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_add.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_delete.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_delete.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/monitor_delete.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_add.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_delete.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_delete.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_delete.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mute_micro_red.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx Wed Apr 11 15:20:48 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="restrictedRoomSidebar" extends="view" width="280" bgcolor="0xFFFFFF"
+<class name="restrictedRoomSidebar" extends="view" width="280"
height="${ canvas.height - 28 }" y="0" clip="true">
<attribute name="selected" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx Wed Apr 11 15:20:48 2012
@@ -20,21 +20,13 @@
-->
<library>
- <resource name="resyncuser_rsc" src="resources/noatunloopsong.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="resyncuser_rsc" src="resources/arrow_refresh.png" />
+ <!-- APL author sebawagner -->
<resource name="speaking" src="resources/speaking.png" />
- <resource name="mute_btn_rsc">
- <frame src="resources/icon_mute.png" />
- <frame src="resources/icon_mute_red.png" />
- </resource>
- <resource name="mute_micro_btn_rsc">
- <frame src="resources/micro_on.png" />
- <frame src="resources/micro_off.png" />
- </resource>
-
- <resource name="mute_btn_rsc" src="resources/micro_on.png" />
- <resource name="unmute_btn_rsc" src="resources/micro_off.png" />
+ <!-- APL author sebawagner -->
<resource name="lz_recorder_play" src="resources/webstart_play.png" />
<include href="commonVideoViewContent.lzx"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx Wed Apr 11 15:20:48 2012
@@ -26,10 +26,16 @@
<!-- FamFam Icon Creative Commons -->
<resource name="right_notactive_rsc" src="resources/delete.png" />
- <resource name="participants_isMod_rsc" src="resources/kdmconfig.png" />
- <resource name="participants_allow_drawing_rsc" src="resources/color_line.png" />
- <resource name="participants_deny_drawing_rsc" src="resources/color_line_dis.png" />
- <resource name="participants_exclusive_audio_rsc" src="resources/microphone2.png" />
+ <!-- FamFam Icon Creative Commons -->
+ <resource name="participants_isMod_rsc" src="resources/user_add.png" />
+ <!-- FamFam Icon Creative Commons -->
+ <resource name="participants_allow_drawing_rsc" src="resources/pencil_add.png" />
+
+ <!-- FamFam Icon Creative Commons -->
+ <resource name="participants_deny_drawing_rsc" src="resources/pencil_delete.png" />
+
+ <!-- APL author sebawagner -->
+ <resource name="participants_exclusive_audio_rsc" src="resources/micro_small.png" />
<include href="participantList.lzx" />
<include href="participantListItem.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/micro_small.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/micro_small.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/micro_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_add.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_delete.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_delete.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/pencil_delete.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/user_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/user_add.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/resources/user_add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx Wed Apr 11 15:20:48 2012
@@ -21,10 +21,10 @@
<library>
<!--
- Source: http://www.iconfinder.com/icondetails/36026/32/error_hazard_warning_icon
+ FamFam Icon set
Creative Commons 3.0
-->
- <resource name="warning_icon_rsc" src="resources/warning.png" />
+ <resource name="warning_icon_rsc" src="resources/error.png" />
<include href="rpcerrorDialog.lzx" />
<include href="errorPopup.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/error.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/error.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/arrow_refresh.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/arrow_refresh.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/arrow_refresh.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx Wed Apr 11 15:20:48 2012
@@ -31,14 +31,10 @@
<handler name="oninit">
<![CDATA[
-
this.initList();
]]>
</handler>
- <view width="$once{ parent.width-2 }" height="${ parent.height-2 }"
- x="1" y="1" bgcolor="white" />
-
<method name="initialAddItem" args="object">
<![CDATA[
//if ($debug) Debug.write("eventUserList addItem: ",object.publicSID);
@@ -162,9 +158,7 @@
<method name="getVideoObjectByPublicSID" args="publicSID">
-
if ($debug) Debug.error(" :: getVideoObjectByPublicSID :: ",publicSID);
-
</method>
<view name="userStatus" layout="axis:y">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx Wed Apr 11 15:20:48 2012
@@ -21,10 +21,10 @@
<library>
<!--
- Source: http://www.iconfinder.com/icondetails/36026/32/error_hazard_warning_icon
+ FamFam Icon Set
Creative Commons 3.0
-->
- <resource name="warning_icon_rsc" src="resources/warning.png" />
+ <resource name="warning_icon_rsc" src="resources/error.png" />
<include href="confirmationSingleSWF10.lzx" />
<include href="errorPopupSWF10.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/error.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/error.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx Wed Apr 11 15:20:48 2012
@@ -98,7 +98,6 @@
}
if (this.custom) {
- this._toolbar._showusercontext.setAttribute("visibility","hidden");
this._toolbar._minimize.setAttribute("visibility","hidden");
this._resizeview.setAttribute("visibility","hidden");
this._toolbar.setAttribute("visibility","hidden");
@@ -435,16 +434,6 @@
</view>
</view>
- <!--
- <view name="showuser" x="${ parent.width-20 }" y="2" width="20"
- onmouseover="" onmouseup="" resource="showusercontext">
- <handler name="onclick">
- new lz.remoteUserDetails(parent);
- </handler>
- <labelTooltip inittwice="true" labelid="68" />
- </view>
- -->
-
<view name="_resizeview" x="${ this.parent.width - 16 }" valign="bottom"
resource="explorer_resize_rsc" cursor="explorer_resizemouse_rsc"
onmousedown="this.parent.doResize(true)"
@@ -510,16 +499,6 @@
<labelTooltip labelid="857" />
</miniIconsPresenter>
- <!--
- <miniIconsPresenter name="_showusercontext"
- iconRessourceName="showusercontext">
- <handler name="onclick">
- new lz.remoteUserDetails(parent.parent);
- </handler>
- <labelTooltip labelid="68" />
- </miniIconsPresenter>
- -->
-
</view>
<view name="_giveExclusiveAudioView" valign="middle" align="center" visible="false">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx Wed Apr 11 15:20:48 2012
@@ -20,25 +20,34 @@
-->
<library>
- <resource name="warning_icon_popup_devices_rsc" src="resources/messagebox_warning.png" />
+ <!-- FamFam Icon Creative Commons -->
+ <resource name="warning_icon_popup_devices_rsc" src="resources/error.png" />
- <resource name="chatbgitem" src="resources/bgitemvideochat.swf" />
+ <!-- REPLACE -->
+ <resource name="chatbgitem" src="resources/profile_pic.jpg" />
- <resource name="showusercontextclose" src="resources/error.png" />
- <resource name="showusercontext" src="resources/1downarrow.png" />
- <resource name="resyncuser_rsc" src="resources/noatunloopsong.png" />
-
- <resource name="mic_rsc" src="resources/mic.png" />
+ <!-- FamFam Icon Creative Commons -->
+ <resource name="resyncuser_rsc" src="resources/arrow_refresh.png" />
+
+ <!-- APL author sebawagner -->
+ <resource name="mic_rsc" src="resources/micro.png" />
+
+ <!-- APL author sebawagner -->
<resource name="speaking" src="resources/speaking.png" />
+
+ <!-- FamFam Icon Creative Commons -->
<resource name="mute_btn_rsc">
- <frame src="resources/icon_mute.png" />
- <frame src="resources/icon_mute_red.png" />
+ <frame src="resources/sound.png" />
+ <frame src="resources/sound_mute.png" />
</resource>
+
+ <!-- APL author sebawagner -->
<resource name="mute_micro_btn_rsc">
- <frame src="resources/micro_on.png" />
- <frame src="resources/micro_off.png" />
+ <frame src="resources/mute_micro.png" />
+ <frame src="resources/mute_micro_red.png" />
</resource>
+ <!-- APL author sebawagner -->
<resource name="lz_recorder_play" src="resources/webstart_play.png" />
<include href="changeDevice.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/error.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/error.png?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/micro.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.fla?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mute_micro_red.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound_mute.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound_mute.png?rev=1324812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/sound_mute.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx Wed Apr 11 15:20:48 2012
@@ -63,10 +63,6 @@
<view name="r" resource="chatbgitem" x="1" y="2" stretches="both"
width="$once{parent.width}" height="$once{parent.height}" />
- <handler name="oninit">
- this.r.setAttribute('frame',5);
- </handler>
-
<baseVideoStreamDevice name="_videostream" mode="broadcast">
<handler name="onlevel">
<![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectPlayBroadcast.lzx?rev=1324812&r1=1324811&r2=1324812&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectPlayBroadcast.lzx Wed Apr 11 15:20:48 2012
@@ -73,8 +73,6 @@
</handler>
<view name="r"></view>
- <!--<view name="r" resource="chatbgitem" width="${parent.width}"-->
- <!--height="${parent.height}" stretches="both" />-->
<baseVideoStream name="_videostream" bgcolor="black"
width="${parent.width}" height="${parent.height}" />
Added: incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml?rev=1324812&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml (added)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml Wed Apr 11 15:20:48 2012
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!-- persistence.xml schema -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
+ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.States</class>
+ <class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+ <class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
+ <class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
+ <class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
+ <class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
+ <class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
+ <class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
+ <class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
+ <class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
+ <class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
+ <class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
+ <class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
+ <class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
+ <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
+ <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
+ <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+ <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+ <class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
+ <class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
+ <class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
+ <class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
+ <class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
+ <class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
+ <class>org.openmeetings.app.persistence.beans.poll.PollType</class>
+ <class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
+ <class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
+ <class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
+ <class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
+ <class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
+ <class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
+ <class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
+ <class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
+ <class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
+ <class>org.openmeetings.app.persistence.beans.user.Salutations</class>
+ <class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
+ <class>org.openmeetings.app.persistence.beans.user.Userdata</class>
+ <class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
+ <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
+ <class>org.openmeetings.app.persistence.beans.user.Users</class>
+ <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
+ <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
+ <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
+ <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <property name="openjpa.ConnectionProperties"
+ value="DriverClassName=org.apache.derby.jdbc.ClientDriver,
+ Url=jdbc:derby:openmeetings;create=true,
+ create=true,
+ MaxActive=100,
+ MaxWait=10000,
+ TestOnBorrow=true,
+ Username=user,
+ Password=secret" />
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
+ <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
+ <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
+ <property name="openjpa.DataCache" value="true" />
+ <property name="openjpa.QueryCache" value="true" />
+ <property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
+ <property name="openjpa.jdbc.QuerySQLCache" value="false" />
+ </properties>
+ </persistence-unit>
+</persistence>