You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/10/06 18:48:58 UTC
svn commit: r1629710 [2/2] - in /openmeetings/trunk/singlewebapp:
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/
openmeetings-core/src...
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Mon Oct 6 16:48:57 2014
@@ -60,7 +60,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.room.PollType;
@@ -201,7 +201,7 @@ public class BackupExport {
registry.bind(AppointmentCategory.class, AppointmentCategoryConverter.class);
registry.bind(User.class, UserConverter.class);
- registry.bind(AppointmentReminderTyps.class, AppointmentReminderTypeConverter.class);
+ registry.bind(AppointmentReminderType.class, AppointmentReminderTypeConverter.class);
registry.bind(Room.class, RoomConverter.class);
if (list != null && list.size() > 0) {
registry.bind(list.get(0).getStart().getClass(), DateConverter.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Mon Oct 6 16:48:57 2014
@@ -80,7 +80,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
@@ -404,7 +404,7 @@ public class BackupImport {
registry.bind(AppointmentCategory.class, new AppointmentCategoryConverter(appointmentCategoryDaoImpl));
registry.bind(User.class, new UserConverter(usersDao, usersMap));
- registry.bind(AppointmentReminderTyps.class, new AppointmentReminderTypeConverter(appointmentReminderTypDaoImpl));
+ registry.bind(AppointmentReminderType.class, new AppointmentReminderTypeConverter(appointmentReminderTypDaoImpl));
registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
registry.bind(Date.class, DateConverter.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java Mon Oct 6 16:48:57 2014
@@ -41,6 +41,6 @@ public class RoomTypeConverter extends O
public void write(OutputNode node, RoomType value) throws Exception {
node.setData(true);
- node.setValue(value == null ? "0" : "" + value.getRoomtypes_id());
+ node.setValue(value == null ? "0" : "" + value.getId());
}
}
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Mon Oct 6 16:48:57 2014
@@ -672,9 +672,9 @@ public class ImportInitvalues {
public void loadInitAppointmentReminderTypes() {
log.debug("ImportInitValues.loadInitAppointmentReminderTypes");
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L, "do not send notification", 1568);
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L, "simple email", 1569);
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L, "iCal email", 1570);
+ appointmentReminderTypDaoImpl.add(-1L, "do not send notification", 1568);
+ appointmentReminderTypDaoImpl.add(-1L, "simple email", 1569);
+ appointmentReminderTypDaoImpl.add(-1L, "iCal email", 1570);
}
public void loadLanguagesFile(int langId) throws Exception {
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Mon Oct 6 16:48:57 2014
@@ -49,7 +49,7 @@ import org.apache.openmeetings.db.dto.ba
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.Userdata;
@@ -169,10 +169,8 @@ public class UserManager implements IUse
public List<Userdata> getUserdataDashBoard(Long user_id) {
if (user_id != null && user_id.longValue() > 0) {
try {
- TypedQuery<Userdata> query = em
- .createQuery("select c from Userdata as c where c.user_id = :user_id AND c.deleted <> :deleted", Userdata.class);
+ TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.deleted = false", Userdata.class);
query.setParameter("user_id", user_id);
- query.setParameter("deleted", true);
List<Userdata> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -187,10 +185,9 @@ public class UserManager implements IUse
if (user_id != null && user_id.longValue() > 0) {
try {
TypedQuery<Userdata> query = em
- .createQuery("select c from Userdata as c where c.user_id = :user_id AND c.data_key = :data_key AND c.deleted <> :deleted", Userdata.class);
+ .createQuery("select c from Userdata as c where c.user_id = :user_id AND c.data_key = :data_key AND c.deleted = false", Userdata.class);
query.setParameter("user_id", user_id);
query.setParameter("data_key", DATA_KEY);
- query.setParameter("deleted", true);
for (Iterator<Userdata> it2 = query.getResultList().iterator(); it2
.hasNext();) {
userdata = it2.next();
@@ -412,9 +409,9 @@ public class UserManager implements IUse
rights.remove(Right.Login);
}
- List<Organisation_Users> orgList = new ArrayList<Organisation_Users>();
+ List<OrganisationUser> orgList = new ArrayList<OrganisationUser>();
for (Long id : organisations) {
- orgList.add(new Organisation_Users(orgDao.get(id)));
+ orgList.add(new OrganisationUser(orgDao.get(id)));
}
User u = usersDao.addUser(rights, firstname, login, lastname, language_id,
password, adr, sendSMS, age, hash, timezone,
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Mon Oct 6 16:48:57 2014
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.admin.AdminUserChoiceProvider;
@@ -79,14 +79,14 @@ public class GroupForm extends AdminBase
found = null != getBean(OrganisationUserDao.class).getByOrganizationAndUser(o.getId(), u.getId());
}
if (!found && u != null) {
- for (Organisation_Users ou : usersPanel.getUsers2add()) {
+ for (OrganisationUser ou : usersPanel.getUsers2add()) {
if (ou.getUser().getId().equals(u.getId())) {
found = true;
break;
}
}
if (!found) {
- Organisation_Users ou = new Organisation_Users(o);
+ OrganisationUser ou = new OrganisationUser(o);
ou.setUser(u);
usersPanel.getUsers2add().add(ou);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Mon Oct 6 16:48:57 2014
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.WebSession;
@@ -45,19 +45,19 @@ import org.apache.wicket.markup.repeater
public class GroupUsersPanel extends Panel {
private static final long serialVersionUID = 1L;
private long organisationId;
- private List<Organisation_Users> users2add = new ArrayList<Organisation_Users>();
+ private List<OrganisationUser> users2add = new ArrayList<OrganisationUser>();
public GroupUsersPanel(String id, long orgId) {
super(id);
this.organisationId = orgId;
setOutputMarkupId(true);
- SearchableDataView<Organisation_Users> dataView = new SearchableDataView<Organisation_Users>("userList", new OrgUserDataProvider()) {
+ SearchableDataView<OrganisationUser> dataView = new SearchableDataView<OrganisationUser>("userList", new OrgUserDataProvider()) {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(Item<Organisation_Users> item) {
- final Organisation_Users orgUser = item.getModelObject();
+ protected void populateItem(Item<OrganisationUser> item) {
+ final OrganisationUser orgUser = item.getModelObject();
User u = orgUser.getUser();
item.add(new CheckBox("isModerator").add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -117,11 +117,11 @@ public class GroupUsersPanel extends Pan
users2add.clear();
}
- List<Organisation_Users> getUsers2add() {
+ List<OrganisationUser> getUsers2add() {
return users2add;
}
- private class OrgUserDataProvider extends SearchableDataProvider<Organisation_Users> {
+ private class OrgUserDataProvider extends SearchableDataProvider<OrganisationUser> {
private static final long serialVersionUID = 1L;
OrgUserDataProvider() {
@@ -136,8 +136,8 @@ public class GroupUsersPanel extends Pan
return users2add.size() + (search == null ? getDao().count(organisationId) : getDao().count(organisationId, search));
}
- public java.util.Iterator<? extends Organisation_Users> iterator(long first, long count) {
- List<Organisation_Users> list = new ArrayList<Organisation_Users>();
+ public java.util.Iterator<? extends OrganisationUser> iterator(long first, long count) {
+ List<OrganisationUser> list = new ArrayList<OrganisationUser>();
list.addAll(users2add);
list.addAll(search == null && getSort() == null
? getDao().get(organisationId, (int)first, (int)count)
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Mon Oct 6 16:48:57 2014
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.admi
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
@@ -36,7 +36,7 @@ import org.apache.wicket.markup.repeater
/**
* Modify/ CRUD operations for {@link Organisation} and
- * {@link Organisation_Users}
+ * {@link OrganisationUser}
*
* @author swagner
*
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Mon Oct 6 16:48:57 2014
@@ -28,7 +28,6 @@ import java.util.Collection;
import java.util.List;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.IUserService;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
@@ -37,7 +36,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.room.RoomOrganisation;
-import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.user.Address;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.User;
@@ -46,6 +44,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ConfirmCallListener;
+import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -107,8 +106,7 @@ public class RoomForm extends AdminBaseF
}
}));
- add(new DropDownChoice<RoomType>("roomtype", Application.getBean(RoomTypeDao.class).getAll(WebSession.getLanguage()),
- new ChoiceRenderer<RoomType>("label.value", "roomtypes_id")));
+ add(new RoomTypeDropDown("roomtype"));
add(new TextArea<String>("comment"));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Mon Oct 6 16:48:57 2014
@@ -113,7 +113,7 @@ public class UserForm extends AdminBaseF
target.add(this);
target.add(listContainer);
target.appendJavaScript("omUserPanelInit();");
- if (u.getOrganisation_users().isEmpty()) {
+ if (u.getOrganisationUsers().isEmpty()) {
warning.open(target);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html Mon Oct 6 16:48:57 2014
@@ -68,7 +68,7 @@
<textarea wicket:id="adresses.comment" />
</div>
<div class="formelement">
- <label><wicket:ommessage key="161" /></label><input type="hidden" class="input" wicket:id="organisation_users" style="height: 80px" />
+ <label><wicket:ommessage key="161" /></label><input type="hidden" class="input" wicket:id="organisationUsers" style="height: 80px" />
</div>
</wicket:panel>
</html>
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Mon Oct 6 16:48:57 2014
@@ -36,7 +36,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.label.FieldLanguage;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.Salutation;
import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
@@ -139,32 +139,32 @@ public class GeneralUserForm extends For
, new ChoiceRenderer<State>("name", "state_id")));
add(new TextArea<String>("adresses.comment"));
- final List<Organisation_Users> orgUsers;
+ final List<OrganisationUser> orgUsers;
if (isAdminForm) {
List<Organisation> orgList = getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE);
- orgUsers = new ArrayList<Organisation_Users>(orgList.size());
+ orgUsers = new ArrayList<OrganisationUser>(orgList.size());
for (Organisation org : orgList) {
- orgUsers.add(new Organisation_Users(org));
+ orgUsers.add(new OrganisationUser(org));
}
} else {
- orgUsers = getModelObject().getOrganisation_users();
+ orgUsers = getModelObject().getOrganisationUsers();
}
- add(new Select2MultiChoice<Organisation_Users>("organisation_users", null, new TextChoiceProvider<Organisation_Users>() {
+ add(new Select2MultiChoice<OrganisationUser>("organisationUsers", null, new TextChoiceProvider<OrganisationUser>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(Organisation_Users choice) {
+ protected String getDisplayText(OrganisationUser choice) {
return choice.getOrganisation().getName();
}
@Override
- protected Object getId(Organisation_Users choice) {
+ protected Object getId(OrganisationUser choice) {
return choice.getOrganisation().getId();
}
@Override
- public void query(String term, int page, Response<Organisation_Users> response) {
- for (Organisation_Users ou : orgUsers) {
+ public void query(String term, int page, Response<OrganisationUser> response) {
+ for (OrganisationUser ou : orgUsers) {
if (Strings.isEmpty(term) || (!Strings.isEmpty(term) && ou.getOrganisation().getName().contains(term))) {
response.add(ou);
}
@@ -172,14 +172,14 @@ public class GeneralUserForm extends For
}
@Override
- public Collection<Organisation_Users> toChoices(Collection<String> _ids) {
+ public Collection<OrganisationUser> toChoices(Collection<String> _ids) {
List<Long> ids = new ArrayList<Long>();
for (String id : _ids) {
ids.add(Long.parseLong(id));
}
- List<Organisation_Users> list = new ArrayList<Organisation_Users>();
+ List<OrganisationUser> list = new ArrayList<OrganisationUser>();
for (Organisation o : getBean(OrganisationDao.class).get(ids)) {
- list.add(new Organisation_Users(o));
+ list.add(new OrganisationUser(o));
}
return list;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Mon Oct 6 16:48:57 2014
@@ -26,7 +26,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getRoomUsers;
-import static org.apache.openmeetings.web.app.WebSession.getSid;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
@@ -51,7 +50,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.util.AuthLevelUtil;
@@ -130,9 +129,8 @@ public class RoomPanel extends BasePanel
String path = url.getPath();
path = path.substring(1, path.indexOf('/', 2) + 1);
Room r = getBean(RoomDao.class).get(roomId);
- target.appendJavaScript(String.format("initVideo(%s);", new JSONObject().put("sid", getSid())
- .put("roomid", r.getId()).put("audioOnly", r.getIsAudioOnly())
- .put("interview", 4L == r.getRoomtype().getRoomtypes_id()) //FIXME hardcoded
+ target.appendJavaScript(String.format("initVideo(%s);", new JSONObject().put("audioOnly", r.getIsAudioOnly())
+ .put("interview", 4L == r.getRoomtype().getId()) //FIXME hardcoded
.put("protocol", cfgDao.getConfValue(CONFIG_FLASH_PROTOCOL, String.class, ""))
.put("host", url.getHost())
.put("port", cfgDao.getConfValue(CONFIG_FLASH_PORT, String.class, ""))
@@ -260,7 +258,7 @@ public class RoomPanel extends BasePanel
treesView.add(new FileItemTree<FileExplorerItem>(treesView.newChildId(), this, new FilesTreeProvider(roomId)));
treesView.add(new FileItemTree<FlvRecording>(treesView.newChildId(), this, new MyRecordingTreeProvider()));
treesView.add(new FileItemTree<FlvRecording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(null, null)));
- for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
+ for (OrganisationUser ou : getBean(UserDao.class).get(getUserId()).getOrganisationUsers()) {
Organisation o = ou.getOrganisation();
treesView.add(new FileItemTree<FlvRecording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(o.getId(), o.getName())));
}
@@ -447,7 +445,7 @@ public class RoomPanel extends BasePanel
boolean moder = c.hasRight(Client.Right.moderator);
inviteMenuItem.setActive(notExternalUser && moder);
//TODO add check "sharing started"
- boolean shareVisible = 4 != r.getRoomtype().getRoomtypes_id() && moder; //FIXME hardcoded
+ boolean shareVisible = 4 != r.getRoomtype().getId() && moder; //FIXME hardcoded
shareMenuItem.setActive(shareVisible);
shareBtn.setVisible(shareMenuItem.isActive());
applyModerMenuItem.setActive(!moder);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Mon Oct 6 16:48:57 2014
@@ -37,11 +37,11 @@ import org.apache.openmeetings.db.dao.ca
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.MainPage;
@@ -228,7 +228,7 @@ public class AppointmentDialog extends A
super.onModelChanged();
Appointment a = getModelObject();
- List<AppointmentReminderTyps> remindTypes = getRemindTypes();
+ List<AppointmentReminderType> remindTypes = getRemindTypes();
if (a.getRemind() == null && !remindTypes.isEmpty()) {
a.setRemind(remindTypes.get(0));
}
@@ -281,11 +281,11 @@ public class AppointmentDialog extends A
pwd.setOutputMarkupId(true);
add(pwd);
- List<AppointmentReminderTyps> remindTypes = getRemindTypes();
- add(new DropDownChoice<AppointmentReminderTyps>(
+ List<AppointmentReminderType> remindTypes = getRemindTypes();
+ add(new DropDownChoice<AppointmentReminderType>(
"remind"
, remindTypes
- , new ChoiceRenderer<AppointmentReminderTyps>("label.value", "id")));
+ , new ChoiceRenderer<AppointmentReminderType>("label.value", "id")));
final DropDownChoice<RoomType> roomType = new RoomTypeDropDown("room.roomtype");
roomType.setEnabled(createRoom);
@@ -324,8 +324,8 @@ public class AppointmentDialog extends A
}
- private List<AppointmentReminderTyps> getRemindTypes() {
- return getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList(getLanguage());
+ private List<AppointmentReminderType> getRemindTypes() {
+ return getBean(AppointmentReminderTypDao.class).getList(getLanguage());
}
private List<Room> getRoomList() {
@@ -333,10 +333,10 @@ public class AppointmentDialog extends A
List<Room> result = new ArrayList<Room>();
RoomDao dao = getBean(RoomDao.class);
result.addAll(dao.getPublicRooms());
- for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
+ for (OrganisationUser ou : getBean(UserDao.class).get(getUserId()).getOrganisationUsers()) {
result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getId()));
}
- if (getModelObject().getRoom() != null && getModelObject().getRoom().getAppointment()) { //FIXME review
+ if (getModelObject().getRoom() != null && getModelObject().getRoom().isAppointment()) { //FIXME review
result.add(getModelObject().getRoom());
}
return result;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Mon Oct 6 16:48:57 2014
@@ -28,7 +28,7 @@ import org.apache.openmeetings.db.dto.fi
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.common.tree.FileItemTree;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
@@ -51,7 +51,7 @@ public class RecordingsPanel extends Use
selectedFile.setObject(new FlvRecording());
treesView.add(selected = new FileItemTree<FlvRecording>(treesView.newChildId(), this, new MyRecordingTreeProvider()));
treesView.add(new FileItemTree<FlvRecording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(null, null)));
- for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
+ for (OrganisationUser ou : getBean(UserDao.class).get(getUserId()).getOrganisationUsers()) {
Organisation o = ou.getOrganisation();
treesView.add(new FileItemTree<FlvRecording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(o.getId(), o.getName())));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java Mon Oct 6 16:48:57 2014
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.AttributeModifier;
@@ -43,22 +43,22 @@ public class RoomsTabbedPanel extends Us
super(id);
User u = getBean(UserDao.class).get(getUserId());
- add(new ListView<Organisation_Users>("orgTabs", u.getOrganisation_users()) {
+ add(new ListView<OrganisationUser>("orgTabs", u.getOrganisationUsers()) {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem<Organisation_Users> item) {
+ protected void populateItem(ListItem<OrganisationUser> item) {
Organisation org = item.getModelObject().getOrganisation();
item.add(new WebMarkupContainer("link")
.add(new Label("name", Model.of(org.getName())))
.add(new AttributeModifier("href", "#org" + org.getId())));
}
});
- add(new ListView<Organisation_Users>("orgRooms", u.getOrganisation_users()) {
+ add(new ListView<OrganisationUser>("orgRooms", u.getOrganisationUsers()) {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(ListItem<Organisation_Users> item) {
+ protected void populateItem(ListItem<OrganisationUser> item) {
Organisation org = item.getModelObject().getOrganisation();
item.add(new RoomsPanel("rooms"
, getBean(RoomDao.class).getOrganisationRooms(org.getId()))
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java Mon Oct 6 16:48:57 2014
@@ -38,6 +38,6 @@ public class RoomTypeDropDown extends Dr
public RoomTypeDropDown(String id) {
super(id);
setChoices(getRoomTypes());
- setChoiceRenderer(new ChoiceRenderer<RoomType>("label.value", "roomtypes_id"));
+ setChoiceRenderer(new ChoiceRenderer<RoomType>("label.value", "id"));
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Mon Oct 6 16:48:57 2014
@@ -36,11 +36,11 @@
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
- <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.user.OrganisationUser</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Mon Oct 6 16:48:57 2014
@@ -36,11 +36,11 @@
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
- <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.user.OrganisationUser</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Mon Oct 6 16:48:57 2014
@@ -35,11 +35,11 @@
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
- <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.user.OrganisationUser</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Mon Oct 6 16:48:57 2014
@@ -36,11 +36,11 @@
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
- <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.user.OrganisationUser</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Mon Oct 6 16:48:57 2014
@@ -36,11 +36,11 @@
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
- <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.user.OrganisationUser</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Mon Oct 6 16:48:57 2014
@@ -36,11 +36,11 @@
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
- <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.user.OrganisationUser</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Mon Oct 6 16:48:57 2014
@@ -32,7 +32,7 @@ import org.apache.openmeetings.db.dao.la
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.user.User;
@@ -67,7 +67,7 @@ public abstract class AbstractJUnitDefau
@Autowired
private FieldLanguagesValuesDao labelDao;
- private List<AppointmentReminderTyps> remindTypes;
+ private List<AppointmentReminderType> remindTypes;
private List<RoomType> roomTypes;
@Before
@@ -86,7 +86,7 @@ public abstract class AbstractJUnitDefau
if (configKeyCryptClassName == null) {
assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
}
- remindTypes = reminderTypeDao.getAppointmentReminderTypList(1L);
+ remindTypes = reminderTypeDao.getList(1L);
roomTypes = roomTypeDao.getAll(1L);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java Mon Oct 6 16:48:57 2014
@@ -24,7 +24,7 @@ import java.util.Calendar;
import java.util.List;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
@@ -35,7 +35,7 @@ public class TestDatabaseStructureAppoin
private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureAppointmentReminderTyp.class, webAppRootKey);
@Autowired
- private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
+ private AppointmentReminderTypDao reminderTypeDao;
@Test
public void testAddingGroup() {
@@ -47,17 +47,15 @@ public class TestDatabaseStructureAppoin
cal.get(Calendar.DAY_OF_MONTH);
cal.getTime();
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(1L,
- "test 5 min", -1);
- List<AppointmentReminderTyps> listAppoints = appointmentReminderTypDaoImpl
- .getAppointmentReminderTypList(1);
+ reminderTypeDao.add(1L, "test 5 min", -1);
+ List<AppointmentReminderType> listAppoints = reminderTypeDao.getList(1);
log.debug("Anzahl: " + listAppoints.size());
- for (AppointmentReminderTyps appoints : listAppoints) {
+ for (AppointmentReminderType appoints : listAppoints) {
// log.debug("Termin: "+appoints.getAppointmentName()+" startDate: "+appoints.getAppointmentStarttime()+
// " endDate: "+appoints.getAppointmentEndtime());
- log.debug("AppointmentReminderTyps: " + appoints.getName());
+ log.debug("AppointmentReminderType: " + appoints.getName());
}
// for (Iterator<Appointment> iter =
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java Mon Oct 6 16:48:57 2014
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertNot
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
@@ -50,8 +50,8 @@ public class TestAddGroup extends Abstra
User us = usersDao.get(1L);
assertNotNull("User should exist", us);
- assertNotNull("Organisation User list should exist", us.getOrganisation_users());
- us.getOrganisation_users().add(new Organisation_Users(o));
+ assertNotNull("Organisation User list should exist", us.getOrganisationUsers());
+ us.getOrganisationUsers().add(new OrganisationUser(o));
us = usersDao.update(us, null);
log.error(us.getLastname());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java Mon Oct 6 16:48:57 2014
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
@@ -41,10 +41,10 @@ public class TestUserGroupAggregation ex
public void testitNow() {
User u = userDao.get(1L);
- assertNotNull("Organisation list for default user must not be null", u.getOrganisation_users());
- assertTrue("Default user must belong to at least one organisation", u.getOrganisation_users().size() > 0);
+ assertNotNull("Organisation list for default user must not be null", u.getOrganisationUsers());
+ assertTrue("Default user must belong to at least one organisation", u.getOrganisationUsers().size() > 0);
- for (Organisation_Users orgUserObj : u.getOrganisation_users()) {
+ for (OrganisationUser orgUserObj : u.getOrganisationUsers()) {
log.error("testitNow: organisation Id: '" + orgUserObj.getOrganisation().getId() + "'; name: '" + orgUserObj.getOrganisation().getName() + "'");
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Mon Oct 6 16:48:57 2014
@@ -29,7 +29,7 @@ import java.util.Random;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractWicketTester;
import org.junit.Test;
@@ -51,14 +51,14 @@ public class TestUserContact extends Abs
public void createUserWithOrganisation() throws Exception {
int rnd = random.nextInt();
User u = getUser(rnd);
- u.getOrganisation_users().add(new Organisation_Users(orgDao.get(1L)));
+ u.getOrganisationUsers().add(new OrganisationUser(orgDao.get(1L)));
u = userDao.update(u, null);
assertTrue("Password should be set as expected", userDao.verifyPassword(u.getId(), "pass" + rnd));
User u1 = userDao.get(u.getId());
assertNotNull("Just created user should not be null", u1);
- assertNotNull("Just created user should have non null org-users", u1.getOrganisation_users());
- assertFalse("Just created user should have not empty org-users", u1.getOrganisation_users().isEmpty());
+ assertNotNull("Just created user should have non null org-users", u1.getOrganisationUsers());
+ assertFalse("Just created user should have not empty org-users", u1.getOrganisationUsers().isEmpty());
}
@Test
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java Mon Oct 6 16:48:57 2014
@@ -29,7 +29,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.test.selenium.HeavyTests;
@@ -47,7 +47,7 @@ public class TestUserOrganisation extend
private User getValidUser() {
for (User u : usersDao.getAllBackupUsers()) {
- if (!u.getDeleted() && u.getOrganisation_users().size() > 0) {
+ if (!u.getDeleted() && u.getOrganisationUsers().size() > 0) {
return u;
}
}
@@ -58,11 +58,11 @@ public class TestUserOrganisation extend
@Test
public void getUsersByOrganisationId() {
User u = getValidUser();
- Long orgId = u.getOrganisation_users().get(0).getOrganisation().getId();
- List<Organisation_Users> ul = orgUserDao.get(orgId, 0, 9999);
+ Long orgId = u.getOrganisationUsers().get(0).getOrganisation().getId();
+ List<OrganisationUser> ul = orgUserDao.get(orgId, 0, 9999);
assertTrue("Default Organisation should contain at least 1 user: " + ul.size(), ul.size() > 0);
- Organisation_Users ou = orgUserDao.getByOrganizationAndUser(orgId, u.getId());
+ OrganisationUser ou = orgUserDao.getByOrganizationAndUser(orgId, u.getId());
assertNotNull("Unable to found [organisation, user] pair - [" + orgId + "," + u.getId() + "]", ou);
}
@@ -73,7 +73,7 @@ public class TestUserOrganisation extend
Long orgId = orgDao.update(o, null).getId(); //inserted by not checked
assertNotNull("New Organisation have valid id", orgId);
- List<Organisation_Users> ul = orgUserDao.get(orgId, 0, 9999);
+ List<OrganisationUser> ul = orgUserDao.get(orgId, 0, 9999);
assertTrue("New Organisation should contain NO users: " + ul.size(), ul.size() == 0);
}
@@ -92,7 +92,7 @@ public class TestUserOrganisation extend
Random rnd = new Random();
for (int i = 0; i < 10000; ++i) {
User u = createUser(rnd.nextInt());
- u.getOrganisation_users().add(new Organisation_Users(o));
+ u.getOrganisationUsers().add(new OrganisationUser(o));
usersDao.update(u, null);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Mon Oct 6 16:48:57 2014
@@ -43,7 +43,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
@@ -572,7 +572,7 @@ public class CalendarWebService {
* @param SID
* @return - all reminder types for calendar events
*/
- public List<AppointmentReminderTyps> getAppointmentReminderTypList(
+ public List<AppointmentReminderType> getAppointmentReminderTypList(
String SID) {
log.debug("getAppointmentReminderTypList");
@@ -582,8 +582,8 @@ public class CalendarWebService {
User user = userDao.get(users_id);
long language_id = (user == null) ? 1 : user.getLanguage_id();
- List<AppointmentReminderTyps> res = appointmentReminderTypDao
- .getAppointmentReminderTypList(language_id);
+ List<AppointmentReminderType> res = appointmentReminderTypDao
+ .getList(language_id);
if (res == null || res.size() < 1) {
log.debug("no remindertyps found!");
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java Mon Oct 6 16:48:57 2014
@@ -40,7 +40,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomOrganisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
@@ -100,7 +100,7 @@ public class JabberWebService {
Long users_id = sessiondataDao.checkSession(SID);
User u = userDao.get(users_id);
- for (Organisation_Users ou : u.getOrganisation_users()) {
+ for (OrganisationUser ou : u.getOrganisationUsers()) {
List<RoomOrganisation> rol = conferenceService.getRoomsByOrganisationWithoutType(SID
, ou.getOrganisation().getId().longValue());
if (rol != null) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Mon Oct 6 16:48:57 2014
@@ -134,11 +134,11 @@ public class RoomWebService {
*
* @param SID
* The SID of the User. This SID must be marked as Loggedin
- * @param roomtypes_id
+ * @param roomtypesId
* @return - list of public rooms
* @throws ServiceException
*/
- public Room[] getRoomsPublic(String SID, Long roomtypes_id)
+ public Room[] getRoomsPublic(String SID, Long roomtypesId)
throws ServiceException {
try {
@@ -146,7 +146,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- List<Room> roomList = roomDao.getPublicRooms(roomtypes_id);
+ List<Room> roomList = roomDao.getPublicRooms(roomtypesId);
// We need to re-marshal the Rooms object cause Axis2 cannot use
// our objects
if (roomList != null && roomList.size() != 0) {
@@ -596,7 +596,7 @@ public class RoomWebService {
* @param SID
* The SID of the User. This SID must be marked as Loggedin
* @param name
- * @param roomtypes_id
+ * @param roomtypesId
* @param comment
* @param numberOfPartizipants
* @param ispublic
@@ -618,7 +618,7 @@ public class RoomWebService {
* @return - id of the room or error code
*/
@Deprecated
- public Long addRoom(String SID, String name, Long roomtypes_id,
+ public Long addRoom(String SID, String name, Long roomtypesId,
String comment, Long numberOfPartizipants, Boolean ispublic,
Integer videoPodWidth, Integer videoPodHeight,
Integer videoPodXPosition, Integer videoPodYPosition,
@@ -631,7 +631,7 @@ public class RoomWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypes_id, comment,
+ return roomManager.addRoom(name, roomtypesId, comment,
numberOfPartizipants, ispublic, null, false, false,
null, false, null, true, false, false, false //isClosed
, "", "",
@@ -663,7 +663,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
- * @param roomtypes_id
+ * @param roomtypesId
* Type of that room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -688,13 +688,13 @@ public class RoomWebService {
* @return - id of the room or error code
*/
public Long addRoomWithModeration(String SID, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
+ Long roomtypesId, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypes_id, comment,
+ return roomManager.addRoom(name, roomtypesId, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null, true,
false, true, false //isClosed
@@ -728,7 +728,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
- * @param roomtypes_id
+ * @param roomtypesId
* Type of that room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -756,14 +756,14 @@ public class RoomWebService {
* @return - id of the room or error code
*/
public Long addRoomWithModerationAndQuestions(String SID, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
+ Long roomtypesId, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom,
Boolean allowUserQuestions) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypes_id, comment,
+ return roomManager.addRoom(name, roomtypesId, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, false, true, false //isClosed
@@ -797,7 +797,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
- * @param roomtypes_id
+ * @param roomtypesId
* Type of that room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -828,14 +828,14 @@ public class RoomWebService {
* @throws ServiceException
*/
public Long addRoomWithModerationQuestionsAndAudioType(String SID,
- String name, Long roomtypes_id, String comment,
+ String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
Boolean allowUserQuestions, Boolean isAudioOnly) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypes_id, comment,
+ return roomManager.addRoom(name, roomtypesId, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, isAudioOnly, true, false //isClosed
@@ -870,7 +870,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
- * @param roomtypes_id
+ * @param roomtypesId
* Type of that room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -916,7 +916,7 @@ public class RoomWebService {
* @throws ServiceException
*/
public Long addRoomWithModerationQuestionsAudioTypeAndHideOptions(
- String SID, String name, Long roomtypes_id, String comment,
+ String SID, String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
Boolean allowUserQuestions, Boolean isAudioOnly,
@@ -927,7 +927,7 @@ public class RoomWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypes_id, comment,
+ return roomManager.addRoom(name, roomtypesId, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, isAudioOnly, true, false //isClosed
@@ -960,7 +960,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* Type of that room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -992,7 +992,7 @@ public class RoomWebService {
* @throws ServiceException
*/
public Long getRoomIdByExternalId(String SID, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
+ Long roomtypesId, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom, Long externalRoomId,
String externalRoomType) throws ServiceException {
@@ -1000,10 +1000,10 @@ public class RoomWebService {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
Room room = conferenceService.getRoomByExternalId(SID,
- externalRoomId, externalRoomType, roomtypes_id);
+ externalRoomId, externalRoomType, roomtypesId);
Long roomId = null;
if (room == null) {
- roomId = roomManager.addExternalRoom(name, roomtypes_id,
+ roomId = roomManager.addExternalRoom(name, roomtypesId,
comment, numberOfPartizipants, ispublic, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, externalRoomId, externalRoomType, true,
@@ -1023,74 +1023,6 @@ public class RoomWebService {
}
/**
- * TODO: Fix Organization Issue deprecated use updateRoomWithModeration
- *
- * @param SID
- * The SID of the User. This SID must be marked as Loggedin
- * @param rooms_id
- * @param name
- * @param roomtypes_id
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param videoPodWidth
- * @param videoPodHeight
- * @param videoPodXPosition
- * @param videoPodYPosition
- * @param moderationPanelXPosition
- * @param showWhiteBoard
- * @param whiteBoardPanelXPosition
- * @param whiteBoardPanelYPosition
- * @param whiteBoardPanelHeight
- * @param whiteBoardPanelWidth
- * @param showFilesPanel
- * @param filesPanelXPosition
- * @param filesPanelYPosition
- * @param filesPanelHeight
- * @param filesPanelWidth
- *
- * @return - id of the room updated or error code
- */
- @Deprecated
- public Long updateRoom(String SID, Long rooms_id, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
- Boolean ispublic, Integer videoPodWidth, Integer videoPodHeight,
- Integer videoPodXPosition, Integer videoPodYPosition,
- Integer moderationPanelXPosition, Boolean showWhiteBoard,
- Integer whiteBoardPanelXPosition, Integer whiteBoardPanelYPosition,
- Integer whiteBoardPanelHeight, Integer whiteBoardPanelWidth,
- Boolean showFilesPanel, Integer filesPanelXPosition,
- Integer filesPanelYPosition, Integer filesPanelHeight,
- Integer filesPanelWidth, Boolean appointment) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.updateRoomInternal(rooms_id,
- roomtypes_id, name, ispublic, comment,
- numberOfPartizipants, null, appointment, false, null,
- false, null, true, false, true, false, "", "", null,
- null, null, false, // hideTopBar
- false, // hideChat
- false, // hideActivitiesAndActions
- false, // hideFilesExplorer
- false, // hideActionsMenu
- false, // hideScreenSharing
- false, // hideWhiteboard
- false, // showMicrophoneStatus
- false, // chatModerated
- false, // chatOpened
- false, // filesOpened
- false, // autoVideoSelect
- false //sipEnabled
- );
- }
- } catch (Exception err) {
- log.error("[addRoom] ", err);
- }
- return new Long(-1);
- }
-
- /**
* Updates a conference room by its room id
*
* @param SID
@@ -1099,7 +1031,7 @@ public class RoomWebService {
* the room id to update
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1124,13 +1056,13 @@ public class RoomWebService {
* @return - id of the room updated or error code
*/
public Long updateRoomWithModeration(String SID, Long room_id, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
+ Long roomtypesId, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.updateRoomInternal(room_id, roomtypes_id,
+ return roomManager.updateRoomInternal(room_id, roomtypesId,
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, true, false, true, false, "", "", null, null, null,
@@ -1163,7 +1095,7 @@ public class RoomWebService {
* the room id to update
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1191,14 +1123,14 @@ public class RoomWebService {
* @return - id of the room updated or error code
*/
public Long updateRoomWithModerationAndQuestions(String SID, Long room_id,
- String name, Long roomtypes_id, String comment,
+ String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
Boolean allowUserQuestions) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.updateRoomInternal(room_id, roomtypes_id,
+ return roomManager.updateRoomInternal(room_id, roomtypesId,
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, allowUserQuestions, false, true, false, "", "",
@@ -1232,7 +1164,7 @@ public class RoomWebService {
* the room id to update
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1278,7 +1210,7 @@ public class RoomWebService {
* @return - id of the room updated or error code
*/
public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions(
- String SID, Long room_id, String name, Long roomtypes_id,
+ String SID, Long room_id, String name, Long roomtypesId,
String comment, Long numberOfPartizipants, Boolean ispublic,
Boolean appointment, Boolean isDemoRoom, Integer demoTime,
Boolean isModeratedRoom, Boolean allowUserQuestions,
@@ -1289,7 +1221,7 @@ public class RoomWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.updateRoomInternal(room_id, roomtypes_id,
+ return roomManager.updateRoomInternal(room_id, roomtypesId,
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, allowUserQuestions, isAudioOnly, true, false, "", "",
@@ -1359,7 +1291,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1387,13 +1319,13 @@ public class RoomWebService {
* @return - id of the room added or error code
*/
public Long addRoomWithModerationAndExternalType(String SID, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
+ Long roomtypesId, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom, String externalRoomType) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addExternalRoom(name, roomtypes_id,
+ return roomManager.addExternalRoom(name, roomtypesId,
comment, numberOfPartizipants, ispublic, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, null, externalRoomType, true, false, true, false, "",
@@ -1412,7 +1344,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1445,7 +1377,7 @@ public class RoomWebService {
* @return - id of the room added or error code
*/
public Long addRoomWithModerationExternalTypeAndAudioType(String SID,
- String name, Long roomtypes_id, String comment,
+ String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
String externalRoomType, Boolean allowUserQuestions,
@@ -1453,7 +1385,7 @@ public class RoomWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addExternalRoom(name, roomtypes_id,
+ return roomManager.addExternalRoom(name, roomtypesId,
comment, numberOfPartizipants, ispublic, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, null, externalRoomType, allowUserQuestions,
@@ -1472,7 +1404,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1510,7 +1442,7 @@ public class RoomWebService {
* @return - id of the room added or error code
*/
public Long addRoomWithModerationAndRecordingFlags(String SID, String name,
- Long roomtypes_id, String comment, Long numberOfPartizipants,
+ Long roomtypesId, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom, String externalRoomType,
Boolean allowUserQuestions, Boolean isAudioOnly,
@@ -1518,7 +1450,7 @@ public class RoomWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addExternalRoom(name, roomtypes_id,
+ return roomManager.addExternalRoom(name, roomtypesId,
comment, numberOfPartizipants, ispublic, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, null, externalRoomType, allowUserQuestions,
@@ -1541,7 +1473,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -1581,7 +1513,7 @@ public class RoomWebService {
* @return - id of the room added or error code
*/
public Long addRoomWithModerationExternalTypeAndTopBarOption(String SID,
- String name, Long roomtypes_id, String comment,
+ String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
String externalRoomType, Boolean allowUserQuestions,
@@ -1590,7 +1522,7 @@ public class RoomWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addExternalRoom(name, roomtypes_id,
+ return roomManager.addExternalRoom(name, roomtypesId,
comment, numberOfPartizipants, ispublic, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, null, externalRoomType, allowUserQuestions,
@@ -2068,7 +2000,7 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
- * @param roomtypes_id
+ * @param roomtypesId
* new type of room (1 = Conference, 2 = Audience, 3 =
* Restricted, 4 = Interview)
* @param comment
@@ -2114,7 +2046,7 @@ public class RoomWebService {
* @throws ServiceException
*/
public Long addRoomWithModerationAndExternalTypeAndStartEnd(String SID,
- String name, Long roomtypes_id, String comment,
+ String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
String externalRoomType, String validFromDate,
@@ -2156,7 +2088,7 @@ public class RoomWebService {
log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(dTo));
Long rooms_id = roomManager.addExternalRoom(name,
- roomtypes_id, comment, numberOfPartizipants, ispublic,
+ roomtypesId, comment, numberOfPartizipants, ispublic,
null, appointment, isDemoRoom, demoTime,
isModeratedRoom, null, null, externalRoomType, false, // allowUserQuestions
false, // isAudioOnly
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Mon Oct 6 16:48:57 2014
@@ -47,7 +47,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.util.AuthLevelUtil;
@@ -1032,7 +1032,7 @@ public class UserWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
if (!orgUserDao.isUserInOrganization(organisation_id, user_id)) {
User u = userDao.get(user_id);
- u.getOrganisation_users().add(new Organisation_Users(orgDao.get(organisation_id)));
+ u.getOrganisationUsers().add(new OrganisationUser(orgDao.get(organisation_id)));
userDao.update(u, users_id);
}
return user_id;
@@ -1072,7 +1072,7 @@ public class UserWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
result.setRecords(orgUserDao.count(organisation_id));
result.setResult(new ArrayList<User>());
- for (Organisation_Users ou : orgUserDao.get(organisation_id, null, start, max, orderby + " " + (asc ? "ASC" : "DESC"))) {
+ for (OrganisationUser ou : orgUserDao.get(organisation_id, null, start, max, orderby + " " + (asc ? "ASC" : "DESC"))) {
result.getResult().add(ou.getUser());
}
} else {