Author: sebawagner
Date: Thu Mar 1 15:13:48 2012
New Revision: 1295611
URL: http://svn.apache.org/viewvc?rev=1295611&view=rev
Log:
OPENMEETINGS-75 Remove roomtype audience
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
- copied unchanged from r1295594,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
Thu Mar 1 15:13:48 2012
@@ -307,22 +307,6 @@ of the red5-servlet
<conferenceRoomModule>flexibleConferenceRoom</conferenceRoomModule>
-
-<!-- #############################################
- Event Room Modules
- -->
-
-<eventModuleRoomList>allEvents</eventModuleRoomList>
-
-
-<!-- #############################################
- Event Room
-
- Room Layouts: flexibleEventRoom,audienceView
- -->
-
-<eventRoomModule>flexibleEventRoom</eventRoomModule>
-
<!-- #############################################
Event Room
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
Thu Mar 1 15:13:48 2012
@@ -47,8 +47,6 @@
<xs:element ref="dashboardModuleCalendar"/>
<xs:element ref="conferenceModuleRoomList"/>
<xs:element ref="conferenceRoomModule"/>
- <xs:element ref="eventModuleRoomList"/>
- <xs:element ref="eventRoomModule"/>
<xs:element ref="restrictedRoomModule"/>
<xs:element ref="interviewRoomModule"/>
<xs:element ref="recordModule"/>
@@ -116,8 +114,6 @@
<xs:element name="dashboardModuleCalendar" type="xs:NCName"/>
<xs:element name="conferenceModuleRoomList" type="xs:NCName"/>
<xs:element name="conferenceRoomModule" type="xs:NCName"/>
- <xs:element name="eventModuleRoomList" type="xs:NCName"/>
- <xs:element name="eventRoomModule" type="xs:NCName"/>
<xs:element name="restrictedRoomModule" type="xs:NCName"/>
<xs:element name="interviewRoomModule" type="xs:NCName"/>
<xs:element name="recordModule" type="xs:NCName"/>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Thu Mar 1 15:13:48 2012
@@ -160,9 +160,6 @@
this.setAttribute('conferenceModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceModuleRoomList/text()'));
this.setAttribute('conferenceRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceRoomModule/text()'));
-
this.setAttribute('eventModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/eventModuleRoomList/text()'));
-
this.setAttribute('eventRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/eventRoomModule/text()'));
-
this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()'));
this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()'));
@@ -530,27 +527,23 @@
if (roomTypeId==1){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:roomObj});
- //new
lz[canvas.conferenceRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
} else if (roomTypeId==2){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.eventRoomModule,roomObj:roomObj});
- //new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
+ new lz.labelerrorPopup(canvas,{error:'No RoomType currently
available for roomTypeId 2'});
} else if (roomTypeId==3){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
- //new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
} else if (roomTypeId==4){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:roomObj});
- //new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
} else if (roomTypeId==5){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.customRoomModule,roomObj:roomObj});
- //new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
Thu Mar 1 15:13:48 2012
@@ -77,20 +77,7 @@ these properties can be overwritten by c
<!-- #############################################
- Event Room Modules
- -->
-
-<attribute name="eventModuleRoomList" value="allEvents" type="string" />
-
-
-<!-- #############################################
- Event Room
- -->
-
-<attribute name="eventRoomModule" value="audienceView" type="string" />
-
-<!-- #############################################
- Event Room
+ Restricted Room
Room Layouts: flexibleRestrictedConferenceRoom,restrictedConferenceRoom
-->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
Thu Mar 1 15:13:48 2012
@@ -145,7 +145,8 @@
if (this.roomType == 1) {
this.roomClassName =
canvas.conferenceRoomModule;
} else if (this.roomType == 2) {
- this.roomClassName = canvas.eventRoomModule;
+ new lz.labelerrorPopup(canvas,{error:'No
RoomType currently available for roomTypeId 2'});
+ this.roomClassName =
canvas.restrictedRoomModule;
} else if (this.roomType == 3) {
this.roomClassName = canvas.restrictedRoomModule;
} else if (this.roomType == 4) {
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=1295611&r1=1295610&r2=1295611&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
Thu Mar 1 15:13:48 2012
@@ -29,6 +29,7 @@
<frame src="resources/sidebar_open.png" />
</resource>
+ <include href="moderationMiniIconsEventUserList.lzx" />
<include href="activitylist/" />
<include href="roomSidebar/" />
<include href="appointmentNotificationPopUp.lzx" />
@@ -36,7 +37,6 @@
<include href="baseConferenceRoom.lzx" />
<include href="fixedWhiteboardPanel.lzx" />
<include href="flexibleConferenceRoom.lzx" />
- <include href="flexibleEventRoom.lzx" />
<include href="restrictedConferenceRoom.lzx" />
<include href="interviewConferenceRoom.lzx" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx?rev=1295611&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
Thu Mar 1 15:13:48 2012
@@ -0,0 +1,180 @@
+<?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.
+
+-->
+<library>
+
+<class name="eventRoomSidebar" extends="view" width="280"
+ height="${ canvas.height - 28 }" y="0" clip="true">
+
+ <attribute name="selected" value="null" />
+
+ <attribute name="isOpen" value="true" type="boolean"/>
+
+ <attribute name="restricted" value="false" type="boolean" />
+
+ <attribute name="listType" value="eventUserListTable" type="string" />
+
+ <method name="doSelection" args="itemRef">
+ <![CDATA[
+ if (itemRef.name == "filesTabButton") {
+ if (this.restricted) {
+ if (!canvas.ismoderator && !canvas.isAllowedToDraw) {
+ //Do not allow
+ new
lz.labelerrorPopup(canvas,{errorlabelid:783});
+ return;
+ }
+ }
+ }
+
+ if (this.selected != null) {
+ this.selected.deselect();
+ }
+
+ this.selected = itemRef;
+ this.selected.select();
+
+ if ($debug) Debug.write("this.selected.name ",this.selected.name);
+
+ if (this.selected.name == "userTabButton") {
+ if ($debug) Debug.write("-- userTabButton");
+ this._files.setAttribute("visibility","hidden");
+
this._videocontainer._participants.setAttribute("visibility","visible");
+ } else if (this.selected.name == "filesTabButton") {
+ if ($debug) Debug.write("-- filesTabButton");
+ this._files.setAttribute("visibility","visible");
+
this._videocontainer._participants.setAttribute("visibility","hidden");
+ }
+ ]]>
+ </method>
+
+ <method name="toggleStatus">
+ if (this.isOpen) {
+ this._doClose.doStart();
+ this.isOpen = false;
+ this._minimizeSidebar._icon.setAttribute("frame",2);
+ } else {
+ this._doOpen.doStart();
+ this.isOpen = true;
+ this._minimizeSidebar._icon.setAttribute("frame",1);
+ }
+ </method>
+
+ <view name="_head" width="$once{ parent.width-2 }" height="34">
+ <view width="${ parent.width }" height="$once{ parent.height }"
+ stretches="both" resource="presenter_thumb_rsc" >
+ <handler name="oninit">
+ <![CDATA[
+ this.setTintRGB(canvas.basebgcolorizer,90);
+ ]]>
+ </handler>
+ <method name="setTintRGB" args="color, brightness">
+ <![CDATA[
+ if (color != "" && color != null){
+
+ if (brightness == null) { brightness = 0; }
+ var rgb = color;
+ var red=(rgb >> 16) & 0xFF;
+ var green=(rgb >> 8) & 0xFF;
+ var blue=rgb & 0xFF;
+
+ this.setColorTransform( { ra : red, ga : green, ba :
blue,
+ rb : 0, gb : 0, bb : 0 } );
+
+ }
+ ]]>
+ </method>
+ </view>
+
+ <conferenceRoomSidebarTabButton name="userTabButton" selected="true"
+ currentIconRsc="users_tab_btn" x="0" labelid="613" />
+
+ <conferenceRoomSidebarTabButton name="filesTabButton"
+ visible="${ (!parent.parent.restricted) ? true :
((canvas.currentRoomObj.hideFilesExplorer) ? false : ((canvas.ismoderator) ?
true : ((canvas.isAllowedToDraw) ? true : false ))) }"
+ currentIconRsc="files_tab_btn"
+ x="$once{ ((parent.width-2)/2)+2 }" labelid="614" />
+
+ </view>
+
+ <fileExplorer name="_files" y="16" width="$once{ parent.width-12 }"
+ height="${ parent.height-216 }" visibility="hidden" />
+
+ <eventUserList name="_videocontainer" y="36" listType="$once{
parent.listType }"
+ userNewVideoContainer="true" width="$once{
parent.width-10 }"
+ height="${
parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ?
36:236) }" />
+
+ <view y="${ parent.height - 201 }" width="$once{ parent.width-10 }"
height="2"
+ name="_border" bgcolor="$once{ canvas.basebgcolorizer }"
+ visibility="${((canvas.currentRoomObj.hideActivitiesAndActions ==
true) ? 'hidden':'visible')}" />
+
+ <activityList name="_activityList" />
+
+ <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10"
+ bgcolor="$once{ canvas.baseMousecolorizer }" height="${
parent.height }">
+ <handler name="onclick">
+ parent.toggleStatus();
+ </handler>
+ <handler name="onmouseover">
+ this._bg1.setAttribute("visibility","visible");
+ </handler>
+ <handler name="onmouseout">
+ this._bg1.setAttribute("visibility","hidden");
+ </handler>
+
+ <view width="${ parent.width }" height="$once{ parent.height*1.4 }"
+ stretches="both" resource="presenter_thumb_rsc" >
+ <handler name="oninit">
+ <![CDATA[
+ this.setTintRGB(canvas.basebgcolorizer,90);
+ ]]>
+ </handler>
+ <method name="setTintRGB" args="color, brightness">
+ <![CDATA[
+ if (color != "" && color != null){
+
+ if (brightness == null) { brightness = 0; }
+ var rgb = color;
+ var red=(rgb >> 16) & 0xFF;
+ var green=(rgb >> 8) & 0xFF;
+ var blue=rgb & 0xFF;
+
+ this.setColorTransform( { ra : red, ga : green, ba :
blue,
+ rb : 0, gb : 0, bb : 0 } );
+
+ }
+ ]]>
+ </method>
+ </view>
+
+ <view name="_bg1" bgcolor="0xFFFFFF" width="$once{ parent.width }"
+ height="$once{ parent.height }" opacity="0.7"
visibility="hidden"/>
+
+ <view name="_icon" resource="sidebar_tab_btn"
+ valign="middle" align="center" />
+ </view>
+
+ <animator name="_doOpen" attribute="width" to="$once{ parent.width }"
+ duration="750" start="false" />
+
+ <animator name="_doClose" attribute="width" to="10"
+ duration="750" start="false" />
+
+</class>
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
Thu Mar 1 15:13:48 2012
@@ -20,7 +20,6 @@
-->
<library>
- <include href="eventRoomSidebar.lzx" />
<include href="conferenceRoomSidebar.lzx" />
<include href="interviewRoomSidebar.lzx" />
<include href="restrictedRoomSidebar.lzx" />
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=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
Thu Mar 1 15:13:48 2012
@@ -49,20 +49,20 @@
<include href="whiteboard/" />
<include href="tabbar/" />
- <include href="tabcontent/" />
- <include href="popups/" />
- <include href="moderation/" />
- <!--
- <include href="video/" />
- -->
- <include href="polls/" />
- <include href="conference/" />
- <!-- throws an Exception
+ <include href="tabcontent/" />
+ <include href="popups/" />
+ <include href="moderation/" />
+ <include href="polls/" />
+ <include href="conference/" />
+ <!-- throws an Exception
<include href="browser/"/>
- -->
+ -->
<include href="participants/" />
<include href="interviewuserlist/" />
+
+ <!--
<include href="eventuserlist/" />
+ -->
<include href="restricted/" />
<include href="browser/" />
<include href="testsetup/" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Thu Mar 1 15:13:48 2012
@@ -132,7 +132,8 @@
} else if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==2){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.eventRoomModule,roomObj:canvas.thishib.currentInvitation.room});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:canvas.thishib.currentInvitation.room});
+ new lz.labelerrorPopup(canvas,{error:'No
RoomType currently available for roomTypeId 2'});
} else if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==3){
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Thu
Mar 1 15:13:48 2012
@@ -83,7 +83,7 @@
}
}
- var tSWFURL =
"maindebug.swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
+ var tSWFURL =
"main.swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
if ($debug) Debug.write("tSWFURL :: ",tSWFURL);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Thu Mar 1 15:13:48 2012
@@ -85,12 +85,12 @@ public class Roommanagement {
* @param name
* @return ID of new created roomtype or null
*/
- public Long addRoomType(String name) {
+ public Long addRoomType(String name, boolean deleted) {
try {
RoomTypes rtype = new RoomTypes();
rtype.setName(name);
rtype.setStarttime(new Date());
- rtype.setDeleted("false");
+ rtype.setDeleted(deleted ? "true" : "false");
rtype = em.merge(rtype);
long returnId = rtype.getRoomtypes_id();
return returnId;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java?rev=1295611&r1=1295610&r2=1295611&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Thu Mar 1 15:13:48 2012
@@ -542,23 +542,20 @@ public class ImportInitvalues {
public void loadDefaultRooms(boolean createRooms) {
long conference_Id = roommanagement
- .addRoomType("conference (1-25 users)");
+ .addRoomType("conference (1-25 users)", false);
log.debug("conference_Id: " + conference_Id);
- long audience_Id = roommanagement.addRoomType("audience (1-50
users)");
- log.debug("audience_Id: " + audience_Id);
+
+ //Audience room type is not in use anymore
+ roommanagement.addRoomType("audience (1-50 users)", true);
long restricted_Id = roommanagement
- .addRoomType("restricted (1-150 users)");
+ .addRoomType("restricted (1-150 users)",
false);
log.debug("restricted_Id: " + restricted_Id);
long interview_Id = roommanagement
- .addRoomType("interview (1:1 meeting with
recording)");
+ .addRoomType("interview (1:1 meeting with
recording)", false);
log.debug("interview_Id: " + interview_Id);
- long custom_Id = roommanagement
- .addRoomType("custom (extension point for your
plugin)");
- log.debug("custom_Id: " + custom_Id);
-
if (createRooms) {
roommanagement.addRoom(3, "public Interview Room",
interview_Id,
"", new Long(16), true, null, false,
false, null, false,
@@ -665,33 +662,7 @@ public class ImportInitvalues {
);
roommanagement.addRoomToOrganisation(3, room2, 1);
-
- roommanagement.addRoom(3, "public Audience Room",
audience_Id, "",
- new Long(32), true, null, false, false,
null, false, null,
- true, false, false, "", "", "", null,
null, null, false, // hideTopBar
- false, // hideChat
- false, // hideActivitiesAndActions
- false, // hideFilesExplorer
- false, // hideActionsMenu
- false, // hideScreenSharing
- false, // hideWhiteboard
- false // showMicrophoneStatus
- );
-
- long room4 = roommanagement.addRoom(3, "private
Audience Room",
- audience_Id, "", new Long(32), false,
null, false, false,
- null, false, null, true, false, false,
"", "", "", null,
- null, null, false, // hideTopBar
- false, // hideChat
- false, // hideActivitiesAndActions
- false, // hideFilesExplorer
- false, // hideActionsMenu
- false, // hideScreenSharing
- false, // hideWhiteboard
- false // showMicrophoneStatus
- );
-
- roommanagement.addRoomToOrganisation(3, room4, 1);
+
}
}
