Repository: openmeetings Updated Branches: refs/heads/3.3.x e77cd1d30 -> 4850a8191
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4850a819/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java index adcfce6..c45ee5a 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java @@ -41,12 +41,8 @@ import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.util.WebSocketHelper; -import org.apache.openmeetings.db.dao.room.IInvitationManager; import org.apache.openmeetings.db.dao.room.InvitationDao; import org.apache.openmeetings.db.dao.room.RoomDao; -import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.IUserManager; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; import org.apache.openmeetings.db.dto.basic.ServiceResult.Type; import org.apache.openmeetings.db.dto.room.InvitationDTO; @@ -58,13 +54,14 @@ import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.server.Sessiondata; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.service.room.InvitationManager; +import org.apache.openmeetings.service.user.UserManager; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.util.message.RoomMessage; import org.apache.openmeetings.webservice.error.ServiceException; import org.apache.wicket.Application; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; /** * RoomService contains methods to manipulate rooms and create invitation hash @@ -76,22 +73,9 @@ import org.springframework.beans.factory.annotation.Autowired; @Features(features = "org.apache.cxf.feature.LoggingFeature") @Produces({MediaType.APPLICATION_JSON}) @Path("/room") -public class RoomWebService { +public class RoomWebService extends BaseWebService { private static final Logger log = Red5LoggerFactory.getLogger(RoomWebService.class, webAppRootKey); - @Autowired - private SessiondataDao sessionDao; - @Autowired - private IUserManager userManager; - @Autowired - private UserDao userDao; - @Autowired - private InvitationDao invitationDao; - @Autowired - private IInvitationManager invitationManager; - @Autowired - private RoomDao roomDao; - /** * Returns an Object of Type RoomsList which contains a list of * Room-Objects. Every Room-Object contains a Roomtype and all informations @@ -110,9 +94,8 @@ public class RoomWebService { @Path("/public/{type}") public List<RoomDTO> getPublic(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("type") @WebParam(name="type") String type) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(sd.getUserId()))) { - return RoomDTO.list(roomDao.getPublicRooms(Room.Type.valueOf(type))); + if (AuthLevelUtil.hasUserLevel(getRights(sid))) { + return RoomDTO.list(getRoomDao().getPublicRooms(Room.Type.valueOf(type))); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 } @@ -135,10 +118,9 @@ public class RoomWebService { @GET @Path("/{id}") public RoomDTO getRoomById(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("id") @WebParam(name="id") Long id) throws ServiceException { - Sessiondata sd = sessionDao.check(sid); - Set<User.Right> rights = userDao.getRights(sd.getUserId()); + Set<User.Right> rights = getRights(sid); if (AuthLevelUtil.hasWebServiceLevel(rights) || AuthLevelUtil.hasUserLevel(rights)) { - return new RoomDTO(roomDao.get(id)); + return new RoomDTO(getRoomDao().get(id)); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 } @@ -173,9 +155,10 @@ public class RoomWebService { , @PathParam("externalid") @WebParam(name="externalid") Long externalId , @WebParam(name="room") @QueryParam("room") RoomDTO room) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { + RoomDao roomDao = getRoomDao(); Room r = roomDao.getExternal(Room.Type.valueOf(type), externalType, externalId); if (r == null) { r = room.get(); @@ -211,11 +194,11 @@ public class RoomWebService { @Path("/") public RoomDTO add(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="room") @FormParam("room") RoomDTO room) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { Room r = room.get(); - r = roomDao.update(r, userId); + r = getRoomDao().update(r, userId); return new RoomDTO(r); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 @@ -276,9 +259,10 @@ public class RoomWebService { @DELETE @Path("/{id}") public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException { - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { + RoomDao roomDao = getRoomDao(); Room r = roomDao.get(id); if (r != null) { roomDao.delete(r, userId); @@ -311,11 +295,12 @@ public class RoomWebService { @Path("/close/{id}") public ServiceResult close(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); log.debug("close " + id); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { + RoomDao roomDao = getRoomDao(); Room room = roomDao.get(id); room.setClosed(true); @@ -356,11 +341,12 @@ public class RoomWebService { @Path("/open/{id}") public ServiceResult open(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); log.debug("open " + id); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { + RoomDao roomDao = getRoomDao(); Room room = roomDao.get(id); room.setClosed(false); roomDao.update(room, userId); @@ -394,9 +380,8 @@ public class RoomWebService { @Path("/kick/{id}") public ServiceResult kick(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { - boolean result = userManager.kickUserByStreamId(sid, id); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { + boolean result = getBean(UserManager.class).kickUserByStreamId(sid, id); return new ServiceResult(result ? 1L : 0L, "Kicked", Type.SUCCESS); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 @@ -423,10 +408,9 @@ public class RoomWebService { public List<RoomCountDTO> counters(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @QueryParam("id") List<Long> ids) throws ServiceException { List<RoomCountDTO> roomBeans = new ArrayList<>(); try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { IApplication app = (IApplication)Application.get(OpenmeetingsVariables.wicketApplicationName); - List<Room> rooms = roomDao.get(ids); + List<Room> rooms = getRoomDao().get(ids); for (Room room : rooms) { RoomCountDTO rCountBean = new RoomCountDTO(); @@ -467,15 +451,15 @@ public class RoomWebService { ) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { - Invitation i = invite.get(userId, userDao, roomDao); - i = invitationDao.update(i); + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { + Invitation i = invite.get(userId, getUserDao(), getRoomDao()); + i = getBean(InvitationDao.class).update(i); if (i != null) { if (sendmail) { - invitationManager.sendInvitationLink(i, MessageType.Create, invite.getSubject(), invite.getMessage(), false); + getBean(InvitationManager.class).sendInvitationLink(i, MessageType.Create, invite.getSubject(), invite.getMessage(), false); } return new ServiceResult(1L, i.getHash(), Type.SUCCESS); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4850a819/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java index 919f9df..7c66512 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java @@ -37,8 +37,6 @@ import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; import org.apache.openmeetings.db.dao.server.ServerDao; -import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; import org.apache.openmeetings.db.dto.basic.ServiceResult.Type; import org.apache.openmeetings.db.dto.server.ServerDTO; @@ -48,32 +46,28 @@ import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.webservice.error.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; /** * This class provides method implementations necessary for OM to manage servers * participating in cluster. - * + * * @author solomax, sebawagner - * + * */ @WebService(serviceName="org.apache.openmeetings.webservice.ServerWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.feature.LoggingFeature") @Produces({MediaType.APPLICATION_JSON}) @Path("/server") -public class ServerWebService { +public class ServerWebService extends BaseWebService { private static final Logger log = Red5LoggerFactory.getLogger(ServerWebService.class, webAppRootKey); - @Autowired - private SessiondataDao sessionDao; - @Autowired - private UserDao userDao; - @Autowired - private ServerDao serverDao; + private static ServerDao getDao() { + return getBean(ServerDao.class); + } /** * Method to retrieve the list of the servers participating in cluster - * + * * @param sid * - session id to identify the user making request * @param start @@ -91,10 +85,8 @@ public class ServerWebService { ) throws ServiceException { log.debug("getServers enter"); - Sessiondata sd = sessionDao.check(sid); - - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { - return ServerDTO.list(serverDao.get(start, max)); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { + return ServerDTO.list(getDao().get(start, max)); } else { log.warn("Insuffisient permissions"); throw new ServiceException("Insufficient permissions"); //TODO code -26 @@ -104,7 +96,7 @@ public class ServerWebService { /** * Method to retrieve the total count of the servers participating in * cluster - * + * * @param sid * - session id to identify the user making request * @return total count of the servers participating in cluster @@ -114,10 +106,8 @@ public class ServerWebService { @Path("/count") public long count(@QueryParam("sid") @WebParam(name="sid") String sid) throws ServiceException { log.debug("getServerCount enter"); - Sessiondata sd = sessionDao.check(sid); - - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { - return serverDao.count(); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { + return getDao().count(); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 } @@ -125,7 +115,7 @@ public class ServerWebService { /** * Method to add/update server - * + * * @param sid * - session id to identify the user making request * @param server @@ -137,11 +127,11 @@ public class ServerWebService { @Path("/") public ServerDTO add(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="server") @QueryParam("server") ServerDTO server) throws ServiceException { log.debug("saveServerCount enter"); - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { Server s = server.get(); - return new ServerDTO(serverDao.update(s, userId)); + return new ServerDTO(getDao().update(s, userId)); } else { log.warn("Insuffisient permissions"); throw new ServiceException("Insufficient permissions"); //TODO code -26 @@ -150,7 +140,7 @@ public class ServerWebService { /** * Method to delete server - * + * * @param sid * - session id to identify the user making request * @param id @@ -162,10 +152,11 @@ public class ServerWebService { @Path("/{id}") public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException { log.debug("saveServerCount enter"); - Sessiondata sd = sessionDao.check(sid); + Sessiondata sd = check(sid); Long userId = sd.getUserId(); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { + ServerDao serverDao = getDao(); Server s = serverDao.get(id); if (s != null) { serverDao.delete(s, userId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4850a819/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index 814f5d1..858a745 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -47,8 +47,6 @@ import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.util.StrongPasswordValidator; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.server.SOAPLoginDao; -import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.IUserManager; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; import org.apache.openmeetings.db.dto.basic.ServiceResult.Type; @@ -61,6 +59,7 @@ import org.apache.openmeetings.db.entity.user.Address; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.service.user.UserManager; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.webservice.cluster.UserService; @@ -73,7 +72,6 @@ import org.apache.wicket.validation.Validatable; import org.apache.wicket.validation.ValidationError; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; /** * @@ -87,18 +85,8 @@ import org.springframework.beans.factory.annotation.Autowired; @Features(features = "org.apache.cxf.feature.LoggingFeature") @Produces({MediaType.APPLICATION_JSON}) @Path("/user") -public class UserWebService implements UserService { +public class UserWebService extends BaseWebService implements UserService { private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey); - @Autowired - private ConfigurationDao cfgDao; - @Autowired - private IUserManager userManagement; - @Autowired - private SOAPLoginDao soapLoginDao; - @Autowired - private UserDao userDao; - @Autowired - private SessiondataDao sessionDao; /* (non-Javadoc) * @see org.apache.openmeetings.webservice.cluster.UserService#login(java.lang.String, java.lang.String) @@ -110,12 +98,12 @@ public class UserWebService implements UserService { public ServiceResult login(@WebParam(name="user") @QueryParam("user") String user, @WebParam(name="pass") @QueryParam("pass") String pass) { try { log.debug("Login user"); - User u = userDao.login(user, pass); + User u = getUserDao().login(user, pass); if (u == null) { return new ServiceResult(-1L, "Login failed", Type.ERROR); } - Sessiondata sd = sessionDao.create(u.getId(), u.getLanguageId()); + Sessiondata sd = getSessionDao().create(u.getId(), u.getLanguageId()); log.debug("Login user: {}", u.getId()); return new ServiceResult(u.getId(), sd.getSessionId(), Type.SUCCESS); } catch (OmException oe) { @@ -135,9 +123,8 @@ public class UserWebService implements UserService { @Path("/") public List<UserDTO> get(@WebParam(name="sid") @QueryParam("sid") String sid) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { - return UserDTO.list(userDao.getAllUsers()); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { + return UserDTO.list(getUserDao().getAllUsers()); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 } @@ -161,15 +148,20 @@ public class UserWebService implements UserService { ) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { + Sessiondata sd = check(sid); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sd.getUserId()))) { + UserDao userDao = getUserDao(); User testUser = userDao.getExternalUser(user.getExternalId(), user.getExternalType()); if (testUser != null) { throw new ServiceException("User does already exist!"); } - String jName_timeZone = cfgDao.getConfValue("default.timezone", String.class, ""); + ConfigurationDao cfgDao = getBean(ConfigurationDao.class); + String tz = user.getTimeZoneId(); + if (Strings.isEmpty(tz)) { + tz = cfgDao.getConfValue("default.timezone", String.class, ""); + } if (user.getAddress() == null) { user.setAddress(new Address()); user.getAddress().setCountry(Locale.getDefault().getCountry()); @@ -187,12 +179,12 @@ public class UserWebService implements UserService { } throw new ServiceException(sb.toString()); } - Long userId = userManagement.registerUser(user.getLogin(), user.getPassword(), + Long userId = getBean(UserManager.class).registerUser(user.getLogin(), user.getPassword(), user.getLastname(), user.getFirstname(), user.getAddress().getEmail(), new Date(), user.getAddress().getStreet(), user.getAddress().getAdditionalname(), user.getAddress().getFax(), user.getAddress().getZip(), user.getAddress().getCountry() , user.getAddress().getTown(), user.getLanguageId(), "", false, true, // generate SIP Data if the config is enabled - jName_timeZone, confirm); + tz, confirm); if (userId == null || userId < 0) { throw new ServiceException("Unknown error"); @@ -234,8 +226,9 @@ public class UserWebService implements UserService { @Path("/{id}") public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(sd.getUserId()))) { + Sessiondata sd = check(sid); + if (AuthLevelUtil.hasAdminLevel(getRights(sd.getUserId()))) { + UserDao userDao = getUserDao(); userDao.delete(userDao.get(id), sd.getUserId()); return new ServiceResult(id, "Deleted", Type.SUCCESS); @@ -261,8 +254,9 @@ public class UserWebService implements UserService { ) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(sd.getUserId()))) { + Sessiondata sd = check(sid); + if (AuthLevelUtil.hasAdminLevel(getRights(sd.getUserId()))) { + UserDao userDao = getUserDao(); User user = userDao.getExternalUser(externalId, externalType); // Setting user deleted @@ -292,8 +286,8 @@ public class UserWebService implements UserService { ) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { + Sessiondata sd = check(sid); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sd.getUserId()))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( user.getLogin(), user.getFirstname(), user.getLastname() , user.getProfilePictureUrl(), user.getEmail() @@ -306,7 +300,7 @@ public class UserWebService implements UserService { log.debug("xmlString " + xmlString); //TODO LandingZone are not configurable for now - String hash = soapLoginDao.addSOAPLogin(sid, options.getRoomId(), + String hash = getBean(SOAPLoginDao.class).addSOAPLogin(sid, options.getRoomId(), options.isModerator(), options.isShowAudioVideoTest(), options.isAllowSameURLMultipleTimes(), options.getRecordingId(), "room", // LandingZone, @@ -318,7 +312,7 @@ public class UserWebService implements UserService { sd.setPermanent(true); } sd.setXml(xmlString); - sessionDao.update(sd); + getSessionDao().update(sd); return new ServiceResult(0, hash, Type.SUCCESS); } } else { @@ -340,9 +334,8 @@ public class UserWebService implements UserService { @Path("/kick/{publicsid}") public ServiceResult kick(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="publicsid") @PathParam("publicsid") String publicSID) throws ServiceException { try { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) { - Boolean success = userManagement.kickUserByPublicSID(sid, publicSID); + if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { + Boolean success = getBean(UserManager.class).kickUserByPublicSID(sid, publicSID); return new ServiceResult(Boolean.TRUE.equals(success) ? 1L : 0L, Boolean.TRUE.equals(success) ? "deleted" : "not deleted", Type.SUCCESS); } else { @@ -362,8 +355,7 @@ public class UserWebService implements UserService { @GET @Path("/count/{roomid}") public ServiceResult count(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="roomid") @PathParam("roomid") Long roomId) { - Sessiondata sd = sessionDao.check(sid); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(sd.getUserId()))) { + if (AuthLevelUtil.hasUserLevel(getRights(sid))) { IApplication app = (IApplication)Application.get(OpenmeetingsVariables.wicketApplicationName); return new ServiceResult(app.getOmRoomClients(roomId).size(), "count", Type.SUCCESS); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4850a819/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b8feaa5..d079f31 100644 --- a/pom.xml +++ b/pom.xml @@ -192,33 +192,6 @@ <module>openmeetings-db</module> </modules> </profile> - <profile> - <id>read-build-number</id> - <activation> - <file><exists>build.properties</exists></file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>read-project-properties</goal> - </goals> - <configuration> - <files> - <file>build.properties</file> - </files> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> <url>http://openmeetings.apache.org</url> <inceptionYear>2012</inceptionYear>
