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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -222,7 +222,7 @@ public class RoomForm extends AdminBaseF @Override protected String getDisplayText(User choice) { - Address a = choice.getAdresses(); + Address a = choice.getAddress(); return String.format("\"%s %s\" <%s>", choice.getFirstname(), choice.getLastname(), a == null ? "" : a.getEmail()); } }); @@ -268,7 +268,7 @@ public class RoomForm extends AdminBaseF 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().getAdresses().getEmail())) + .add(new Label("email", moderator.getUser().getAddress().getEmail())) .add(new WebMarkupContainer("delete").add(new AjaxEventBehavior("onclick"){ private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html Wed Jun 3 10:59:16 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> Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Wed Jun 3 10:59:16 2015 @@ -55,7 +55,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("onclick") { @@ -84,7 +84,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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html Wed Jun 3 10:59:16 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/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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -166,8 +166,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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Wed Jun 3 10:59:16 2015 @@ -97,7 +97,7 @@ 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)); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Wed Jun 3 10:59:16 2015 @@ -193,8 +193,8 @@ public class WebSession extends Abstract if (soapLogin != null && !soapLogin.getUsed()) { //add code for || (soapLogin.getAllowSameURLMultipleTimes()) SessiondataDao sessionDao = getBean(SessiondataDao.class); Sessiondata sd = sessionDao.getSessionByHash(soapLogin.getSessionHash()); - if (sd != null && sd.getSessionXml() != null) { - RemoteSessionObject remoteUser = RemoteSessionObject.fromXml(sd.getSessionXml()); + if (sd != null && sd.getXml() != null) { + RemoteSessionObject remoteUser = RemoteSessionObject.fromXml(sd.getXml()); if (remoteUser != null && !Strings.isEmpty(remoteUser.getExternalUserId())) { UserDao userDao = getBean(UserDao.class); User user = userDao.getExternalUser(remoteUser.getExternalUserId(), remoteUser.getExternalUserType()); @@ -203,10 +203,10 @@ public class WebSession extends Abstract user.setFirstname(remoteUser.getFirstname()); user.setLastname(remoteUser.getLastname()); user.setLogin(remoteUser.getUsername()); //FIXME check if login UNIQUE - user.setExternalUserId(remoteUser.getExternalUserId()); - user.setExternalUserType(remoteUser.getExternalUserType()); + user.setExternalId(remoteUser.getExternalUserId()); + user.setExternalType(remoteUser.getExternalUserType()); user.getRights().add(Right.Room); - user.getAdresses().setEmail(remoteUser.getEmail()); + user.getAddress().setEmail(remoteUser.getEmail()); user.setPictureuri(remoteUser.getPictureUrl()); } else { user.setFirstname(remoteUser.getFirstname()); @@ -222,7 +222,7 @@ public class WebSession extends Abstract sessionDao.updateUser(SID, user.getId()); setUser(user); - recordingId = soapLogin.getRoomRecordingId(); + recordingId = soapLogin.getRecordingId(); return true; } } @@ -234,7 +234,7 @@ public class WebSession extends Abstract userId = u.getId(); rights = Collections.unmodifiableSet(u.getRights()); languageId = u.getLanguageId(); - externalType = u.getExternalUserType(); + externalType = u.getExternalType(); tz = getBean(TimezoneUtil.class).getTimeZone(u); ISO8601FORMAT.setTimeZone(tz); setLocale(languageId == 3 ? Locale.GERMANY : LabelDao.languages.get(languageId)); //FIXME hack @@ -247,7 +247,7 @@ public class WebSession extends Abstract public boolean signIn(String login, String password, Type type, Long domainId) { Sessiondata sessData = getBean(SessiondataDao.class).startsession(); - SID = sessData.getSession_id(); + SID = sessData.getSessionId(); try { User u = null; switch (type) { @@ -308,11 +308,11 @@ public class WebSession extends Abstract if (sessionData == null) { sessionData = sessionDao.startsession(); } - if (!sessionDao.updateUser(sessionData.getSession_id(), userId, false, languageId)) { + if (!sessionDao.updateUser(sessionData.getSessionId(), userId, false, languageId)) { //something bad, force user to re-login invalidate(); } else { - SID = sessionData.getSession_id(); + SID = sessionData.getSessionId(); } } return SID; @@ -390,7 +390,7 @@ public class WebSession extends Abstract } public State getCountryByBrowserLocale() { - List<State> states = getBean(StateDao.class).getStates(); + List<State> states = getBean(StateDao.class).get(); String code = getBrowserLocale().getISO3Country().toUpperCase(); for (State s : states) { if (s.getShortName().toUpperCase().equals(code)){ 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -36,13 +36,13 @@ <label><wicket:message key="1143" /></label><select wicket:id="timeZoneId" /> </div> <div class="formelement"> - <label><wicket:message key="111" /></label><select wicket:id="language" /> + <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="adresses.email" /> + <label><wicket:message key="137" /></label><input type="text" wicket:id="address.email" /> </div> <div class="formelement"> - <label><wicket:message key="607" /></label><input type="text" wicket:id="adresses.phone" /> + <label><wicket:message key="607" /></label><input type="text" wicket:id="address.phone" /> </div> <div class="formelement"> <label><wicket:message key="1503" /></label><input class="formcheckbox" type="checkbox" wicket:id="sendSMS" /> @@ -52,20 +52,20 @@ </div> <div class="formelement"> <label><wicket:message key="139" /></label><input type="text" - wicket:id="adresses.street" style="width: 244px;" /> <input - type="text" wicket:id="adresses.additionalname" style="width: 30px;" /> + wicket:id="address.street" style="width: 244px;" /> <input + type="text" wicket:id="address.additionalname" style="width: 30px;" /> </div> <div class="formelement"> <label><wicket:message key="140" /></label><input type="text" - wicket:id="adresses.zip" style="width: 60px;" /> <input type="text" - wicket:id="adresses.town" style="width: 214px;" /> + wicket:id="address.zip" style="width: 60px;" /> <input type="text" + wicket:id="address.town" style="width: 214px;" /> </div> <div class="formelement"> - <label><wicket:message key="141" /></label><select wicket:id="adresses.states" /> + <label><wicket:message key="141" /></label><select wicket:id="address.state" /> </div> <div class="formelement"> <label><wicket:message key="142" /></label> - <textarea wicket:id="adresses.comment" /> + <textarea wicket:id="address.comment" /> </div> <div class="formelement"> <label><wicket:message key="161" /></label><input type="hidden" class="input" wicket:id="organisationUsers" style="max-height: 80px" /> 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -21,7 +21,6 @@ package org.apache.openmeetings.web.comm import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES; -import static org.apache.openmeetings.web.app.WebSession.getLanguage; import static org.apache.wicket.validation.validator.StringValidator.minimumLength; import java.util.ArrayList; @@ -85,18 +84,18 @@ public class GeneralUserForm extends For SalutationDao salutDao = getBean(SalutationDao.class); add(new DropDownChoice<Salutation>("salutation" , new PropertyModel<Salutation>(this, "salutation") - , salutDao.getUserSalutations(getLanguage()) + , salutDao.get() , new ChoiceRenderer<Salutation>() { private static final long serialVersionUID = 1L; @Override public Object getDisplayValue(Salutation object) { - return getString("" + object.getFieldvalues_id()); + return getString("" + object.getLabelId()); } @Override public String getIdValue(Salutation object, int index) { - return "" + object.getSalutations_id(); + return "" + object.getId(); } }) .add(new AjaxFormComponentUpdatingBehavior("onchange") { @@ -104,7 +103,7 @@ public class GeneralUserForm extends For @Override protected void onUpdate(AjaxRequestTarget target) { - GeneralUserForm.this.getModelObject().setSalutations_id(salutation.getSalutations_id()); + GeneralUserForm.this.getModelObject().setSalutationId(salutation.getId()); } })); add(new TextField<String>("firstname")); @@ -112,12 +111,12 @@ 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>("adresses.email")); + add(email = new RequiredTextField<String>("address.email")); email.setLabel(Model.of(Application.getString(137))); email.add(RfcCompliantEmailAddressValidator.getInstance()); - add(new TextField<String>("adresses.phone")); + add(new TextField<String>("address.phone")); add(new CheckBox("sendSMS")); add(new AjaxDatePicker("age", Model.of(CalendarHelper.getDate(getModelObject().getAge())), WebSession.get().getLocale()) { private static final long serialVersionUID = 1L; @@ -127,12 +126,12 @@ public class GeneralUserForm extends For GeneralUserForm.this.getModelObject().setAge(CalendarHelper.getDate(getModelObject())); } }); - add(new TextField<String>("adresses.street")); - add(new TextField<String>("adresses.additionalname")); - add(new TextField<String>("adresses.zip")); - add(new TextField<String>("adresses.town")); - add(new DropDownChoice<State>("adresses.states", getBean(StateDao.class).getStates(), new ChoiceRenderer<State>("name", "id"))); - add(new TextArea<String>("adresses.comment")); + add(new TextField<String>("address.street")); + add(new TextField<String>("address.additionalname")); + add(new TextField<String>("address.zip")); + add(new TextField<String>("address.town")); + add(new DropDownChoice<State>("address.state", getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "id"))); + add(new TextArea<String>("address.comment")); final List<OrganisationUser> orgUsers; if (isAdminForm) { @@ -182,7 +181,7 @@ public class GeneralUserForm extends For } public void updateModelObject(User u) { - salutation = getBean(SalutationDao.class).get(u.getSalutations_id(), getLanguage()); + salutation = getBean(SalutationDao.class).get(u.getSalutationId()); } @Override Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java Wed Jun 3 10:59:16 2015 @@ -32,7 +32,7 @@ public class MainMenuItem extends MenuIt private MenuParams params; public MainMenuItem(Navimain m) { - super(Application.getString(m.getFieldvalues_id()), Application.getString(m.getTooltip_fieldvalues_id())); + super(Application.getString(m.getLabelId()), Application.getString(m.getTooltipLabelId())); action = MenuActions.valueOf(m.getAction()); params = m.getParams() != null ? MenuParams.valueOf(m.getParams()) : MenuParams.publicTabButton; } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java Wed Jun 3 10:59:16 2015 @@ -103,6 +103,7 @@ public class MenuPanel extends BasePanel //target.appendJavaScript(String.format("$(function() {%s;});", mfb.getInitScript())); target.appendJavaScript(mfb.getInitScript()); } + @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js Wed Jun 3 10:59:16 2015 @@ -22,7 +22,9 @@ function initMenu(menuContainerId, menuI , menuIcon: true , buttons: true , position: { - within: $("#" + menuId).add(window).first() + my: "left top", + at: "left bottom", + collision: "none" } //, select: select }); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Wed Jun 3 10:59:16 2015 @@ -155,7 +155,7 @@ public abstract class FileTreePanel exte f.setParentItemId(parentId); } f.setOwnerId(p.getOwnerId()); - f.setOrganization_id(p.getOrganization_id()); + f.setOrganizationId(p.getOrganizationId()); getBean(FlvRecordingDao.class).update(f); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java Wed Jun 3 10:59:16 2015 @@ -76,7 +76,7 @@ public class FolderPanel extends Panel { f.setRoomId(p.getRoomId()); if (f instanceof FlvRecording) { FlvRecording r = (FlvRecording)f; - r.setOrganization_id(((FlvRecording)p).getOrganization_id()); + r.setOrganizationId(((FlvRecording)p).getOrganizationId()); getBean(FlvRecordingDao.class).update(r); } else { getBean(FileExplorerItemDao.class).update((FileExplorerItem)f); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java Wed Jun 3 10:59:16 2015 @@ -41,7 +41,7 @@ public class PublicRecordingTreeProvider public Iterator<? extends FlvRecording> getRoots() { FlvRecording r = new FlvRecording(); r.setId(orgId == null ? -1 : -orgId); - r.setOrganization_id(orgId); + r.setOrganizationId(orgId); r.setOwnerId(null); r.setType(Type.Folder); String pub = Application.getString(861); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java Wed Jun 3 10:59:16 2015 @@ -39,7 +39,7 @@ public class ActivatePage extends BaseNo if (!AuthLevelUtil.hasLoginLevel(user.getRights())) { // activate user.getRights().add(Right.Login); - user.setUpdatetime(new Date()); + user.setUpdated(new Date()); Application.getBean(UserDao.class).update(user, null); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Wed Jun 3 10:59:16 2015 @@ -168,8 +168,8 @@ public class MainPage extends BaseInited private List<MenuItem> getMainMenu() { List<MenuItem> menu = new ArrayList<MenuItem>(); - for (Naviglobal gl : getBean(NavigationDao.class).getMainMenu(AuthLevelUtil.hasAdminLevel(WebSession.getRights()), getUserId())) { - MenuItem g = new MenuItem(Application.getString(gl.getFieldvalues_id())) { + for (Naviglobal gl : getBean(NavigationDao.class).getMainMenu(AuthLevelUtil.hasAdminLevel(WebSession.getRights()))) { + MenuItem g = new MenuItem(Application.getString(gl.getLabelId())) { private static final long serialVersionUID = 1L; @Override Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Wed Jun 3 10:59:16 2015 @@ -213,7 +213,6 @@ public class ForgetPasswordDialog extend // check if Mail given if (email.length() > 0) { - // log.debug("getAdresses_id "+addr_e.getAdresses_id()); User us = userDao.getByEmail(email); if (us != null) { sendHashByUser(us, appLink, userDao); @@ -244,7 +243,7 @@ public class ForgetPasswordDialog extend userDao.update(us, -1L); String reset_link = appLink + "?hash=" + us.getResethash(); - String email = us.getAdresses().getEmail(); + String email = us.getAddress().getEmail(); String template = ResetPasswordTemplate.getEmail(reset_link); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Wed Jun 3 10:59:16 2015 @@ -258,7 +258,7 @@ public class RegisterDialog extends Abst langField.setRequired(true).setLabel(Model.of(Application.getString(111))); add(tzDropDown.setRequired(true).setLabel(Model.of(Application.getString(1143)))); add(stateField = new DropDownChoice<State>("state", new PropertyModel<State>(RegisterDialog.this, "state"), - getBean(StateDao.class).getStates(), new ChoiceRenderer<State>("name", "id"))); + getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "id"))); stateField.setRequired(true).setLabel(Model.of(Application.getString(120))); add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected private static final long serialVersionUID = 1L; Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Wed Jun 3 10:59:16 2015 @@ -200,7 +200,7 @@ public class SignInDialog extends Abstra if (ws.getLoginError() != null) { ErrorValue eValue = getBean(ErrorDao.class).get(-1 * ws.getLoginError()); if (eValue != null) { - error(Application.getString(eValue.getFieldvalues_id())); + error(Application.getString(eValue.getLabelId())); target.add(feedback); } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Wed Jun 3 10:59:16 2015 @@ -376,7 +376,7 @@ public class SignInPage extends BaseInit u.setShowContactDataToContacts(true); u.setLastname(lastname); u.setFirstname(firstname); - u.getAdresses().setEmail(email); + u.getAddress().setEmail(email); } u.setLastlogin(new Date()); u = userDao.update(u, pass, -1); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java Wed Jun 3 10:59:16 2015 @@ -288,7 +288,7 @@ public class InvitationDialog extends Ab //no-op added to preserve selection } }); - add(new LanguageDropDown("lang", new PropertyModel<Long>(InvitationDialog.this, "lang"))); + add(new LanguageDropDown("language", new PropertyModel<Long>(InvitationDialog.this, "lang"))); add(url.setOutputMarkupId(true)); add(feedback); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Wed Jun 3 10:59:16 2015 @@ -30,6 +30,7 @@ import org.apache.openmeetings.db.dao.ro import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.PollType; import org.apache.openmeetings.db.entity.room.RoomPoll; +import org.apache.openmeetings.db.entity.room.RoomType; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.room.RoomPanel; @@ -38,6 +39,7 @@ import org.apache.wicket.ajax.AjaxReques import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.CompoundPropertyModel; @@ -108,7 +110,29 @@ public class CreatePollDialog extends Ab add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410)))); add(new TextArea<String>("question")); add(new DropDownChoice<PollType>("type", getBean(PollDao.class).getTypes(getLanguage()) - , new ChoiceRenderer<PollType>("label.fieldlanguagesvalue.value", "id")) + , new IChoiceRenderer<PollType>() { + private static final long serialVersionUID = 1L; + + @Override + public Object getDisplayValue(PollType pt) { + return getString("" + pt.getLabelId()); + } + + @Override + public String getIdValue(PollType pt, int index) { + return "" + pt.getId(); + } + + @Override + public PollType getObject(String id, IModel<? extends List<? extends PollType>> choices) { + for (PollType pt : choices.getObject()) { + if (getIdValue(pt, -1).equals(id)) { + return pt; + } + } + return null; + } + }) .setRequired(true).setLabel(Model.of(Application.getString(21)))); add(feedback); } 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -20,7 +20,6 @@ package org.apache.openmeetings.web.user import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; -import static org.apache.openmeetings.web.app.WebSession.getLanguage; import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.openmeetings.web.util.RoomTypeDropDown.getRoomTypes; @@ -58,6 +57,7 @@ import org.apache.wicket.markup.html.bas import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.form.TextField; @@ -308,7 +308,29 @@ public class AppointmentDialog extends A add(new DropDownChoice<AppointmentReminderType>( "remind" , remindTypes - , new ChoiceRenderer<AppointmentReminderType>("label.value", "id"))); + , new IChoiceRenderer<AppointmentReminderType>() { + private static final long serialVersionUID = 1L; + + @Override + public Object getDisplayValue(AppointmentReminderType art) { + return getString("" + art.getLabelId()); + } + + @Override + public String getIdValue(AppointmentReminderType art, int index) { + return "" + art.getId(); + } + + @Override + public AppointmentReminderType getObject(String id, IModel<? extends List<? extends AppointmentReminderType>> choices) { + for (AppointmentReminderType art : choices.getObject()) { + if (getIdValue(art, -1).equals(id)) { + return art; + } + } + return null; + } //new ChoiceRenderer<AppointmentReminderType>("label.value", "id") + })); add(roomType.setEnabled(createRoom).setOutputMarkupId(true)); @@ -338,7 +360,7 @@ public class AppointmentDialog extends A } private List<AppointmentReminderType> getRemindTypes() { - return getBean(AppointmentReminderTypDao.class).getList(getLanguage()); + return getBean(AppointmentReminderTypDao.class).get(); } private List<Room> getRoomList() { Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Wed Jun 3 10:59:16 2015 @@ -205,7 +205,7 @@ public class MessageDialog extends Abstr p.setOwner(to); p.setFolderId(INBOX_FOLDER_ID); msgDao.update(p, getUserId()); - if (to.getAdresses() != null) { + if (to.getAddress() != null) { String aLinkHTML = (isPrivate && to.getType() == Type.user) ? "<br/><br/>" + "<a href='" + getContactsLink() + "'>" + Application.getString(1302) + "</a><br/>" : ""; String invitation_link = ""; @@ -228,7 +228,7 @@ public class MessageDialog extends Abstr } } - getBean(MailHandler.class).send(to.getAdresses().getEmail(), + getBean(MailHandler.class).send(to.getAddress().getEmail(), Application.getString(1301) + p.getSubject(), (p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitation_link); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Wed Jun 3 10:59:16 2015 @@ -168,7 +168,7 @@ public class MessagesContactsPanel exten } private String getEmail(User u) { - return u == null || u.getAdresses() == null ? "" : u.getAdresses().getEmail(); + return u == null || u.getAddress() == null ? "" : u.getAddress().getEmail(); } private void selectMessage(long id, AjaxRequestTarget target) { Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html Wed Jun 3 10:59:16 2015 @@ -60,23 +60,23 @@ <table wicket:id="address"> <tr> <td><wicket:message key="607" /></td> - <td><span wicket:id="adresses.phone"></span></td> + <td><span wicket:id="address.phone"></span></td> </tr> <tr> <td><wicket:message key="139" /></td> - <td><span wicket:id="adresses.street"></span> <span wicket:id="adresses.additionalname"></span></td> + <td><span wicket:id="address.street"></span> <span wicket:id="address.additionalname"></span></td> </tr> <tr> <td><wicket:message key="140" /></td> - <td><span wicket:id="adresses.zip"></span> <span wicket:id="adresses.town"></span></td> + <td><span wicket:id="address.zip"></span> <span wicket:id="address.town"></span></td> </tr> <tr> <td><wicket:message key="141" /></td> - <td><span wicket:id="adresses.states.name"></span></td> + <td><span wicket:id="address.state.name"></span></td> </tr> <tr> <td><wicket:message key="142" /></td> - <td><span wicket:id="adresses.comment"></span></td> + <td><span wicket:id="address.comment"></span></td> </tr> </table> <div wicket:id="addressDenied"></div> Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Wed Jun 3 10:59:16 2015 @@ -55,13 +55,13 @@ public class UserProfilePanel extends Us || (model.getObject().isShowContactDataToContacts() && getBean(UserContactsDao.class).checkUserContacts(model.getObject().getId(), getUserId()) > 0)) { addressDenied.setVisible(false); - address.add(new Label("adresses.phone")); - address.add(new Label("adresses.street")); - address.add(new Label("adresses.additionalname")); - address.add(new Label("adresses.zip")); - address.add(new Label("adresses.town")); - address.add(new Label("adresses.states.name")); - address.add(new Label("adresses.comment")); + address.add(new Label("address.phone")); + address.add(new Label("address.street")); + address.add(new Label("address.additionalname")); + address.add(new Label("address.zip")); + address.add(new Label("address.town")); + address.add(new Label("address.state.name")); + address.add(new Label("address.comment")); } else { address.setVisible(false); addressDenied.setDefaultModelObject(Application.getString(Boolean.TRUE.equals(model.getObject().isShowContactDataToContacts()) ? 1269 : 1268)); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java Wed Jun 3 10:59:16 2015 @@ -104,7 +104,7 @@ public class RoomsPanel extends UserPane @Override protected void populateItem(final ListItem<Client> item) { Client client = item.getModelObject(); - final Long userId = client.getUser_id(); + final Long userId = client.getUserId(); item.add(new Image("clientImage", new ByteArrayResource("image/jpeg") { private static final long serialVersionUID = 1L; Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Wed Jun 3 10:59:16 2015 @@ -56,8 +56,8 @@ public class ContactsHelper { getBean(PrivateMessagesDao.class).addPrivateMessage( subj, message, 0L, user, userToAdd, userToAdd, false, null, true, userContactId); - if (userToAdd.getAdresses() != null) { - getBean(MailHandler.class).send(userToAdd.getAdresses().getEmail(), subj, message); + if (userToAdd.getAddress() != null) { + getBean(MailHandler.class).send(userToAdd.getAddress().getEmail(), subj, message); } return userContactId; @@ -82,7 +82,7 @@ public class ContactsHelper { dao.addUserContact(user.getId(), getUserId(), false, ""); - if (user.getAdresses() != null) { + if (user.getAddress() != null) { String message = RequestContactConfirmTemplate.getEmail(contact); String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + Application.getString(1198); @@ -91,7 +91,7 @@ public class ContactsHelper { subj, message, 0L, contact.getContact(), user, user, false, null, false, 0L); - getBean(MailHandler.class).send(user.getAdresses().getEmail(), subj, message); + getBean(MailHandler.class).send(user.getAddress().getEmail(), subj, message); } return userContactId; } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Wed Jun 3 10:59:16 2015 @@ -204,12 +204,12 @@ 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.getOrganizationId() == null || getBean(OrganisationUserDao.class).isUserInOrganization(r.getOrganizationId(), getUserId())) { return r; } //TODO external group check was added for plugin recording download String extType = getExternalType(); - if (extType != null && extType.equals(r.getCreator().getExternalUserType())) { + if (extType != null && extType.equals(r.getCreator().getExternalType())) { return r; } return null; 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -19,25 +19,46 @@ package org.apache.openmeetings.web.util; import static org.apache.openmeetings.web.app.Application.getBean; -import static org.apache.openmeetings.web.app.WebSession.getLanguage; import java.util.List; import org.apache.openmeetings.db.dao.room.RoomTypeDao; import org.apache.openmeetings.db.entity.room.RoomType; -import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; +import org.apache.wicket.markup.html.form.IChoiceRenderer; +import org.apache.wicket.model.IModel; public class RoomTypeDropDown extends DropDownChoice<RoomType> { private static final long serialVersionUID = 1L; public static List<RoomType> getRoomTypes() { - return getBean(RoomTypeDao.class).getAll(getLanguage()); + return getBean(RoomTypeDao.class).get(); } public RoomTypeDropDown(String id) { super(id); setChoices(getRoomTypes()); - setChoiceRenderer(new ChoiceRenderer<RoomType>("label.value", "id")); + setChoiceRenderer(new IChoiceRenderer<RoomType>() { + private static final long serialVersionUID = 1L; + + @Override + public String getIdValue(RoomType rt, int index) { + return "" + rt.getId(); + } + + public Object getDisplayValue(RoomType rt) { + return getString("" + rt.getLabelId()); + } + + @Override + public RoomType getObject(String id, IModel<? extends List<? extends RoomType>> choices) { + for (RoomType rt : choices.getObject()) { + if (getIdValue(rt, -1).equals(id)) { + return rt; + } + } + return null; + } + }); } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Wed Jun 3 10:59:16 2015 @@ -97,14 +97,14 @@ <bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.core.converter.FlvRecorderConverter" /> <bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.webservice.cluster.SlaveHTTPConnectionManager" /> - <bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.service.quartz.scheduler.SessionClearJob" /> + <bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.service.quartz.scheduler.SessionClearJob"> + <property name="timeout" value="1800000"/><!-- 30 minutes --> + </bean> <bean id="sessionClearJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> <property name="targetObject"> <ref bean="openmeetings.SessionClearJob" /> </property> - <property name="targetMethod"> - <value>doIt</value> - </property> + <property name="targetMethod" value="doIt" /> <property name="concurrent" value="false" /> </bean> <bean id="triggerSessionClear" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"> @@ -112,14 +112,8 @@ <!-- see the example of method invoking job above --> <ref bean="sessionClearJob" /> </property> - <property name="startDelay"> - <!-- 5 seconds --> - <value>5000</value> - </property> - <property name="repeatInterval"> - <!-- repeat every 300 seconds == 5 minutes --> - <value>300000</value> - </property> + <property name="startDelay" value="5000"/><!-- 5 seconds --> + <property name="repeatInterval" value="300000" /><!-- repeat every 300 seconds == 5 minutes --> </bean> <bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.service.quartz.scheduler.MeetingReminderJob" /> @@ -127,9 +121,7 @@ <property name="targetObject"> <ref bean="openmeetings.MeetingReminderJob" /> </property> - <property name="targetMethod"> - <value>doIt</value> - </property> + <property name="targetMethod" value="doIt"/> <property name="concurrent" value="false" /> </bean> <bean id="triggerMeetingReminder" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"> @@ -137,35 +129,23 @@ <!-- see the example of method invoking job above --> <ref bean="meetingReminderClear" /> </property> - <property name="startDelay"> - <!-- 5 seconds --> - <value>5000</value> - </property> - <property name="repeatInterval"> - <!-- repeat every 100 seconds --> - <value>100000</value> - </property> + <property name="startDelay" value="5000"/><!-- 5 seconds --> + <property name="repeatInterval" value="100000"/><!-- repeat every 100 seconds --> </bean> <bean id="testSetupCleanupJob" class="org.apache.openmeetings.service.quartz.scheduler.TestSetupCleanupJob" /> <bean id="testSetupCleanup" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> <property name="targetObject"> <ref bean="testSetupCleanupJob" /> </property> - <property name="targetMethod"> - <value>doIt</value> - </property> + <property name="targetMethod" value="doIt"/> <property name="concurrent" value="false" /> </bean> <bean id="triggerTestSetupCleanup" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"> <property name="jobDetail"> <ref bean="testSetupCleanup" /> </property> - <property name="startDelay"> - <value>1800000</value> <!-- 30 minutes --> - </property> - <property name="repeatInterval"> - <value>1800000</value> <!-- 30 minutes --> - </property> + <property name="startDelay" value="1800000"/><!-- 30 minutes --> + <property name="repeatInterval" value="1800000"/> <!-- 30 minutes --> </bean> <!-- Mail related jobs --> @@ -174,41 +154,29 @@ <property name="targetObject"> <ref bean="mailHandler" /> </property> - <property name="targetMethod"> - <value>resetSendingStatus</value> - </property> + <property name="targetMethod" value="resetSendingStatus"/> <property name="concurrent" value="false" /> </bean> <bean id="triggerResetSendingMailStatus" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"> <property name="jobDetail"> <ref bean="resetSendingMailStatus" /> </property> - <property name="startDelay"> - <value>60000</value> <!-- 1 minute --> - </property> - <property name="repeatInterval"> - <value>900000</value> <!-- 15 minutes --> - </property> + <property name="startDelay" value="60000"/> <!-- 1 minute --> + <property name="repeatInterval" value="900000"/> <!-- 15 minutes --> </bean> <bean id="sendMails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> <property name="targetObject"> <ref bean="mailHandler" /> </property> - <property name="targetMethod"> - <value>sendMails</value> - </property> + <property name="targetMethod" value="sendMails"/> <property name="concurrent" value="false" /> </bean> <bean id="triggerSendMails" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"> <property name="jobDetail"> <ref bean="sendMails" /> </property> - <property name="startDelay"> - <value>60000</value> <!-- 1 minute --> - </property> - <property name="repeatInterval"> - <value>60000</value> <!-- 1 minute --> - </property> + <property name="startDelay" value="60000"/> <!-- 1 minute --> + <property name="repeatInterval" value="60000"/> <!-- 1 minute --> </bean> <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -79,8 +79,8 @@ public abstract class AbstractJUnitDefau if (configKeyCryptClassName == null) { assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey()); } - remindTypes = reminderTypeDao.getList(1L); - roomTypes = roomTypeDao.getAll(1L); + remindTypes = reminderTypeDao.get(); + roomTypes = roomTypeDao.get(); } public Appointment createAppointment() { Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Wed Jun 3 10:59:16 2015 @@ -52,7 +52,7 @@ public class TestAppointmentAddAppointme String appointmentName = "Test 01"; String appointmentDescription = "Descr"; - Long users_id = 1L; + Long userId = 1L; String appointmentLocation = "office"; Boolean isMonthly = false; Boolean isDaily = false; @@ -65,15 +65,15 @@ public class TestAppointmentAddAppointme mmClient[0] = createClientObj("firstname" + i, "lastname" + i, "first" + i + ".last" + i + "@webbase-design.de", "Etc/GMT+1"); } - Long language_id = 1L; + Long languageId = 1L; Long roomType = 1L; Appointment a = appointmentLogic.getAppointment(appointmentName, appointmentLocation, appointmentDescription, start, end, isDaily, isWeekly, isMonthly, isYearly, categoryId, remind, mmClient, - roomType, language_id, false, "", -1, users_id); - a = appointmentDao.update(a, users_id); + roomType, languageId, false, "", -1, userId); + a = appointmentDao.update(a, userId); Thread.sleep(3000); 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -48,21 +48,14 @@ public class TestDatabaseStructureAppoin cal.getTime(); reminderTypeDao.add(1L, "test 5 min", -1); - List<AppointmentReminderType> listAppoints = reminderTypeDao.getList(1); + List<AppointmentReminderType> listAppoints = reminderTypeDao.get(); log.debug("Anzahl: " + listAppoints.size()); for (AppointmentReminderType appoints : listAppoints) { - // log.debug("Termin: "+appoints.getAppointmentName()+" startDate: "+appoints.getAppointmentStarttime()+ - // " endDate: "+appoints.getAppointmentEndtime()); log.debug("AppointmentReminderType: " + appoints.getName()); } - // for (Iterator<Appointment> iter = - // listAppoints.iterator();iter.hasNext();) { - // log.debug(iter.next()); - // } - } catch (Exception err) { log.error("[testAddingGroup]", err); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Wed Jun 3 10:59:16 2015 @@ -42,13 +42,6 @@ public class TestDatabaseStructureUsersS List<User> users = userDao.get("first", 0, 10, "lastname", false, 1); log.debug("[result]" + users.size()); log.debug("[records]"+ users); - - //GroupMemberDaoImpl.getInstance().addGroupMember("Ad", "dir", Calendar.getInstance().getTime(), "1", "2", "interpol155", 1L, 1L); - //GroupMemberDaoImpl.getInstance().addGroupMember(firstname, lastname, age, memberStatus, appointmentStatus, password, adresses_id, appointmentId); - - //GroupMemberDaoImpl.getInstance().getGroupMemberById(1L); - //GroupMemberDaoImpl.getInstance().deleteGroupMember(2L); - //GroupMemberDaoImpl.getInstance().updateGroupMember(1L, "Eugen", "Schwert", Calendar.getInstance().getTime(), "1", "2", "interpol155", 1L, 1L); } catch (Exception err) { log.error("[testAddingGroup]",err); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java Wed Jun 3 10:59:16 2015 @@ -56,7 +56,7 @@ public class TestConfig extends Abstract List<Configuration> list = configurationDao.get(4, 6); for (Configuration conf : list) { - log.error("conf.getConf_key() " + conf.getConf_key()); + log.error("conf.getKey() " + conf.getKey()); log.error("conf.getUser() " + conf.getUser()); if (conf.getUser() != null) { log.error("conf.getUsers() " + conf.getUser().getLogin()); 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -55,6 +55,6 @@ public class TestAddGroup extends Abstra us = usersDao.update(us, null); log.error(us.getLastname()); - log.error(us.getAdresses().getTown()); + log.error(us.getAddress().getTown()); } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java Wed Jun 3 10:59:16 2015 @@ -45,11 +45,11 @@ public class TestInvitation extends Abst public void testSendInvitationLink() { Sessiondata sessionData = sessDao.startsession(); - Long uid = userWebService.login(sessionData.getSession_id(), username, userpass); + Long uid = userWebService.login(sessionData.getSessionId(), username, userpass); User us = userDao.get(uid); String date = new SimpleDateFormat("dd.MM.yyyy").format(new Date()); - invitationService.sendInvitationHash(sessionData.getSession_id(), "Testname", "Testlastname", "message", "[email protected]", + invitationService.sendInvitationHash(sessionData.getSessionId(), "Testname", "Testlastname", "message", "[email protected]", "subject", 1L, "", false, "", 1, date, "12:00", date, "14:00", 1L, us.getTimeZoneId(), true); } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java Wed Jun 3 10:59:16 2015 @@ -38,19 +38,19 @@ public class TestNavi extends AbstractJU @Test public void testGetNavi(){ - List<Naviglobal> ll = navimanagement.getMainMenu(true, 1L); + List<Naviglobal> ll = navimanagement.getMainMenu(true); assertTrue("GlobalNavi size should be greater than zero: " + ll.size(), ll.size() > 0); System.out.println("NaviGlobal size: " + ll.size()); for (Naviglobal navigl : ll) { assertNotNull("Naviglobal retrieved should not be null", navigl); - System.out.println("Naviglobal label: " + navigl.getLevel_id()); + System.out.println("Naviglobal label: " + navigl.getLevelId()); assertNotNull("Naviglobal retrieved should have Navimain entries", navigl.getMainnavi()); for (Navimain navim : navigl.getMainnavi()) { assertNotNull("Navimain retrieved should not be null", navim); - System.out.println("-->" + navim.getFieldvalues_id()); + System.out.println("-->" + navim.getLabelId()); } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java Wed Jun 3 10:59:16 2015 @@ -36,7 +36,7 @@ import org.springframework.beans.factory public abstract class AbstractTestDefaults extends AbstractSpringTest { @Autowired - private LabelDao fieldLanguagesValuesDao; + private LabelDao labelDao; public WebDriver driver = null; @@ -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()); } /** Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java Wed Jun 3 10:59:16 2015 @@ -64,24 +64,24 @@ public class TestDbSession extends Abstr Client cl1 = new Client(); cl1.setStreamid("1"); cl1.setServer(null); - cl1.setUser_id(1L); - cl1.setRoom_id(1L); + cl1.setUserId(1L); + cl1.setRoomId(1L); cl1.setPublicSID("public1"); clientDao.add(cl1); Client cl2 = new Client(); cl2.setStreamid("2"); cl2.setServer(null); - cl2.setRoom_id(1L); - cl2.setUser_id(2L); + cl2.setRoomId(1L); + cl2.setUserId(2L); cl2.setPublicSID("public2"); clientDao.add(cl2); Client cl3 = new Client(); cl3.setStreamid("3"); cl3.setServer(server); - cl3.setRoom_id(3L); - cl3.setUser_id(3L); + cl3.setRoomId(3L); + cl3.setUserId(3L); cl3.setPublicSID("public3"); clientDao.add(cl3); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Wed Jun 3 10:59:16 2015 @@ -64,24 +64,24 @@ public class TestDbSessionGetRoomIds ext Client cl1 = new Client(); cl1.setStreamid("1"); cl1.setServer(server); - cl1.setUser_id(1L); - cl1.setRoom_id(1L); + cl1.setUserId(1L); + cl1.setRoomId(1L); cl1.setPublicSID("public1"); clientDao.add(cl1); Client cl2 = new Client(); cl2.setStreamid("2"); cl2.setServer(server); - cl2.setRoom_id(1L); - cl2.setUser_id(2L); + cl2.setRoomId(1L); + cl2.setUserId(2L); cl2.setPublicSID("public2"); clientDao.add(cl2); Client cl3 = new Client(); cl3.setStreamid("3"); cl3.setServer(server); - cl3.setRoom_id(3L); - cl3.setUser_id(3L); + cl3.setRoomId(3L); + cl3.setUserId(3L); cl3.setPublicSID("public3"); clientDao.add(cl3); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java Wed Jun 3 10:59:16 2015 @@ -34,9 +34,9 @@ public class TestStateToLower extends Ab @Test public void doTestQuery() { - State state_alabania = stateDao.getStateByName("Albania"); + State state_alabania = stateDao.get("Albania"); - State state_alabania_lower = stateDao.getStateByName("albaNia"); + State state_alabania_lower = stateDao.get("albaNia"); assertTrue(state_alabania != null); assertTrue(state_alabania_lower != null); 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=1683280&r1=1683279&r2=1683280&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 Wed Jun 3 10:59:16 2015 @@ -77,7 +77,7 @@ public class TestUserContact extends Abs assertFalse("User list should not be empty ", users.isEmpty()); User contact = createUserContact(random.nextInt(), getUserId()); - String email = contact.getAdresses().getEmail(); + String email = contact.getAddress().getEmail(); List<User> l = userDao.get(email, false, 0, 9999); // check that contact is visible for admin assertNotNull("Contact list should not be null for admin ", l); @@ -94,7 +94,7 @@ public class TestUserContact extends Abs User u = createUser(random.nextInt()); User u1 = createUser(random.nextInt()); contact = createUserContact(random.nextInt(), u.getId()); - email = contact.getAdresses().getEmail(); + email = contact.getAddress().getEmail(); // check that contact is not visible for user that is not owner of this contact l = userDao.get(email, 0, 9999, null, true, u1.getId()); assertTrue("Contact list should be empty for another user", l.isEmpty()); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java Wed Jun 3 10:59:16 2015 @@ -33,7 +33,7 @@ public class TestAuth extends AbstractJU public void testTestAuth() { Sessiondata sessionData = sessionDao.startsession(); - System.out.println("sessionData: " + sessionData.getSession_id()); + System.out.println("sessionData: " + sessionData.getSessionId()); String tTemp = ManageCryptStyle.getInstanceOfCrypt().createPassPhrase("test");
