Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Fri Nov 13 01:24:41 2015 @@ -23,8 +23,8 @@ import static org.apache.openmeetings.we 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.dao.user.GroupUserDao; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.WebSession; @@ -42,20 +42,20 @@ 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 long groupId; + private List<GroupUser> users2add = new ArrayList<GroupUser>(); - public GroupUsersPanel(String id, long orgId) { + public GroupUsersPanel(String id, long groupId) { super(id); - this.organisationId = orgId; + this.groupId = groupId; setOutputMarkupId(true); - SearchableDataView<Organisation_Users> dataView = new SearchableDataView<Organisation_Users>("userList", new OrgUserDataProvider()) { + SearchableDataView<GroupUser> dataView = new SearchableDataView<GroupUser>("userList", new GroupUserDataProvider()) { private static final long serialVersionUID = 1L; @Override - protected void populateItem(Item<Organisation_Users> item) { - final Organisation_Users orgUser = item.getModelObject(); + protected void populateItem(Item<GroupUser> item) { + final GroupUser orgUser = item.getModelObject(); User u = orgUser.getUser(); item.add(new CheckBox("isModerator").add(new OnChangeAjaxBehavior() { private static final long serialVersionUID = 1L; @@ -63,7 +63,7 @@ public class GroupUsersPanel extends Pan @Override protected void onUpdate(AjaxRequestTarget target) { if (orgUser.getId() != null) { - getBean(OrganisationUserDao.class).update(orgUser, WebSession.getUserId()); + getBean(GroupUserDao.class).update(orgUser, WebSession.getUserId()); } } })); @@ -86,7 +86,7 @@ public class GroupUsersPanel extends Pan } } } else { - getBean(OrganisationUserDao.class).delete(orgUser, WebSession.getUserId()); + getBean(GroupUserDao.class).delete(orgUser, WebSession.getUserId()); } target.add(GroupUsersPanel.this); } @@ -104,36 +104,36 @@ public class GroupUsersPanel extends Pan }); } - void update(long orgId) { - organisationId = orgId; + void update(long groupId) { + this.groupId = groupId; users2add.clear(); } - List<Organisation_Users> getUsers2add() { + List<GroupUser> getUsers2add() { return users2add; } - private class OrgUserDataProvider extends SearchableDataProvider<Organisation_Users> { + private class GroupUserDataProvider extends SearchableDataProvider<GroupUser> { private static final long serialVersionUID = 1L; - OrgUserDataProvider() { - super(OrganisationUserDao.class); + GroupUserDataProvider() { + super(GroupUserDao.class); } - protected OrganisationUserDao getDao() { - return (OrganisationUserDao)super.getDao(); + protected GroupUserDao getDao() { + return (GroupUserDao)super.getDao(); } public long size() { - return users2add.size() + (search == null ? getDao().count(organisationId) : getDao().count(organisationId, search)); + return users2add.size() + (search == null ? getDao().count(groupId) : getDao().count(groupId, 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 GroupUser> iterator(long first, long count) { + List<GroupUser> list = new ArrayList<GroupUser>(); list.addAll(users2add); list.addAll(search == null && getSort() == null - ? getDao().get(organisationId, (int)first, (int)count) - : getDao().get(organisationId, search, (int)first, (int)count, getSortStr())); + ? getDao().get(groupId, (int)first, (int)count) + : getDao().get(groupId, search, (int)first, (int)count, getSortStr())); return list.iterator(); }
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Fri Nov 13 01:24:41 2015 @@ -42,7 +42,7 @@ <table class="adminListTable"> <tbody wicket:id="listContainer"> <tr wicket:id="groupList"> - <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="organisation_id"></span></div></td> + <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> </tr> </tbody> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Fri Nov 13 01:24:41 2015 @@ -18,9 +18,9 @@ */ package org.apache.openmeetings.web.admin.groups; -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.dao.user.GroupDao; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.web.admin.AdminPanel; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.common.PagedEntityListPanel; @@ -36,8 +36,8 @@ import org.apache.wicket.markup.html.bas import org.apache.wicket.markup.repeater.Item; /** - * Modify/ CRUD operations for {@link Organisation} and - * {@link Organisation_Users} + * Modify/ CRUD operations for {@link Group} and + * {@link GroupUser} * * @author swagner * @@ -47,9 +47,9 @@ public class GroupsPanel extends AdminPa private GroupForm form; @Override - public void onMenuPanelLoad(IPartialPageRequestHandler target) { - super.onMenuPanelLoad(target); - target.appendJavaScript("groupsInit();"); + public void onMenuPanelLoad(IPartialPageRequestHandler handler) { + super.onMenuPanelLoad(handler); + handler.appendJavaScript("groupsInit();"); } public GroupsPanel(String id) { @@ -57,17 +57,17 @@ public class GroupsPanel extends AdminPa final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); //Adding the Group Form - form = new GroupForm("form", listContainer, new Organisation()); + form = new GroupForm("form", listContainer, new Group()); add(form); //List view - SearchableDataView<Organisation> dataView = new SearchableDataView<Organisation>("groupList", new SearchableDataProvider<Organisation>(OrganisationDao.class)) { + SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableDataProvider<Group>(GroupDao.class)) { private static final long serialVersionUID = 1L; @Override - protected void populateItem(Item<Organisation> item) { - final Organisation o = item.getModelObject(); - item.add(new Label("organisation_id", "" + o.getId())); + protected void populateItem(Item<Group> item) { + final Group o = item.getModelObject(); + item.add(new Label("id", "" + o.getId())); item.add(new Label("name", "" + o.getName())); item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; @@ -95,9 +95,9 @@ public class GroupsPanel extends AdminPa target.add(listContainer); } }; - DataViewContainer<Organisation> container = new DataViewContainer<Organisation>(listContainer, dataView, navigator); - container.addLink(new OmOrderByBorder<Organisation>("orderById", "organisation_id", container)) - .addLink(new OmOrderByBorder<Organisation>("orderByName", "name", container)); + DataViewContainer<Group> container = new DataViewContainer<Group>(listContainer, dataView, navigator); + container.addLink(new OmOrderByBorder<Group>("orderById", "id", container)) + .addLink(new OmOrderByBorder<Group>("orderByName", "name", container)); add(container.getLinks()); add(navigator); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Fri Nov 13 01:24:41 2015 @@ -29,15 +29,15 @@ import java.util.List; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.server.ISessionManager; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.IUserService; -import org.apache.openmeetings.db.dao.user.OrganisationDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; -import org.apache.openmeetings.db.entity.room.RoomModerator; import org.apache.openmeetings.db.entity.room.RoomGroup; +import org.apache.openmeetings.db.entity.room.RoomModerator; import org.apache.openmeetings.db.entity.user.Address; -import org.apache.openmeetings.db.entity.user.Organisation; +import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.admin.AdminBaseForm; import org.apache.openmeetings.web.admin.AdminUserChoiceProvider; @@ -110,9 +110,9 @@ public class RoomForm extends AdminBaseF add(new CheckBox("appointment")); add(new CheckBox("ispublic")); - List<Organisation> orgList = Application.getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE); + List<Group> orgList = Application.getBean(GroupDao.class).get(0, Integer.MAX_VALUE); final List<RoomGroup> orgRooms = new ArrayList<RoomGroup>(orgList.size()); - for (Organisation org : orgList) { + for (Group org : orgList) { orgRooms.add(new RoomGroup(org, getModelObject())); } add(new Select2MultiChoice<RoomGroup>("roomGroups", null, new TextChoiceProvider<RoomGroup>() { @@ -120,19 +120,19 @@ public class RoomForm extends AdminBaseF @Override protected String getDisplayText(RoomGroup choice) { - String name = choice.getOrganisation().getName(); + String name = choice.getGroup().getName(); return name == null ? "" : name; } @Override protected Object getId(RoomGroup choice) { - return choice.getOrganisation().getId(); + return choice.getGroup().getId(); } @Override public void query(String term, int page, Response<RoomGroup> response) { for (RoomGroup or : orgRooms) { - if (Strings.isEmpty(term) || (!Strings.isEmpty(term) && or.getOrganisation().getName().contains(term))) { + if (Strings.isEmpty(term) || (!Strings.isEmpty(term) && or.getGroup().getName().contains(term))) { response.add(or); } } @@ -145,7 +145,7 @@ public class RoomForm extends AdminBaseF ids.add(Long.parseLong(id)); } List<RoomGroup> list = new ArrayList<RoomGroup>(); - for (Organisation o : getBean(OrganisationDao.class).get(ids)) { + for (Group o : getBean(GroupDao.class).get(ids)) { list.add(new RoomGroup(o, RoomForm.this.getModelObject())); } return list; @@ -157,16 +157,16 @@ public class RoomForm extends AdminBaseF demoTime.setLabel(new Model<String>(Application.getString(637))); add(demoTime); add(new CheckBox("allowUserQuestions")); - add(new CheckBox("isAudioOnly")); + add(new CheckBox("audioOnly")); add(new CheckBox("allowFontStyles")); - add(new CheckBox("isClosed")); + add(new CheckBox("closed")); add(new TextField<String>("redirectURL")); add(new CheckBox("waitForRecording")); add(new CheckBox("allowRecording")); add(new CheckBox("hideTopBar")); - add(new CheckBox("hideChat")); - add(new CheckBox("hideActivitiesAndActions")); + add(new CheckBox("chatHidden")); + add(new CheckBox("activitiesHidden")); add(new CheckBox("hideFilesExplorer")); add(new CheckBox("hideActionsMenu")); add(new CheckBox("hideScreenSharing")); @@ -254,10 +254,10 @@ public class RoomForm extends AdminBaseF protected void populateItem(final ListItem<RoomModerator> item) { RoomModerator moderator = item.getModelObject(); Label name = new Label("uName", moderator.getUser().getFirstname() + " " + moderator.getUser().getLastname()); - if (moderator.getRoomModeratorsId() == 0) { + if (moderator.getId() == 0) { name.add(AttributeAppender.append("class", "newItem")); } - item.add(new CheckBox("isSuperModerator", new PropertyModel<Boolean>(moderator, "isSuperModerator"))) + item.add(new CheckBox("superModerator", new PropertyModel<Boolean>(moderator, "superModerator"))) .add(new Label("userId", "" + moderator.getUser().getId())) .add(name) .add(new Label("email", moderator.getUser().getAddress().getEmail())) @@ -273,7 +273,7 @@ public class RoomForm extends AdminBaseF } }).setOutputMarkupId(true)); - add(new CheckBox("isModeratedRoom")); + add(new CheckBox("moderated")); add(new TextField<String>("confno").setEnabled(false)); add(pin = new TextField<String>("pin")); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html Fri Nov 13 01:24:41 2015 @@ -45,7 +45,7 @@ <table class="adminListTable"> <tbody wicket:id="listContainer"> <tr wicket:id="roomList"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="rooms_id"></span></div></td> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="ispublic"></span></div></td> </tr> @@ -78,7 +78,7 @@ </div> </fieldset> - <!-- Organisations --> + <!-- Groups --> <fieldset class="ui-widget-content"> <legend class="ui-widget-header"><wicket:message key="191" /></legend> <div class="formelement"> @@ -110,7 +110,7 @@ <div class="formelement"> <wicket:message key="880" /> <br/> - <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="isAudioOnly" /> + <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" /> </div> <div class="formelement"> <div class="info-text"><wicket:message key="1077" /></div> @@ -118,7 +118,7 @@ </div> <div class="formelement"> <div class="info-text"><wicket:message key="1101" /></div> - <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="isClosed" /> + <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" /> </div> <div class="formelement"> <label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" /> @@ -140,10 +140,10 @@ <label><wicket:message key="1357" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideTopBar" /> </div> <div class="formelement"> - <label><wicket:message key="1436" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideChat" /> + <label><wicket:message key="1436" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatHidden" /> </div> <div class="formelement"> - <label><wicket:message key="1437" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideActivitiesAndActions" /> + <label><wicket:message key="1437" /></label><input type="checkbox" class="formcheckbox" wicket:id="activitiesHidden" /> </div> <div class="formelement"> <label><wicket:message key="1438" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideFilesExplorer" /> @@ -203,7 +203,7 @@ <fieldset class="ui-widget-content"> <div class="formelement"> <div class="info-text"><wicket:message key="823" /></div> - <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="isModeratedRoom" /> + <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" /> </div> <div class="formelement"> <label><wicket:message key="816" /></label><input type="hidden" wicket:id="moderator2add" class="input"/> @@ -224,7 +224,7 @@ <table class="adminListTableSmall"> <tbody> <tr wicket:id="moderators"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><input type="checkbox" wicket:id="isSuperModerator"/></div></td> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><input type="checkbox" wicket:id="superModerator"/></div></td> <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="userId"></span></div></td> <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="uName"></span></div></td> <td class="three_column_layout_column4"><div class="three_column_layout_divcolumn4" style="overflow: hidden;"><span wicket:id="email"></span></div></td> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Fri Nov 13 01:24:41 2015 @@ -42,9 +42,9 @@ public class RoomsPanel extends AdminPan private RoomForm form; @Override - public void onMenuPanelLoad(IPartialPageRequestHandler target) { - super.onMenuPanelLoad(target); - target.appendJavaScript("omRoomPanelInit();"); + public void onMenuPanelLoad(IPartialPageRequestHandler handler) { + super.onMenuPanelLoad(handler); + handler.appendJavaScript("omRoomPanelInit();"); } public RoomsPanel(String id) { @@ -56,7 +56,7 @@ public class RoomsPanel extends AdminPan protected void populateItem(final Item<Room> item) { Room room = item.getModelObject(); final long roomId = room.getId(); - item.add(new Label("rooms_id", "" + room.getId())); + item.add(new Label("id", "" + room.getId())); item.add(new Label("name", "" + room.getName())); item.add(new Label("ispublic", "" + room.getIspublic())); item.add(new AjaxEventBehavior("click") { @@ -85,7 +85,7 @@ public class RoomsPanel extends AdminPan } }; DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView, navigator); - container.addLink(new OmOrderByBorder<Room>("orderById", "rooms_id", container)) + container.addLink(new OmOrderByBorder<Room>("orderById", "id", container)) .addLink(new OmOrderByBorder<Room>("orderByName", "name", container)) .addLink(new OmOrderByBorder<Room>("orderByPublic", "ispublic", container)); add(container.getLinks()); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Fri Nov 13 01:24:41 2015 @@ -46,9 +46,9 @@ public class ServersPanel extends AdminP private ServerForm form; @Override - public void onMenuPanelLoad(IPartialPageRequestHandler target) { - super.onMenuPanelLoad(target); - target.appendJavaScript("omServerPanelInit();"); + public void onMenuPanelLoad(IPartialPageRequestHandler handler) { + super.onMenuPanelLoad(handler); + handler.appendJavaScript("omServerPanelInit();"); } public ServersPanel(String id) { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html Fri Nov 13 01:24:41 2015 @@ -40,10 +40,10 @@ <label><wicket:message key="1308" /></label><span wicket:id="ownerId"></span> </div> <div class="formelement"> - <label><wicket:message key="1110" /></label><span wicket:id="starttime" /> + <label><wicket:message key="1110" /></label><span wicket:id="inserted" /> </div> <div class="formelement"> - <label><wicket:message key="1112" /></label><span wicket:id="updatetime" /> + <label><wicket:message key="1112" /></label><span wicket:id="updated" /> </div> <div class="formelement"> <div class="info-text"> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Fri Nov 13 01:24:41 2015 @@ -129,15 +129,15 @@ public class UserForm extends AdminBaseF target.add(this); target.add(listContainer); target.appendJavaScript("omUserPanelInit();"); - if (u.getOrganisation_users().isEmpty()) { + if (u.getGroupUsers().isEmpty()) { warning.open(target); } } @Override protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) { - UserDao usersDaoImpl = getBean(UserDao.class); - setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId()))); + UserDao userDao = getBean(UserDao.class); + setModelObject(userDao.getNewUserInstance(userDao.get(getUserId()))); update(target); } @@ -155,9 +155,9 @@ public class UserForm extends AdminBaseF @Override protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) { - UserDao usersDaoImpl = getBean(UserDao.class); - usersDaoImpl.delete(getModelObject(), getUserId()); - setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId()))); + UserDao userDao = getBean(UserDao.class); + userDao.delete(getModelObject(), getUserId()); + setModelObject(userDao.getNewUserInstance(userDao.get(getUserId()))); update(target); } @@ -182,8 +182,8 @@ public class UserForm extends AdminBaseF update(null); add(domain.add(domainId).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true)); add(new Label("ownerId")); - add(forDatePattern("starttime", WEB_DATE_PATTERN)); - add(forDatePattern("updatetime", WEB_DATE_PATTERN)); + add(forDatePattern("inserted", WEB_DATE_PATTERN)); + add(forDatePattern("updated", WEB_DATE_PATTERN)); add(new CheckBox("forceTimeZoneCheck")); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Fri Nov 13 01:24:41 2015 @@ -49,14 +49,15 @@ public class UsersPanel extends AdminPan private final MessageDialog warning = new MessageDialog("warning", Application.getString(797), Application.getString(343), DialogButtons.OK, DialogIcon.WARN) { private static final long serialVersionUID = 1L; - public void onClose(IPartialPageRequestHandler target, DialogButton button) { + @Override + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { } }; @Override - public void onMenuPanelLoad(IPartialPageRequestHandler target) { - super.onMenuPanelLoad(target); - target.appendJavaScript("omUserPanelInit();"); + public void onMenuPanelLoad(IPartialPageRequestHandler handler) { + super.onMenuPanelLoad(handler); + handler.appendJavaScript("omUserPanelInit();"); } private UserForm form; @@ -98,15 +99,15 @@ public class UsersPanel extends AdminPan } }; DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView, navigator); - container.addLink(new OmOrderByBorder<User>("orderById", "user_id", container)) + container.addLink(new OmOrderByBorder<User>("orderById", "id", container)) .addLink(new OmOrderByBorder<User>("orderByLogin", "login", container)) .addLink(new OmOrderByBorder<User>("orderByFirstName", "firstname", container)) .addLink(new OmOrderByBorder<User>("orderByLastName", "lastname", container)); add(container.getLinks()); add(navigator); - UserDao usersDaoImpl = getBean(UserDao.class); - form = new UserForm("form", listContainer, usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())), warning); + UserDao userDao = getBean(UserDao.class); + form = new UserForm("form", listContainer, userDao.getNewUserInstance(userDao.get(getUserId())), warning); form.showNewRecord(); add(form, warning); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Fri Nov 13 01:24:41 2015 @@ -58,6 +58,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.db.util.TimezoneUtil; +import org.apache.openmeetings.IWebSession; import org.apache.openmeetings.core.ldap.LdapLoginManagement; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.web.pages.SwfPage; @@ -85,7 +86,7 @@ import ro.fortsoft.wicket.dashboard.Widg import ro.fortsoft.wicket.dashboard.WidgetFactory; import ro.fortsoft.wicket.dashboard.web.DashboardContext; -public class WebSession extends AbstractAuthenticatedWebSession { +public class WebSession extends AbstractAuthenticatedWebSession implements IWebSession { private static final long serialVersionUID = 1L; public static int MILLIS_IN_MINUTE = 60000; public static final String SECURE_HASH = "secureHash"; @@ -196,7 +197,7 @@ public class WebSession extends Abstract //FIXME code is duplicated from MainService, need to be unified SOAPLoginDao soapDao = getBean(SOAPLoginDao.class); SOAPLogin soapLogin = soapDao.get(secureHash); - if (soapLogin != null && !soapLogin.getUsed()) { //add code for || (soapLogin.getAllowSameURLMultipleTimes()) + if (soapLogin != null && !soapLogin.isUsed()) { //add code for || (soapLogin.getAllowSameURLMultipleTimes()) SessiondataDao sessionDao = getBean(SessiondataDao.class); Sessiondata sd = sessionDao.getSessionByHash(soapLogin.getSessionHash()); if (sd != null && sd.getXml() != null) { @@ -497,6 +498,10 @@ public class WebSession extends Abstract dashboardContext.getDashboardPersister().save(dashboard); } } + + public long getOmLanguage() { + return getLanguage(); + } private static void checkIsInvalid() { if (isInvaldSession(get().getId())) { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html Fri Nov 13 01:24:41 2015 @@ -36,7 +36,7 @@ <label><wicket:message key="1143" /></label><select wicket:id="timeZoneId" /> </div> <div class="formelement"> - <label><wicket:message key="111" /></label><select wicket:id="language_id" /> + <label><wicket:message key="111" /></label><select wicket:id="languageId" /> </div> <div class="formelement"> <label><wicket:message key="137" /></label><input type="text" wicket:id="address.email" /> @@ -68,7 +68,7 @@ <textarea wicket:id="address.comment" /> </div> <div class="formelement"> - <label><wicket:message key="161" /></label><input type="hidden" class="input" wicket:id="organisation_users" style="max-height: 80px" /> + <label><wicket:message key="161" /></label><input type="hidden" class="input" wicket:id="groupUsers" style="max-height: 80px" /> </div> </wicket:panel> </html> \ No newline at end of file Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Fri Nov 13 01:24:41 2015 @@ -29,11 +29,11 @@ import java.util.Collection; import java.util.List; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.StateDao; 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.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Salutation; @@ -101,7 +101,7 @@ public class GeneralUserForm extends For add(new DropDownChoice<String>("timeZoneId", AVAILABLE_TIMEZONES)); - add(new LanguageDropDown("language_id")); + add(new LanguageDropDown("languageId")); add(email = new RequiredTextField<String>("address.email")); email.setLabel(Model.of(Application.getString(137))); @@ -124,47 +124,47 @@ public class GeneralUserForm extends For add(new DropDownChoice<State>("address.state", getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "id"))); add(new TextArea<String>("address.comment")); - final List<Organisation_Users> orgUsers; + final List<GroupUser> orgUsers; if (isAdminForm) { - List<Organisation> orgList = getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE); - orgUsers = new ArrayList<Organisation_Users>(orgList.size()); - for (Organisation org : orgList) { - orgUsers.add(new Organisation_Users(org)); + List<Group> orgList = getBean(GroupDao.class).get(0, Integer.MAX_VALUE); + orgUsers = new ArrayList<GroupUser>(orgList.size()); + for (Group org : orgList) { + orgUsers.add(new GroupUser(org)); } } else { - orgUsers = getModelObject().getOrganisation_users(); + orgUsers = getModelObject().getGroupUsers(); } - add(new Select2MultiChoice<Organisation_Users>("organisation_users", null, new TextChoiceProvider<Organisation_Users>() { + add(new Select2MultiChoice<GroupUser>("groupUsers", null, new TextChoiceProvider<GroupUser>() { private static final long serialVersionUID = 1L; @Override - protected String getDisplayText(Organisation_Users choice) { - return choice.getOrganisation().getName(); + protected String getDisplayText(GroupUser choice) { + return choice.getGroup().getName(); } @Override - protected Object getId(Organisation_Users choice) { - return choice.getOrganisation().getId(); + protected Object getId(GroupUser choice) { + return choice.getGroup().getId(); } @Override - public void query(String term, int page, Response<Organisation_Users> response) { - for (Organisation_Users ou : orgUsers) { - if (Strings.isEmpty(term) || (!Strings.isEmpty(term) && ou.getOrganisation().getName().contains(term))) { + public void query(String term, int page, Response<GroupUser> response) { + for (GroupUser ou : orgUsers) { + if (Strings.isEmpty(term) || (!Strings.isEmpty(term) && ou.getGroup().getName().contains(term))) { response.add(ou); } } } @Override - public Collection<Organisation_Users> toChoices(Collection<String> _ids) { + public Collection<GroupUser> 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>(); - for (Organisation o : getBean(OrganisationDao.class).get(ids)) { - list.add(new Organisation_Users(o)); + List<GroupUser> list = new ArrayList<GroupUser>(); + for (Group o : getBean(GroupDao.class).get(ids)) { + list.add(new GroupUser(o)); } return list; } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Fri Nov 13 01:24:41 2015 @@ -156,7 +156,7 @@ public abstract class FileTreePanel exte f.setParentItemId(parentId); } f.setOwnerId(p.getOwnerId()); - f.setOrganization_id(p.getOrganization_id()); + f.setGroupId(p.getGroupId()); getBean(RecordingDao.class).update(f); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java Fri Nov 13 01:24:41 2015 @@ -76,7 +76,7 @@ public class FolderPanel extends Panel { f.setRoomId(p.getRoomId()); if (f instanceof Recording) { Recording r = (Recording)f; - r.setOrganization_id(((Recording)p).getOrganization_id()); + r.setGroupId(((Recording)p).getGroupId()); getBean(RecordingDao.class).update(r); } else { getBean(FileExplorerItemDao.class).update((FileExplorerItem)f); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java Fri Nov 13 01:24:41 2015 @@ -41,7 +41,7 @@ public class PublicRecordingTreeProvider public Iterator<? extends Recording> getRoots() { Recording r = new Recording(); r.setId(groupId == null ? -1 : -groupId); - r.setOrganization_id(groupId); + r.setGroupId(groupId); r.setOwnerId(null); r.setType(Type.Folder); String pub = Application.getString(861); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java Fri Nov 13 01:24:41 2015 @@ -34,14 +34,14 @@ import java.util.UUID; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.room.InvitationDao; import org.apache.openmeetings.db.dao.room.RoomDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; -import org.apache.openmeetings.db.dao.user.OrganisationUserDao; +import org.apache.openmeetings.db.dao.user.GroupDao; +import org.apache.openmeetings.db.dao.user.GroupUserDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Invitation.Valid; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.service.room.InvitationManager; @@ -100,46 +100,46 @@ public class InvitationDialog extends Ab , group } private final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<User>(new ArrayList<User>())); - private final Select2MultiChoice<Organisation> groups = new Select2MultiChoice<Organisation>("groups" - , new CollectionModel<Organisation>(new ArrayList<Organisation>()) - , new TextChoiceProvider<Organisation>() { + private final Select2MultiChoice<Group> groups = new Select2MultiChoice<Group>("groups" + , new CollectionModel<Group>(new ArrayList<Group>()) + , new TextChoiceProvider<Group>() { private static final long serialVersionUID = 1L; @Override - public void query(String term, int page, Response<Organisation> response) { + public void query(String term, int page, Response<Group> response) { if (WebSession.getRights().contains(User.Right.Admin)) { - List<Organisation> groups = getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE); - for (Organisation g : groups) { + List<Group> groups = getBean(GroupDao.class).get(0, Integer.MAX_VALUE); + for (Group g : groups) { if (g.getName().toLowerCase().contains(term.toLowerCase())) { response.add(g); } } } else { User u = getBean(UserDao.class).get(getUserId()); - for (Organisation_Users ou : u.getOrganisation_users()) { - if (ou.getOrganisation().getName().toLowerCase().contains(term.toLowerCase())) { - response.add(ou.getOrganisation()); + for (GroupUser ou : u.getGroupUsers()) { + if (ou.getGroup().getName().toLowerCase().contains(term.toLowerCase())) { + response.add(ou.getGroup()); } } } } @Override - public Collection<Organisation> toChoices(Collection<String> ids) { - Collection<Organisation> c = new ArrayList<>(); + public Collection<Group> toChoices(Collection<String> ids) { + Collection<Group> c = new ArrayList<>(); for (String id : ids) { - c.add(getBean(OrganisationDao.class).get(Long.valueOf(id))); + c.add(getBean(GroupDao.class).get(Long.valueOf(id))); } return c; } @Override - protected String getDisplayText(Organisation choice) { + protected String getDisplayText(Group choice) { return choice.getName(); } @Override - protected Object getId(Organisation choice) { + protected Object getId(Group choice) { return choice.getId(); } }); @@ -170,7 +170,7 @@ public class InvitationDialog extends Ab message.setObject(null); recipients.setModelObject(new ArrayList<User>()); recipients.setEnabled(true); - groups.setModelObject(new ArrayList<Organisation>()); + groups.setModelObject(new ArrayList<Group>()); groups.setEnabled(false); tzId.setObject(u.getTimeZoneId()); lang = u.getLanguageId(); @@ -232,8 +232,8 @@ public class InvitationDialog extends Ab } } } else { - for (Organisation g : groups.getModelObject()) { - for (Organisation_Users ou : getBean(OrganisationUserDao.class).get(g.getId(), 0, Integer.MAX_VALUE)) { + for (Group g : groups.getModelObject()) { + for (GroupUser ou : getBean(GroupUserDao.class).get(g.getId(), 0, Integer.MAX_VALUE)) { Invitation i = create(ou.getUser()); try { getBean(InvitationManager.class).sendInvitionLink(i, MessageType.Create, subject.getObject(), message.getObject(), false); @@ -376,7 +376,7 @@ public class InvitationDialog extends Ab send.setEnabled(to.size() > 0, target); generate.setEnabled(to.size() == 1, target); } else { - Collection<Organisation> to = groups.getModelObject(); + Collection<Group> to = groups.getModelObject(); send.setEnabled(to.size() > 0, target); generate.setEnabled(false, target); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Fri Nov 13 01:24:41 2015 @@ -39,7 +39,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder; import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.room.Room; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.FormatHelper; import org.apache.openmeetings.web.app.Application; @@ -359,8 +359,8 @@ 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()) { - result.addAll(dao.getGroupRooms(ou.getOrganisation().getId())); + for (GroupUser ou : getBean(UserDao.class).get(getUserId()).getGroupUsers()) { + result.addAll(dao.getGroupRooms(ou.getGroup().getId())); } if (getModelObject().getRoom() != null && getModelObject().getRoom().isAppointment()) { //FIXME review result.add(getModelObject().getRoom()); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Fri Nov 13 01:24:41 2015 @@ -27,8 +27,8 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.dto.record.RecordingContainerData; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.record.Recording; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.web.common.UserPanel; import org.apache.openmeetings.web.common.tree.FileItemTree; import org.apache.openmeetings.web.common.tree.FileTreePanel; @@ -51,8 +51,8 @@ public class RecordingsPanel extends Use selectedFile.setObject(new Recording()); treesView.add(selected = new FileItemTree<Recording>(treesView.newChildId(), this, new MyRecordingTreeProvider())); treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(null, null))); - for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) { - Organisation o = ou.getOrganisation(); + for (GroupUser ou : getBean(UserDao.class).get(getUserId()).getGroupUsers()) { + Group o = ou.getGroup(); treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(o.getId(), o.getName()))); } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java Fri Nov 13 01:24:41 2015 @@ -26,7 +26,7 @@ import org.apache.wicket.ajax.AjaxReques import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; public class RoomEnterBehavior extends AjaxEventBehavior { - private static final long serialVersionUID = -5195740583653865055L; + private static final long serialVersionUID = 1L; private final long roomid; public RoomEnterBehavior(long roomid) { @@ -38,8 +38,8 @@ public class RoomEnterBehavior extends A return new OmUrlFragment(AreaKeys.room, "" + roomId); } - public static void roomEnter(MainPage page, IPartialPageRequestHandler target, long roomId) { - page.updateContents(getRoomUrlFragment(roomId), target); + public static void roomEnter(MainPage page, IPartialPageRequestHandler handler, long roomId) { + page.updateContents(getRoomUrlFragment(roomId), handler); } @Override Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java Fri Nov 13 01:24:41 2015 @@ -25,7 +25,7 @@ import org.apache.openmeetings.web.util. import org.apache.wicket.markup.html.basic.Label; public class RoomsSelectorPanel extends UserPanel { - private static final long serialVersionUID = -3246259803623925341L; + private static final long serialVersionUID = 1L; public RoomsSelectorPanel(String id, MenuParams param) { super(id); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java Fri Nov 13 01:24:41 2015 @@ -23,8 +23,8 @@ 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.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.common.UserPanel; import org.apache.wicket.AttributeModifier; @@ -43,23 +43,23 @@ public class RoomsTabbedPanel extends Us super(id); User u = getBean(UserDao.class).get(getUserId()); - add(new ListView<Organisation_Users>("orgTabs", u.getOrganisation_users()) { - private static final long serialVersionUID = -145637079945252731L; + add(new ListView<GroupUser>("orgTabs", u.getGroupUsers()) { + private static final long serialVersionUID = 1L; @Override - protected void populateItem(ListItem<Organisation_Users> item) { - Organisation org = item.getModelObject().getOrganisation(); + protected void populateItem(ListItem<GroupUser> item) { + Group org = item.getModelObject().getGroup(); 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()) { - private static final long serialVersionUID = 9039932126334250798L; + add(new ListView<GroupUser>("orgRooms", u.getGroupUsers()) { + private static final long serialVersionUID = 1L; @Override - protected void populateItem(ListItem<Organisation_Users> item) { - Organisation org = item.getModelObject().getOrganisation(); + protected void populateItem(ListItem<GroupUser> item) { + Group org = item.getModelObject().getGroup(); item.add(new RoomsPanel("rooms" , getBean(RoomDao.class).getGroupRooms(org.getId())) .setMarkupId("org" + org.getId())).setRenderBodyOnly(true); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Fri Nov 13 01:24:41 2015 @@ -33,7 +33,7 @@ import java.io.InputStream; import javax.servlet.http.HttpServletResponse; import org.apache.openmeetings.db.dao.record.RecordingDao; -import org.apache.openmeetings.db.dao.user.OrganisationUserDao; +import org.apache.openmeetings.db.dao.user.GroupUserDao; import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.request.cycle.RequestCycle; @@ -158,7 +158,7 @@ public abstract class RecordingResourceR if (r.getOwnerId() == null || getUserId() == r.getOwnerId()) { return r; } - if (r.getOrganization_id() == null || getBean(OrganisationUserDao.class).isUserInOrganization(r.getOrganization_id(), getUserId())) { + if (r.getGroupId() == null || getBean(GroupUserDao.class).isUserInGroup(r.getGroupId(), getUserId())) { return r; } //TODO external group check was added for plugin recording download Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Fri Nov 13 01:24:41 2015 @@ -36,8 +36,8 @@ <class>org.apache.openmeetings.db.entity.calendar.Appointment</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.Group</class> + <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Fri Nov 13 01:24:41 2015 @@ -36,8 +36,8 @@ <class>org.apache.openmeetings.db.entity.calendar.Appointment</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.Group</class> + <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Fri Nov 13 01:24:41 2015 @@ -35,8 +35,8 @@ <class>org.apache.openmeetings.db.entity.calendar.Appointment</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.Group</class> + <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Fri Nov 13 01:24:41 2015 @@ -36,8 +36,8 @@ <class>org.apache.openmeetings.db.entity.calendar.Appointment</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.Group</class> + <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Fri Nov 13 01:24:41 2015 @@ -36,8 +36,8 @@ <class>org.apache.openmeetings.db.entity.calendar.Appointment</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.Group</class> + <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Fri Nov 13 01:24:41 2015 @@ -36,8 +36,8 @@ <class>org.apache.openmeetings.db.entity.calendar.Appointment</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.Group</class> + <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Fri Nov 13 01:24:41 2015 @@ -211,8 +211,8 @@ --> </bean> <bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" /> - <bean id="organisationDao" class="org.apache.openmeetings.db.dao.user.OrganisationDao" /> - <bean id="organisationUserDao" class="org.apache.openmeetings.db.dao.user.OrganisationUserDao" /> + <bean id="groupDao" class="org.apache.openmeetings.db.dao.user.GroupDao" /> + <bean id="groupUserDao" class="org.apache.openmeetings.db.dao.user.GroupUserDao" /> <bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" /> <bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" /> <bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" /> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Fri Nov 13 01:24:41 2015 @@ -32,7 +32,7 @@ import org.apache.openmeetings.db.dao.ca import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.room.RoomGroupDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; @@ -46,7 +46,7 @@ public class TestOldBackups extends Abst @Autowired private BackupImport backupController; @Autowired - private OrganisationDao organisationDao; + private GroupDao groupDao; @Autowired private UserDao userDao; @Autowired @@ -56,7 +56,7 @@ public class TestOldBackups extends Abst @Autowired private MeetingMemberDao meetingMemberDao; @Autowired - private RoomGroupDao roomOrganisationDao; + private RoomGroupDao roomGroupDao; @Test public void importOldVersions() { @@ -66,10 +66,10 @@ public class TestOldBackups extends Abst if (!backupsHome.exists() || !backupsHome.isDirectory()) { fail("Invalid directory is specified for backup files: " + backupsDir); } - long orgCount = 0; + long groupCount = 0; long userCount = 0; long roomCount = 0; - long roomOrgCount = 0; + long roomGroupCount = 0; long apptCount = 0; long meetingMembersCount = 0; for (File backup : backupsHome.listFiles()) { @@ -79,24 +79,23 @@ public class TestOldBackups extends Abst try { is = new FileInputStream(backup); backupController.performImport(is); - long newOrgCount = organisationDao.count(); + long newGroupCount = groupDao.count(); long newUserCount = userDao.count(); long newRoomCount = roomDao.count(); - long newRoomOrgCount = roomOrganisationDao.get().size(); + long newRoomGroupCount = roomGroupDao.get().size(); long newApptCount = appointmentDao.get().size(); - log.debug("Now DB contains '" + newApptCount + "' appointments"); long newMeetingMembersCount = meetingMemberDao.getMeetingMembers().size(); - assertTrue("Zero organizations were imported from " + name, newOrgCount > orgCount); + assertTrue("Zero groups were imported from " + name, newGroupCount > groupCount); assertTrue("Zero users were imported from " + name, newUserCount > userCount); assertTrue("Zero rooms were imported from " + name, newRoomCount > roomCount); - assertTrue("Zero room organizations were imported from " + name, newRoomOrgCount > roomOrgCount); - assertTrue("Zero appointments were imported from " + name + ", apptCount = " + apptCount, newApptCount > apptCount); + assertTrue("Zero room groups were imported from " + name, newRoomGroupCount > roomGroupCount); + assertTrue("Zero appointments were imported from " + name, newApptCount > apptCount); assertTrue("Zero meeting members were imported from " + name, newMeetingMembersCount > meetingMembersCount); - orgCount = newOrgCount; + groupCount = newGroupCount; userCount = newUserCount; roomCount = newRoomCount; - roomOrgCount = newRoomOrgCount; + roomGroupCount = newRoomGroupCount; apptCount = newApptCount; meetingMembersCount = newMeetingMembersCount; } catch (Exception e) { Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Fri Nov 13 01:24:41 2015 @@ -19,7 +19,6 @@ package org.apache.openmeetings.test.calendar; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; - import java.util.List; import org.apache.openmeetings.db.dao.user.UserDao; Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java Fri Nov 13 01:24:41 2015 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.test.config; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -26,15 +27,13 @@ import java.util.List; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.entity.basic.Configuration; import org.apache.openmeetings.test.AbstractJUnitDefaults; -import org.apache.openmeetings.test.calendar.TestAppointmentAddAppointment; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; public class TestConfig extends AbstractJUnitDefaults { - - private static final Logger log = LoggerFactory.getLogger(TestAppointmentAddAppointment.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestConfig.class, webAppRootKey); @Autowired private ConfigurationDao configurationDao; @@ -57,10 +56,10 @@ public class TestConfig extends Abstract List<Configuration> list = configurationDao.get(4, 6); for (Configuration conf : list) { - System.err.println("conf.getConf_key() " + conf.getConf_key()); - System.err.println("conf.getUser() " + conf.getUser()); + log.error("conf.getKey() " + conf.getKey()); + log.error("conf.getUser() " + conf.getUser()); if (conf.getUser() != null) { - System.err.println("conf.getUsers() " + conf.getUser().getLogin()); + log.error("conf.getUsers() " + conf.getUser().getLogin()); } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java Fri Nov 13 01:24:41 2015 @@ -21,10 +21,10 @@ package org.apache.openmeetings.test.dom import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.junit.Assert.assertNotNull; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; 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.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; @@ -36,23 +36,23 @@ public class TestAddGroup extends Abstra private static final Logger log = Red5LoggerFactory.getLogger(TestAddGroup.class, webAppRootKey); @Autowired - private OrganisationDao orgDao; + private GroupDao groupDao; @Autowired - private UserDao usersDao; + private UserDao userDao; @Test public void testAddingGroup() { - Organisation o = new Organisation(); + Group o = new Group(); o.setName("default"); - o = orgDao.update(o, null); - assertNotNull("Id of organisation created should not be null", o.getId()); + o = groupDao.update(o, null); + assertNotNull("Id of group created should not be null", o.getId()); - User us = usersDao.get(1L); + User us = userDao.get(1L); assertNotNull("User should exist", us); - assertNotNull("Organisation User list should exist", us.getOrganisation_users()); - us.getOrganisation_users().add(new Organisation_Users(o)); - us = usersDao.update(us, null); + assertNotNull("Group User list should exist", us.getGroupUsers()); + us.getGroupUsers().add(new GroupUser(o)); + us = userDao.update(us, null); log.error(us.getLastname()); log.error(us.getAddress().getTown()); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java Fri Nov 13 01:24:41 2015 @@ -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.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; @@ -41,11 +41,11 @@ 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("Group list for default user must not be null", u.getGroupUsers()); + assertTrue("Default user must belong to at least one group", u.getGroupUsers().size() > 0); - for (Organisation_Users orgUserObj : u.getOrganisation_users()) { - log.error("testitNow: organisation Id: '" + orgUserObj.getOrganisation().getId() + "'; name: '" + orgUserObj.getOrganisation().getName() + "'"); + for (GroupUser orgUserObj : u.getGroupUsers()) { + log.error("testitNow: group Id: '" + orgUserObj.getGroup().getId() + "'; name: '" + orgUserObj.getGroup().getName() + "'"); } } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java Fri Nov 13 01:24:41 2015 @@ -22,14 +22,11 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.openmeetings.core.remote.InvitationService; -import org.apache.openmeetings.core.remote.MainService; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; -import org.apache.openmeetings.db.entity.server.Sessiondata; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.apache.openmeetings.webservice.UserWebService; -import org.apache.openmeetings.webservice.error.ServiceException; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -37,21 +34,17 @@ public class TestInvitation extends Abst @Autowired private InvitationService invitationService; @Autowired - private MainService mService; - @Autowired private UserWebService userWebService; @Autowired private UserDao userDao; @Test - public void testSendInvitationLink() throws ServiceException { - Sessiondata sessionData = mService.getsessiondata(); - - ServiceResult sr = userWebService.login(username, userpass); - User us = userDao.get(sr.getCode()); + public void testSendInvitationLink() { + ServiceResult result = userWebService.login(username, userpass); + User us = userDao.get(result.getCode()); String date = new SimpleDateFormat("dd.MM.yyyy").format(new Date()); - invitationService.sendInvitationHash(sessionData.getSessionId(), "Testname", "Testlastname", "message", "[email protected]", + invitationService.sendInvitationHash(result.getMessage(), "Testname", "Testlastname", "message", "[email protected]", "subject", 1L, "", false, "", 1, date, "12:00", date, "14:00", 1L, us.getTimeZoneId(), true); } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java Fri Nov 13 01:24:41 2015 @@ -36,14 +36,14 @@ import org.springframework.beans.factory public abstract class AbstractTestDefaults extends AbstractSpringTest { @Autowired - private LabelDao fieldLanguagesValuesDao; + private LabelDao labelDao; public WebDriver driver = null; private String BASE_URL = "http://localhost:5080/openmeetings";; private String username = "swagner"; private String userpass = "qweqwe"; - private String orgname = "seleniumtest"; + private String groupName = "seleniumtest"; private String email = "[email protected]"; private String locale = "en-us"; @@ -60,8 +60,8 @@ public abstract class AbstractTestDefaul return userpass; } - public String getOrgname() { - return orgname; + public String getGroupName() { + return groupName; } public String getEmail() { @@ -82,7 +82,7 @@ public abstract class AbstractTestDefaul public boolean doTearDownAfterTest = false; public String getString(long id) { - return fieldLanguagesValuesDao.getString(id, getLanguageId()); + return labelDao.getString(id, getLanguageId()); } /** @@ -165,7 +165,7 @@ public abstract class AbstractTestDefaul SeleniumUtils.inputText(driver, "view:cfg.username", getUsername()); SeleniumUtils.inputText(driver, "view:cfg.password", getUserpass()); SeleniumUtils.inputText(driver, "view:cfg.email", getEmail()); - SeleniumUtils.inputText(driver, "view:cfg.group", getOrgname()); + SeleniumUtils.inputText(driver, "view:cfg.group", getGroupName()); buttons_next = SeleniumUtils.findElements(driver, "buttons:next", true); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java Fri Nov 13 01:24:41 2015 @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.test.selenium; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -30,8 +32,11 @@ import org.openqa.selenium.OutputType; import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; public class SeleniumUtils { + private static final Logger log = Red5LoggerFactory.getLogger(SeleniumUtils.class, webAppRootKey); // we need to retry some actions because our web site is dynamic static int numberOfRetries = 10; @@ -217,7 +222,7 @@ public class SeleniumUtils { FileUtils.moveFile(screenShotFile, new File(path + File.separatorChar + fileName)); } catch (Exception err) { - err.printStackTrace(); + log.error("Error", err); } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java Fri Nov 13 01:24:41 2015 @@ -25,9 +25,9 @@ import java.util.Arrays; import java.util.Date; import java.util.Random; -import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.core.session.store.HashMapStore; import org.apache.openmeetings.core.session.store.IClientPersistenceStore; +import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.util.crypt.ManageCryptStyle;
