Author: sebawagner
Date: Tue Nov 27 07:20:24 2012
New Revision: 1414004
URL: http://svn.apache.org/viewvc?rev=1414004&view=rev
Log:
OPENMEETINGS-460 remove server from user and room entity. Fix loading mark with
"//FIXME: Modify canvas.rtmphostlocal to point to cluster"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/quartz/scheduler/ClusterSlaveJob.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Tue Nov 27 07:20:24 2012
@@ -118,14 +118,6 @@
<value>3000</value>
</property>
</bean>
- <bean
class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
- <property name="triggers">
- <list>
- <ref local="triggerClusterSlaveJob" />
- </list>
- </property>
- </bean>
-
<bean id="openmeetings.SessionClearJob"
class="org.apache.openmeetings.quartz.scheduler.SessionClearJob" />
<bean id="sessionClearJob"
@@ -200,12 +192,14 @@
<value>1800000</value> <!-- 30 minutes -->
</property>
</bean>
+
<bean
class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
<property name="triggers">
<list>
<ref local="triggerSessionClear" />
<ref local="triggerMeetingReminder" />
<ref local="triggerTestSetupCleanup" />
+ <ref local="triggerClusterSlaveJob" />
</list>
</property>
</bean>
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=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Tue Nov 27 07:20:24 2012
@@ -568,6 +568,9 @@
</netRemoteCallHib>
<method name="setRoomValues" args="roomTypeId,roomId,roomObj">
+
+ //FIXME: Modify canvas.rtmphostlocal to point to cluster
+
if ($debug) Debug.warn("setRoomValues ",roomTypeId,roomId,roomObj);
if (roomTypeId==1){
canvas.isConference = true;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
Tue Nov 27 07:20:24 2012
@@ -70,7 +70,6 @@
this.chatModerated.setValue(false);
this.chatOpened.setValue(false);
this.filesOpened.setValue(false);
- this.server.selectItem(this.server.firstItem);
</handler>
<handler name="ondelete" >
@@ -232,12 +231,6 @@
this.chatModerated.setValue(obj.chatModerated != null
&& obj.chatModerated);
this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
-
- if (this.server.firstItem == 0 && obj.server != null) {
- this.server.idToSelect = obj.server.id;
- } else {
- this.server.selectItem(obj.server != null ?
obj.server.id : this.server.firstItem);
- }
]]>
</method>
@@ -337,7 +330,6 @@
this.sendObject["showMicrophoneStatus"] =
parent.showMicrophoneStatus.getValue();
this.sendObject["chatModerated"] =
parent.chatModerated.getValue();
- this.sendObject["serverId"] = parent.server.getValue();
this.sendObject["chatOpened"] =
parent.chatOpened.getValue();
this.sendObject["filesOpened"] =
parent.filesOpened.getValue();
@@ -386,6 +378,7 @@
this.addItem(14,14);
this.addItem(16,16);
this.addItem(25,25);
+ this.addItem(32,32);
this.addItem(50,50);
this.addItem(100,100);
this.addItem(150,150);
@@ -758,9 +751,6 @@
<labelText labelid="1308" x="400" y="722" width="270" />
<customEdittext name="ownerId" x="520" y="722" width="180" />
- <labelText labelid="1502" x="400" y="752" width="270" />
- <serverCombobox name="server" width="180" y="752" x="520"
editable="false" fontsize="11"/>
-
<view x="400" y="1400" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
Tue Nov 27 07:20:24 2012
@@ -82,7 +82,6 @@
this.userSearchs.setAttribute('text',"");
this.showContactData.selectItem("3");
this.languages.selectItem(String('1'));
- this.server.selectItem(this.server.firstItem);
]]>
</handler>
@@ -204,11 +203,6 @@
}
- if (this.server.firstItem == 0 && obj.server != null) {
- this.server.idToSelect = obj.server.id;
- } else {
- this.server.selectItem(obj.server != null ?
obj.server.id : this.server.firstItem);
- }
]]>
</method>
@@ -281,7 +275,6 @@
this.sendObject["userOffers"] =
parent.userOffers.getText();
this.sendObject["userSearchs"] =
parent.userSearchs.getText();
- this.sendObject["serverId"] = parent.server.getValue();
var showContactData =
Number(parent.showContactData.getValue());
@@ -460,9 +453,6 @@
<labelTooltip labelid="176" />
</blueButton>
- <labelText labelid="1502" x="2" y="740" />
- <serverCombobox name="server" width="270" y="740" x="120"
editable="false" fontsize="11"/>
-
<!-- SIP Account Data -->
<labelText labelid="893" width="200" y="770" resize="false"
x="0" fontstyle="bold" />
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=1414004&r1=1414003&r2=1414004&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
Tue Nov 27 07:20:24 2012
@@ -122,9 +122,9 @@
<method name="initRoom">
if ($debug) Debug.write("roomListItem::initRoom ",
this);
- if (this.obj.server != null) {
- canvas.rtmphostlocal = this.obj.server.address;
- }
+
+ //FIXME: Modify canvas.rtmphostlocal to point to cluster
+
canvas.isConference = !this.isaudience;
if (this.isaudience)
connectedIsAudience = '_' + 'audi';
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=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Tue Nov 27 07:20:24 2012
@@ -130,6 +130,9 @@
if ($debug) Debug.write("setUsername: value,
",canvas.thishib.currentInvitation.room.roomtype.roomtypes_id);
clearStageContent();
parent.close();
+
+ //FIXME: Modify canvas.rtmphostlocal to point to cluster
+
if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==1){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:canvas.thishib.currentInvitation.room});
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
Tue Nov 27 07:20:24 2012
@@ -103,9 +103,9 @@
}
var roomObj = canvas.thishib.currentInvitation.room;
hib.currentroomid = roomObj.rooms_id;
- if (roomObj.server != null) {
- canvas.rtmphostlocal = roomObj.server.address;
- }
+
+ //FIXME: Modify canvas.rtmphostlocal to point to cluster
+
</method>
<method name="login">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
Tue Nov 27 07:20:24 2012
@@ -704,8 +704,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- u.getServer());
+ false // filesOpened
+ );
}
} catch (Exception err) {
log.error("[addRoom] ", err);
@@ -765,8 +765,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- u.getServer());
+ false // filesOpened
+ );
}
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
@@ -833,8 +833,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- u.getServer());
+ false // filesOpened
+ );
}
} catch (Exception err) {
log.error("[addRoomWithModerationAndQuestions] ", err);
@@ -903,8 +903,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- u.getServer());
+ false // filesOpened
+ );
}
return -1L;
} catch (Exception err) {
@@ -989,8 +989,8 @@ public class RoomWebService {
hideActionsMenu,
hideScreenSharing, hideWhiteboard,
false, false,
false, // chatOpened
- false, // filesOpened
- u.getServer());
+ false // filesOpened
+ );
}
return -1L;
} catch (Exception err) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
Tue Nov 27 07:20:24 2012
@@ -227,15 +227,8 @@ public class UserWebService {
Long user_id =
userManagement.registerUser(username, userpass,
lastname, firstname, email, new
Date(), street,
additionalname, fax, zip,
states_id, town, language_id,
- "", false, baseURL, true, //
generate
-
// SIP
-
// Data
-
// if
-
// the
-
// config
-
// is
-
// enabled
- jName_timeZone, null); //FIXME
+ "", false, baseURL, true, //
generate SIP Data if the config is enabled
+ jName_timeZone);
if (user_id == null || user_id < 0) {
return user_id;
@@ -321,7 +314,7 @@ public class UserWebService {
// config
// is
// enabled
- jNameTimeZone, null); //FIXME
+ jNameTimeZone);
if (user_id < 0) {
return user_id;
@@ -412,9 +405,8 @@ public class UserWebService {
Long user_id =
userManagement.registerUserNoEmail(username,
userpass, lastname, firstname,
email, new Date(),
street, additionalname, fax,
zip, states_id, town,
- language_id, "", false, true,
// generate SIP Data if
-
// the config is enabled
- jNameTimeZone, null); //FIXME
+ language_id, "", false, true,
// generate SIP Data if the config is enabled
+ jNameTimeZone);
if (user_id < 0) {
return user_id;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
Tue Nov 27 07:20:24 2012
@@ -158,36 +158,6 @@ public class ServerDao implements IDataP
}
/**
- * This method is necessary to automatically assign user to the server
with
- * minimum load.
- *
- * First of all we are trying to find servers referenced by 0 users. If
all
- * servers are referenced by at least 1 user we are searching the first
- * server referenced by minimum users.
- *
- * @return Server object referenced by the minimum user accounts.
- */
- public Server getServerWithMinimumUsers() {
- Server result = null;
- log.debug("getServerWithMinimumUsers enter");
- TypedQuery<Server> q =
em.createNamedQuery("getServersWithNoUsers",
- Server.class);
- List<Server> l = q.getResultList();
- if (l.isEmpty()) {
- TypedQuery<Object> q1 = em.createNamedQuery(
- "getServerWithMinimumUsers",
Object.class);
- List<Object> r = q1.getResultList();
- if (!r.isEmpty()) {
- // get server id from first line
- result = get((Long) ((Object[]) r.get(0))[0]);
- }
- } else {
- result = l.get(0);
- }
- return result;
- }
-
- /**
* @deprecated user standard mechanism of
* {@link
IDataProviderDao#update(org.apache.openmeetings.persistence.beans.OmEntity,
long)}
* @param id
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
Tue Nov 27 07:20:24 2012
@@ -191,8 +191,7 @@ public class AppointmentLogic {
false, //showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- user.getServer()
+ false // filesOpened
);
log.debug("Appointmentlogic.saveAppointment : Room - "
+ room_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
Tue Nov 27 07:20:24 2012
@@ -39,7 +39,6 @@ import org.apache.openmeetings.data.bean
import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
import org.apache.openmeetings.data.user.Organisationmanagement;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
@@ -677,7 +676,7 @@ public class Roommanagement {
Boolean hideTopBar, Boolean hideChat, Boolean
hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing,
Boolean hideWhiteboard,
Boolean showMicrophoneStatus, Boolean chatModerated,
boolean chatOpened
- , boolean filesOpened, Server server) {
+ , boolean filesOpened) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
@@ -722,7 +721,6 @@ public class Roommanagement {
r.setChatModerated(chatModerated);
r.setChatOpened(chatOpened);
r.setFilesOpened(filesOpened);
- r.setServer(server);
// handle SIP Issues
OpenXGReturnObject openXGReturnObject =
openXGHttpClient
@@ -1669,8 +1667,7 @@ public class Roommanagement {
false, //showMicrophoneStatus
false, // chatModerated
false, //chatOpened
- false, //filesOpened
- null //server
+ false //filesOpened
);
if (rooms_id != null) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
Tue Nov 27 07:20:24 2012
@@ -52,7 +52,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.UserSipData;
@@ -792,7 +791,7 @@ public class Usermanagement {
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, long
states_id,
String town, long language_id, String phone, boolean
sendSMS, String baseURL,
- boolean generateSipUserData, String jNameTimeZone,
Server server) {
+ boolean generateSipUserData, String jNameTimeZone) {
boolean sendConfirmation = baseURL != null
&& !baseURL.isEmpty()
@@ -801,25 +800,25 @@ public class Usermanagement {
return registerUser(login, Userpass, lastname, firstname,
email, age,
street, additionalname, fax, zip, states_id,
town, language_id,
- phone, sendSMS, baseURL, generateSipUserData,
jNameTimeZone, sendConfirmation, server);
+ phone, sendSMS, baseURL, generateSipUserData,
jNameTimeZone, sendConfirmation);
}
public Long registerUserNoEmail(String login, String Userpass,
String lastname, String firstname, String email, Date
age,
String street, String additionalname, String fax,
String zip,
long states_id, String town, long language_id, String
phone, boolean sendSMS,
- boolean generateSipUserData, String jNameTimeZone,
Server server) {
+ boolean generateSipUserData, String jNameTimeZone) {
return registerUser(login, Userpass, lastname, firstname,
email, age,
street, additionalname, fax, zip, states_id,
town, language_id,
- phone, sendSMS, "", generateSipUserData,
jNameTimeZone, false, server);
+ phone, sendSMS, "", generateSipUserData,
jNameTimeZone, false);
}
private Long registerUser(String login, String Userpass, String
lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, long
states_id,
String town, long language_id, String phone, boolean
sendSMS, String baseURL,
- boolean generateSipUserData, String jNameTimeZone,
Boolean sendConfirmation, Server server) {
+ boolean generateSipUserData, String jNameTimeZone,
Boolean sendConfirmation) {
try {
// Checks if FrontEndUsers can register
if ("1".equals(configurationDaoImpl.getConfValue(
@@ -834,7 +833,7 @@ public class Usermanagement {
"default_domain_id", Long.class, null)), phone,
sendSMS, baseURL,
sendConfirmation, "", "", "",
generateSipUserData,
- jNameTimeZone, false, "", "",
false, true, server);
+ jNameTimeZone, false, "", "",
false, true);
if (sendConfirmation) {
return new Long(-40);
@@ -883,7 +882,7 @@ public class Usermanagement {
String sip_auth, boolean generateSipUserData,
String jname_timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean
showContactData,
- Boolean showContactDataToContacts, Server server)
throws Exception {
+ Boolean showContactDataToContacts) throws Exception {
return registerUserInit(user_level, level_id, availible,
status, login, password, lastname,
firstname, email, age, street,
@@ -894,7 +893,7 @@ public class Usermanagement {
sip_auth, generateSipUserData,
omTimeZoneDaoImpl.getOmTimeZone(jname_timezone), forceTimeZoneCheck,
userOffers, userSearchs, showContactData,
- showContactDataToContacts, server);
+ showContactDataToContacts);
}
/**
@@ -946,7 +945,7 @@ public class Usermanagement {
String sip_auth, boolean generateSipUserData,
OmTimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean
showContactData,
- Boolean showContactDataToContacts, Server server)
throws Exception {
+ Boolean showContactDataToContacts) throws Exception {
// TODO: make phone number persistent
// User Level must be at least Admin
// Moderators will get a temp update of there UserLevel to add
Users to
@@ -1009,7 +1008,7 @@ public class Usermanagement {
adr, sendSMS, age,
hash, sip_user, sip_pass,
sip_auth,
generateSipUserData, timezone,
forceTimeZoneCheck,
userOffers, userSearchs,
- showContactData,
showContactDataToContacts, organisations, server);
+ showContactData,
showContactDataToContacts, organisations);
log.debug("Added user-Id " + user_id);
if (user_id == null) {
return new Long(-111);
@@ -1065,8 +1064,7 @@ public class Usermanagement {
String sip_user, String sip_pass, String sip_auth,
boolean generateSipUserData, OmTimeZone timezone,
Boolean forceTimeZoneCheck, String userOffers, String
userSearchs,
- Boolean showContactData, Boolean
showContactDataToContacts, List<Long> orgIds,
- Server server) {
+ Boolean showContactData, Boolean
showContactDataToContacts, List<Long> orgIds) {
try {
Users users = new Users();
@@ -1091,7 +1089,6 @@ public class Usermanagement {
users.setUserSearchs(userSearchs);
users.setShowContactData(showContactData);
users.setShowContactDataToContacts(showContactDataToContacts);
- users.setServer(server);
if (generateSipUserData) {
@@ -1240,7 +1237,6 @@ public class Usermanagement {
.createPassPhrase(userpass));
users.setRegdate(new Date());
users.setDeleted(false);
- users.setServer(serverDao.getServerWithMinimumUsers());
em.persist(users);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
Tue Nov 27 07:20:24 2012
@@ -615,8 +615,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoom(3, "public Conference Room",
conference_Id,
"", new Long(32), true, null, false,
false, null, false,
@@ -631,8 +631,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoom(3, "public Video Only Room",
conference_Id,
"", new Long(32), true, null, false,
false, null, false,
@@ -647,8 +647,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoom(3, "public Video And Whiteboard
Room",
conference_Id, "", new Long(32), true,
null, false, false,
@@ -663,8 +663,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoom(3, "public Restricted Room",
restricted_Id,
"", new Long(100), true, null, false,
false, null, false,
@@ -679,8 +679,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoom(3, "restricted room with micro
option set",
restricted_Id, "", new Long(100), true,
null, false, false,
@@ -695,8 +695,8 @@ public class ImportInitvalues {
true, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoom(3, "conference room with micro
option set",
conference_Id, "", new Long(32), true,
null, false, false,
@@ -711,8 +711,8 @@ public class ImportInitvalues {
true, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
long room2 = roommanagement.addRoom(3, "private
Conference Room",
conference_Id, "", new Long(32), false,
null, false, false,
@@ -727,8 +727,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- null);
+ false // filesOpened
+ );
roommanagement.addRoomToOrganisation(3, room2, 1);
@@ -757,7 +757,7 @@ public class ImportInitvalues {
Arrays.asList(organisation_id),
"phone", false, "", false,
"", "", "", false,
omTimeZoneDaoImpl.getOmTimeZoneByIcal(ical_timeZone),
- false, "", "", false, true, null);
+ false, "", "", false, true);
log.debug("Installation - User Added user-Id " +
user_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
Tue Nov 27 07:20:24 2012
@@ -705,8 +705,7 @@ public class LdapLoginManagement {
"", //userOffers
"", //userSearchs
false, //showContactData
- true, //showContactDataToContacts
- null //FIXME SERVER
+ true //showContactDataToContacts
);
} catch (Exception e) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
Tue Nov 27 07:20:24 2012
@@ -36,14 +36,12 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.basic.Server;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
@@ -162,12 +160,6 @@ public class Rooms implements Serializab
@Element(data = true, required = false)
private Boolean allowRecording; // Show or show not the recording
option in
// a
conference room
-
- @OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "server_id")
- @Element(required = false)
- private Server server;
-
/**
* Layout of Room
*/
@@ -493,14 +485,6 @@ public class Rooms implements Serializab
this.showMicrophoneStatus = showMicrophoneStatus;
}
- public Server getServer() {
- return server;
- }
-
- public void setServer(Server server) {
- this.server = server;
- }
-
public List<RoomModerators> getModerators() {
return moderators;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
Tue Nov 27 07:20:24 2012
@@ -36,7 +36,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -49,7 +48,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.simpleframework.xml.Element;
@@ -233,11 +231,6 @@ public class Users implements Serializab
@Element(data = true, required = false)
private Boolean showContactDataToContacts;
- @OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "server_id")
- @Element(required = false)
- private Server server;
-
public Long getUser_id() {
return user_id;
}
@@ -548,14 +541,6 @@ public class Users implements Serializab
this.showContactDataToContacts = showContactDataToContacts;
}
- public Server getServer() {
- return server;
- }
-
- public void setServer(Server server) {
- this.server = server;
- }
-
public String getPhoneForSMS() {
return getSendSMS() ? getAdresses().getPhone() : "";
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/quartz/scheduler/ClusterSlaveJob.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/quartz/scheduler/ClusterSlaveJob.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/quartz/scheduler/ClusterSlaveJob.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/quartz/scheduler/ClusterSlaveJob.java
Tue Nov 27 07:20:24 2012
@@ -84,9 +84,6 @@ public class ClusterSlaveJob implements
log.debug("ClusterSlaveJob.execute");
try {
- log.debug("ClusterSlaveJob. SERVERS :: "
- + serverDao.getSlavesForPing().size());
-
for (Server server : serverDao.getSlavesForPing()) {
RestClient rClient = getRestClient(server);
@@ -97,6 +94,8 @@ public class ClusterSlaveJob implements
+ " takes longer then
the ping interval!");
continue;
}
+
+ log.debug("ClusterSlaveJob. Ping server: " +
server);
rClient.ping();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Tue Nov 27 07:20:24 2012
@@ -33,7 +33,6 @@ import org.apache.openmeetings.conferenc
import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomDAO;
@@ -82,8 +81,6 @@ public class ConferenceService {
private TimezoneUtil timezoneUtil;
@Autowired
private IClientList clientListManager = null;
- @Autowired
- private ServerDao serverDao;
/**
* ( get a List of all availible Rooms of this organisation
@@ -498,49 +495,6 @@ public class ConferenceService {
/**
*
* @param SID
- * @param name
- * @param roomtypes_id
- * @deprecated
- * @return
- */
- // public Long addRoomPublic(String SID, String name, long
roomtypes_id){
- // Long users_id = Sessionmanagement.getInstance().checkSession(SID);
- // Long User_level = userManagement.getUserLevelByID(users_id);
- // return roommanagement.addRoom(User_level, name,
- // roomtypes_id,"", new Long(4), true,null,
- // 290, 280, 2, 2,
- // 400,
- // true, 296, 2, 592, 660,
- // true, 2, 284, 310, 290, false, false, null);
- // }
-
- /**
- *
- * @param SID
- * @param organisation_id
- * @param name
- * @param roomtypes_id
- * @param ispublic
- * @deprecated
- * @return
- */
- // public Long addRoomOrganisation(String SID, long organisation_id,
String
- // name, long roomtypes_id, boolean ispublic){
- // Long users_id = Sessionmanagement.getInstance().checkSession(SID);
- // long User_level = userManagement.getUserLevelByID(users_id);
- // Long rooms_id = roommanagement.addRoom(User_level, name,
- // roomtypes_id,"", new Long(4), ispublic, null,
- // 290, 280, 2, 2,
- // 400,
- // true, 296, 2, 592, 660,
- // true, 2, 284, 310, 290, false, false, null);
- // return roommanagement.addRoomToOrganisation(User_level,
- // rooms_id, organisation_id);
- // }
-
- /**
- *
- * @param SID
* @param argObject
* @return
*/
@@ -616,8 +570,7 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString()),
Boolean.valueOf(argObjectMap.get("chatModerated").toString()),
Boolean.valueOf(argObjectMap.get("chatOpened").toString()),
-
Boolean.valueOf(argObjectMap.get("filesOpened").toString()),
- null
+
Boolean.valueOf(argObjectMap.get("filesOpened").toString())
);
} else if (rooms_id > 0) {
roomId = roommanagement.updateRoom(
@@ -672,21 +625,7 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("filesOpened").toString())
);
}
- long serverId = -1;
- try {
- serverId =
Long.parseLong(argObjectMap.get("serverId").toString());
- } catch (NumberFormatException nfe) {
- //noop expected;
- }
- if (roomId > -1 && serverId > -1) {
- try {
- Rooms room = roomDao.get(roomId);
- room.setServer(serverDao.get(serverId));
- roomDao.update(room, users_id);
- } catch (Exception e) {
- log.error("Error while setting
server.");
- }
- }
+
return roomId;
} catch (Exception e) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
Tue Nov 27 07:20:24 2012
@@ -821,7 +821,7 @@ public class MainService implements IPen
.longValue(),
regObject.get("town").toString(),
Long.valueOf(regObject.get("language_id").toString())
.longValue(), "",
false, baseURL, true,
-
regObject.get("jNameTimeZone").toString(), null);
+
regObject.get("jNameTimeZone").toString());
} catch (Exception ex) {
log.error("registerUserByObject", ex);
}
@@ -859,7 +859,7 @@ public class MainService implements IPen
long states_id, String town, long language_id, String
phone) {
return userManagement.registerUser(Username, Userpass, lastname,
firstname, email, age, street, additionalname,
fax, zip,
- states_id, town, language_id, phone, false, "",
true, "", null);
+ states_id, town, language_id, phone, false, "",
true, "");
}
/**
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Tue Nov 27 07:20:24 2012
@@ -432,7 +432,7 @@ public class UserService {
.booleanValue(),
Boolean.valueOf(
argObjectMap.get("showContactDataToContacts")
-
.toString()).booleanValue(), null);
+
.toString()).booleanValue());
} else {
userId = userManagement.updateUser(
user_level,
@@ -487,23 +487,9 @@ public class UserService {
argObjectMap.get("showContactDataToContacts")
.toString()).booleanValue());
}
- long serverId = -1;
- try {
- serverId =
Long.parseLong(argObjectMap.get("serverId")
- .toString());
- } catch (NumberFormatException nfe) {
- // noop expected;
- }
- if (userId > -1 && serverId > -1) {
- try {
- Users user =
userManagement.getUserById(userId);
- user.setServer(serverDao.get(serverId));
- userManagement.updateUser(user);
- } catch (Exception e) {
- log.error("Error while setting
server.");
- }
- }
+
return userId;
+
} catch (Exception ex) {
log.error("[saveOrUpdateUser]: ", ex);
}
@@ -1051,8 +1037,8 @@ public class UserService {
false, //
showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false, // filesOpened
- from.getServer());
+ false // filesOpened
+ );
room = roomDao.get(room_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Tue Nov 27 07:20:24 2012
@@ -83,7 +83,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import
org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
@@ -297,13 +296,6 @@ public class BackupImportController exte
u.setUser_id(null);
Long actualNewUserId =
userManagement.addUserBackup(u);
usersMap.put(userId, actualNewUserId);
- Server us = u.getServer();
- if (us != null) {
- Server s =
serverDaoImpl.getServerByAddress(us.getAddress());
- s.setName(us.getName());
- s.setAddress(us.getAddress());
- serverDaoImpl.update(s, 1L);
- }
}
}
@@ -336,13 +328,6 @@ public class BackupImportController exte
for (RoomModerators rm : r.getModerators()) {
roomModeratorsDao.addRoomModeratorByObj(rm);
}
- Server us = r.getServer();
- if (us != null) {
- Server s =
serverDaoImpl.getServerByAddress(us.getAddress());
- s.setName(us.getName());
- s.setAddress(us.getAddress());
- serverDaoImpl.update(s, 1L);
- }
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
Tue Nov 27 07:20:24 2012
@@ -24,14 +24,12 @@ import java.util.List;
import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.user.Organisationmanagement;
import org.apache.openmeetings.data.user.dao.SalutationDao;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
@@ -365,10 +363,6 @@ public class UserForm extends AdminBaseF
"organisation.organisation_id"));
add(orgChoiceList);
- add(new DropDownChoice<Server>("server", Application.getBean(
- ServerDao.class).getServerList(),
- new ChoiceRenderer<Server>("name", "id")));
-
final String field1160 = WebSession.getString(1160); // 1160
everybody
final String field1168 = WebSession.getString(1168); // 1168
contact
final String field1169 = WebSession.getString(1169); // 1169
nobody
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html?rev=1414004&r1=1414003&r2=1414004&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
Tue Nov 27 07:20:24 2012
@@ -124,9 +124,6 @@
<div class="formelement">
<label><wicket:ommessage
key="161" /></label><select wicket:id="organisation_users" style="height:
80px"/>
</div>
- <div class="formelement">
- <label><wicket:ommessage
key="1502" /></label><select wicket:id="server"/>
- </div>
</fieldset>
<fieldset>
<legend><wicket:ommessage key="1159" /></legend>
