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=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java Mon Jun 23 08:47:06 2014 @@ -45,7 +45,7 @@ public class TestAddGroup extends Abstra Organisation o = new Organisation(); o.setName("default"); o = orgDao.update(o, null); - assertNotNull("Id of organisation created should not be null", o.getOrganisation_id()); + assertNotNull("Id of organisation created should not be null", o.getId()); User us = usersDao.get(1L); assertNotNull("User should exist", us);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java Mon Jun 23 08:47:06 2014 @@ -45,7 +45,7 @@ public class TestUserGroupAggregation ex assertTrue("Default user must belong to at least one organisation", u.getOrganisation_users().size() > 0); for (Organisation_Users orgUserObj : u.getOrganisation_users()) { - log.error("testitNow: organisation Id: '" + orgUserObj.getOrganisation().getOrganisation_id() + "'; name: '" + orgUserObj.getOrganisation().getName() + "'"); + log.error("testitNow: organisation Id: '" + orgUserObj.getOrganisation().getId() + "'; name: '" + orgUserObj.getOrganisation().getName() + "'"); } } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java Mon Jun 23 08:47:06 2014 @@ -88,7 +88,7 @@ public class FillLabels extends Abstract FieldLanguage prevLanguage = null; long prevCount = -1; for (FieldLanguage l : fieldLanguageDao.getLanguages()) { - long count = fieldValueDao.count(l.getLanguage_id(), null); + long count = fieldValueDao.count(l.getId(), null); if (prevLanguage != null) { assertEquals(String.format("Language: %s contains %d labels while %s contains %d labels" , prevLanguage.getCode(), prevCount, l.getCode(), count), prevCount, count); @@ -161,7 +161,7 @@ public class FillLabels extends Abstract String fieldName = itemObject.attribute("name").getText(); String value = itemObject.element("value").getText(); Fieldvalues fLabel = new Fieldvalues(); - fLabel.setFieldvalues_id(fieldvalues_id); + fLabel.setId(fieldvalues_id); fLabel.setName(fieldName); Fieldlanguagesvalues fValue = new Fieldlanguagesvalues(); fValue.setValue(value); @@ -187,7 +187,7 @@ public class FillLabels extends Abstract for (Entry<Long, Fieldlanguagesvalues> entryLabel : labelsArray.entrySet()) { Element eTemp = root.addElement("string") - .addAttribute("id", entryLabel.getValue().getFieldvalues().getFieldvalues_id().toString()) + .addAttribute("id", entryLabel.getValue().getFieldvalues().getId().toString()) .addAttribute("name", entryLabel.getValue().getFieldvalues().getName()); Element value = eTemp.addElement("value"); value.addText(entryLabel.getValue().getValue()); Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java Mon Jun 23 08:47:06 2014 @@ -34,7 +34,7 @@ public class TestPollManagement extends public void addPollType() { long maxId = 1; for (PollType pt : pollManager.getPollTypes()) { - maxId = Math.max(maxId, pt.getPollTypesId()); + maxId = Math.max(maxId, pt.getId()); } assertNotNull("Poll created is null", pollManager.addPollType(26L, false)); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java Mon Jun 23 08:47:06 2014 @@ -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/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=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Mon Jun 23 08:47:06 2014 @@ -53,9 +53,9 @@ public class TestUserContact extends Abs User u = getUser(rnd); u.getOrganisation_users().add(new Organisation_Users(orgDao.get(1L))); u = userDao.update(u, null); - assertTrue("Password should be set as expected", userDao.verifyPassword(u.getUser_id(), "pass" + rnd)); + assertTrue("Password should be set as expected", userDao.verifyPassword(u.getId(), "pass" + rnd)); - User u1 = userDao.get(u.getUser_id()); + User u1 = userDao.get(u.getId()); assertNotNull("Just created user should not be null", u1); assertNotNull("Just created user should have non null org-users", u1.getOrganisation_users()); assertFalse("Just created user should have not empty org-users", u1.getOrganisation_users().isEmpty()); @@ -65,7 +65,7 @@ public class TestUserContact extends Abs public void createUser() throws Exception { int rnd = random.nextInt(); User u = createUser(rnd); - assertTrue("Password should be set as expected", userDao.verifyPassword(u.getUser_id(), "pass" + rnd)); + assertTrue("Password should be set as expected", userDao.verifyPassword(u.getId(), "pass" + rnd)); } @Test @@ -93,13 +93,13 @@ public class TestUserContact extends Abs User u = createUser(random.nextInt()); User u1 = createUser(random.nextInt()); - contact = createUserContact(random.nextInt(), u.getUser_id()); + contact = createUserContact(random.nextInt(), u.getId()); email = contact.getAdresses().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.getUser_id()); + l = userDao.get(email, 0, 9999, null, true, u1.getId()); assertTrue("Contact list should be empty for another user", l.isEmpty()); //delete contact - userDao.delete(contact, u.getUser_id()); + userDao.delete(contact, u.getId()); l = userDao.get(email, false, 0, 9999); assertTrue("Contact list should be empty after deletion", l.isEmpty()); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java Mon Jun 23 08:47:06 2014 @@ -35,27 +35,27 @@ public class TestUserCount extends Abstr Random random = new Random(); @Test - public void testCountSearchUsres() throws Exception { + public void testCountSearchUsers() throws Exception { User u = createUser(random.nextInt()); assertTrue("Account of search users should be one", userDao.count(u.getFirstname()) == 1); } @Test - public void testCountFilteredUsres() throws Exception { + public void testCountFilteredUsers() throws Exception { User u = createUser(random.nextInt()); - User contact = createUserContact(random.nextInt(), u.getUser_id()); - assertTrue("Account of filtered user should be one", userDao.count(contact.getFirstname(), true, u.getUser_id()) == 1); + User contact = createUserContact(random.nextInt(), u.getId()); + assertTrue("Account of filtered user should be one", userDao.count(contact.getFirstname(), true, u.getId()) == 1); } @Test - public void testCountUnfilteredUsres() throws Exception { + public void testCountUnfilteredUsers() throws Exception { User u = createUser(random.nextInt()); - createUserContact(random.nextInt(), u.getUser_id()); + createUserContact(random.nextInt(), u.getId()); assertTrue("Account of unfiltered should be more then one", userDao.count("firstname", false, getUserId()) > 1); } @Test - public void testCountAllUsres() throws Exception { + public void testCountAllUsers() throws Exception { assertTrue("Account of users should be positive", userDao.count() > 0); } } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java Mon Jun 23 08:47:06 2014 @@ -58,19 +58,19 @@ public class TestUserOrganisation extend @Test public void getUsersByOrganisationId() { User u = getValidUser(); - Long orgId = u.getOrganisation_users().get(0).getOrganisation().getOrganisation_id(); + Long orgId = u.getOrganisation_users().get(0).getOrganisation().getId(); List<Organisation_Users> ul = orgUserDao.get(orgId, 0, 9999); assertTrue("Default Organisation should contain at least 1 user: " + ul.size(), ul.size() > 0); - Organisation_Users ou = orgUserDao.getByOrganizationAndUser(orgId, u.getUser_id()); - assertNotNull("Unable to found [organisation, user] pair - [" + orgId + "," + u.getUser_id() + "]", ou); + Organisation_Users ou = orgUserDao.getByOrganizationAndUser(orgId, u.getId()); + assertNotNull("Unable to found [organisation, user] pair - [" + orgId + "," + u.getId() + "]", ou); } @Test public void addOrganisation() { Organisation o = new Organisation(); o.setName(ORG_NAME); - Long orgId = orgDao.update(o, null).getOrganisation_id(); //inserted by not checked + Long orgId = orgDao.update(o, null).getId(); //inserted by not checked assertNotNull("New Organisation have valid id", orgId); List<Organisation_Users> ul = orgUserDao.get(orgId, 0, 9999); Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Mon Jun 23 08:47:06 2014 @@ -327,7 +327,7 @@ public class CalendarWebService { if (AuthLevelUtil.hasUserLevel(rights)) { Appointment a = appointmentDao.get(appointmentId); - if (!AuthLevelUtil.hasAdminLevel(rights) && !a.getOwner().getUser_id().equals(users_id)) { + if (!AuthLevelUtil.hasAdminLevel(rights) && !a.getOwner().getId().equals(users_id)) { throw new ServiceException("The Appointment cannot be updated by the given user"); } if (!a.getStart().equals(appointmentstart) || !a.getEnd().equals(appointmentend)) { @@ -339,7 +339,6 @@ public class CalendarWebService { } } catch (Exception err) { log.error("[updateAppointment]", err); - err.printStackTrace(); } return null; @@ -415,7 +414,7 @@ public class CalendarWebService { } else if (AuthLevelUtil.hasUserLevel(rights)) { // check if the appointment belongs to the current user Appointment a = appointmentDao.get(appointmentId); - if (!a.getOwner().getUser_id().equals(users_id)) { + if (!a.getOwner().getId().equals(users_id)) { throw new ServiceException("The Appointment cannot be updated by the given user"); } } else { @@ -481,7 +480,7 @@ public class CalendarWebService { // fine } else if (AuthLevelUtil.hasUserLevel(rights)) { // check if the appointment belongs to the current user - if (!a.getOwner().getUser_id().equals(users_id)) { + if (!a.getOwner().getId().equals(users_id)) { throw new ServiceException("The Appointment cannot be updated by the given user"); } } else { Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Mon Jun 23 08:47:06 2014 @@ -139,7 +139,7 @@ public class FileWebService { hs.put("user", externalUser); ConverterProcessResultList returnError = fileProcessor - .processFile(externalUser.getUser_id(), room_id, + .processFile(externalUser.getId(), room_id, isOwner, inputstream, parentFolderId, fileSystemName, externalFileId, externalType); @@ -223,7 +223,7 @@ public class FileWebService { hs.put("user", internalUser); ConverterProcessResultList returnError = fileProcessor - .processFile(internalUser.getUser_id(), room_id, + .processFile(internalUser.getId(), room_id, isOwner, inputstream, parentFolderId, fileSystemName, externalFileId, externalType); @@ -285,7 +285,7 @@ public class FileWebService { User userExternal = userDao.getExternalUser(externalUserId, externalType); - Long userId = userExternal.getUser_id(); + Long userId = userExternal.getId(); log.debug("addFolder " + parentFileExplorerItemId); Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java Mon Jun 23 08:47:06 2014 @@ -102,7 +102,7 @@ public class JabberWebService { User u = userDao.get(users_id); for (Organisation_Users ou : u.getOrganisation_users()) { List<RoomOrganisation> rol = conferenceService.getRoomsByOrganisationWithoutType(SID - , ou.getOrganisation().getOrganisation_id().longValue()); + , ou.getOrganisation().getId().longValue()); if (rol != null) { for (RoomOrganisation ro : rol) { rl.add(ro.getRoom()); Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Mon Jun 23 08:47:06 2014 @@ -443,10 +443,10 @@ public class RoomWebService { for (Room room : rooms) { RoomCountBean rCountBean = new RoomCountBean(); - rCountBean.setRoomId(room.getRooms_id()); + rCountBean.setRoomId(room.getId()); rCountBean.setRoomName(room.getName()); rCountBean.setMaxUser(room.getNumberOfPartizipants().intValue()); - rCountBean.setRoomCount(sessionManager.getClientListByRoom(room.getRooms_id()).size()); + rCountBean.setRoomCount(sessionManager.getClientListByRoom(room.getId()).size()); roomBeans.add(rCountBean); } @@ -494,10 +494,10 @@ public class RoomWebService { roomReturn.setCreated(room.getStarttime()); roomReturn.setCreator(null); roomReturn.setName(room.getName()); - roomReturn.setRoom_id(room.getRooms_id()); + roomReturn.setRoom_id(room.getId()); List<Client> map = sessionManager - .getClientListByRoom(room.getRooms_id()); + .getClientListByRoom(room.getId()); RoomUser[] roomUsers = new RoomUser[map.size()]; @@ -984,7 +984,7 @@ public class RoomWebService { null, externalRoomId, externalRoomType, true, false, true, false, "", false, true, false); } else { - roomId = room.getRooms_id(); + roomId = room.getId(); } return roomId; } @@ -1944,7 +1944,7 @@ public class RoomWebService { RoomReturn roomReturn = new RoomReturn(); - roomReturn.setRoom_id(room.getRooms_id()); + roomReturn.setRoom_id(room.getId()); roomReturn.setName(room.getName()); roomReturn.setCreator("SOAP"); @@ -2011,7 +2011,7 @@ public class RoomWebService { RoomReturn roomReturn = new RoomReturn(); - roomReturn.setRoom_id(room.getRooms_id()); + roomReturn.setRoom_id(room.getId()); roomReturn.setName(room.getName()); roomReturn.setCreator("SOAP"); Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Mon Jun 23 08:47:06 2014 @@ -30,7 +30,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; -import org.apache.openmeetings.core.data.basic.FieldManager; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.basic.ErrorDao; import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao; @@ -81,8 +80,6 @@ public class UserWebService { @Autowired private IUserManager userManagement; @Autowired - private FieldManager fieldManager; - @Autowired private ErrorDao errorDao; @Autowired private OrganisationDao orgDao; @@ -129,7 +126,7 @@ public class UserWebService { return -1L; } - Boolean bool = sessiondataDao.updateUser(SID, u.getUser_id(), false, u.getLanguage_id()); + Boolean bool = sessiondataDao.updateUser(SID, u.getId(), false, u.getLanguage_id()); if (bool == null) { // Exception return -1L; @@ -138,7 +135,7 @@ public class UserWebService { return -35L; } - return u.getUser_id(); + return u.getId(); } catch (OmException oe) { if (oe.getCode() != null) { return oe.getCode(); @@ -495,7 +492,7 @@ public class UserWebService { User userExternal = userDao.getExternalUser(externalUserId, externalUserType); - Long userId = userExternal.getUser_id(); + Long userId = userExternal.getId(); // Setting user deleted userDao.deleteUserID(userId); @@ -1133,7 +1130,7 @@ public class UserWebService { if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Organisation o = new Organisation(); o.setName(name); - return orgDao.update(o, users_id).getOrganisation_id(); + return orgDao.update(o, users_id).getId(); } log.error("Could not create organization"); return -1L; Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java Mon Jun 23 08:47:06 2014 @@ -95,7 +95,7 @@ public class RestClient { try { rClient.loginUser(Action.KICK_USER); } catch (Exception e) { - e.printStackTrace(); + log.error("Error", e); } } Modified: openmeetings/trunk/singlewebapp/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1604715&r1=1604714&r2=1604715&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/pom.xml (original) +++ openmeetings/trunk/singlewebapp/pom.xml Mon Jun 23 08:47:06 2014 @@ -41,7 +41,8 @@ <maven.javadoc.version>2.9.1</maven.javadoc.version> <maven.surefire.version>2.17</maven.surefire.version> <maven-site.version>3.3</maven-site.version> - <wicket.version>6.15.0</wicket.version> + <wicket.version>6.16.0</wicket.version> + <wicket.jqueryui.version>6.15.0</wicket.jqueryui.version> <red5-server.version>1.0.2-RELEASE</red5-server.version> <batik.version>1.7</batik.version> <commons-transaction.version>1.2</commons-transaction.version>
