Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Fri Nov 13 01:24:41 2015 @@ -27,9 +27,9 @@ import static org.junit.Assert.assertTru import java.util.List; import java.util.Random; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.UserDao; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractWicketTester; import org.junit.Test; @@ -39,7 +39,7 @@ public class TestUserContact extends Abs @Autowired private UserDao userDao; @Autowired - private OrganisationDao orgDao; + private GroupDao groupDao; Random random = new Random(); @Test @@ -48,17 +48,17 @@ public class TestUserContact extends Abs } @Test - public void createUserWithOrganisation() throws Exception { + public void createUserWithGroup() throws Exception { int rnd = random.nextInt(); User u = getUser(rnd); - u.getOrganisation_users().add(new Organisation_Users(orgDao.get(1L))); + u.getGroupUsers().add(new GroupUser(groupDao.get(1L))); u = userDao.update(u, null); assertTrue("Password should be set as expected", userDao.verifyPassword(u.getId(), "pass" + rnd)); User u1 = userDao.get(u.getId()); assertNotNull("Just created user should not be null", u1); - assertNotNull("Just created user should have non null org-users", u1.getOrganisation_users()); - assertFalse("Just created user should have not empty org-users", u1.getOrganisation_users().isEmpty()); + assertNotNull("Just created user should have non null org-users", u1.getGroupUsers()); + assertFalse("Just created user should have not empty org-users", u1.getGroupUsers().isEmpty()); } @Test
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java Fri Nov 13 01:24:41 2015 @@ -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.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.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); } } Copied: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java (from r1714102, openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java?p2=openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java&p1=openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java&r1=1714102&r2=1714149&rev=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java Fri Nov 13 01:24:41 2015 @@ -25,29 +25,29 @@ import static org.junit.Assert.fail; import java.util.List; import java.util.Random; -import org.apache.openmeetings.db.dao.user.OrganisationDao; -import org.apache.openmeetings.db.dao.user.OrganisationUserDao; +import org.apache.openmeetings.db.dao.user.GroupDao; +import org.apache.openmeetings.db.dao.user.GroupUserDao; import org.apache.openmeetings.db.dao.user.UserDao; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.apache.openmeetings.test.selenium.HeavyTests; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -public class TestUserOrganisation extends AbstractJUnitDefaults { +public class TestUserGroup extends AbstractJUnitDefaults { @Autowired - private OrganisationUserDao orgUserDao; + private GroupUserDao groupUserDao; @Autowired - private OrganisationDao orgDao; + private GroupDao groupDao; @Autowired - private UserDao usersDao; - public static final String ORG_NAME = "Test Org"; + private UserDao userDao; + public static final String GROUP_NAME = "Test Group"; private User getValidUser() { - for (User u : usersDao.getAllBackupUsers()) { - if (!u.isDeleted() && u.getOrganisation_users().size() > 0) { + for (User u : userDao.getAllBackupUsers()) { + if (!u.isDeleted() && u.getGroupUsers().size() > 0) { return u; } } @@ -56,44 +56,44 @@ public class TestUserOrganisation extend } @Test - public void getUsersByOrganisationId() { + public void getUsersByGroupId() { User u = getValidUser(); - 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); + Long groupId = u.getGroupUsers().get(0).getGroup().getId(); + List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999); + assertTrue("Default Group should contain at least 1 user: " + ul.size(), ul.size() > 0); - Organisation_Users ou = orgUserDao.getByOrganizationAndUser(orgId, u.getId()); - assertNotNull("Unable to found [organisation, user] pair - [" + orgId + "," + u.getId() + "]", ou); + GroupUser ou = groupUserDao.getByGroupAndUser(groupId, u.getId()); + assertNotNull("Unable to found [group, user] pair - [" + groupId + "," + u.getId() + "]", ou); } @Test - public void addOrganisation() { - Organisation o = new Organisation(); - o.setName(ORG_NAME); - Long orgId = orgDao.update(o, null).getId(); //inserted by not checked - assertNotNull("New Organisation have valid id", orgId); + public void addGroup() { + Group o = new Group(); + o.setName(GROUP_NAME); + Long groupId = groupDao.update(o, null).getId(); //inserted by not checked + assertNotNull("New Group have valid id", groupId); - List<Organisation_Users> ul = orgUserDao.get(orgId, 0, 9999); - assertTrue("New Organisation should contain NO users: " + ul.size(), ul.size() == 0); + List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999); + assertTrue("New Group should contain NO users: " + ul.size(), ul.size() == 0); } @Test @HeavyTests public void add10kUsers() throws Exception { - List<Organisation> groups = orgDao.get(ORG_NAME, 0, 1, null); - Organisation o = null; + List<Group> groups = groupDao.get(GROUP_NAME, 0, 1, null); + Group o = null; if (groups == null || groups.isEmpty()) { - o = new Organisation(); - o.setName(ORG_NAME); - o = orgDao.update(o, null); + o = new Group(); + o.setName(GROUP_NAME); + o = groupDao.update(o, null); } else { o = groups.get(0); } Random rnd = new Random(); for (int i = 0; i < 10000; ++i) { User u = createUser(rnd.nextInt()); - u.getOrganisation_users().add(new Organisation_Users(o)); - usersDao.update(u, null); + u.getGroupUsers().add(new GroupUser(o)); + userDao.update(u, null); } } } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java Fri Nov 13 01:24:41 2015 @@ -18,8 +18,8 @@ */ package org.apache.openmeetings.test.userdata; +import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.db.entity.server.Sessiondata; -import org.apache.openmeetings.core.remote.MainService; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.apache.openmeetings.util.crypt.ManageCryptStyle; import org.junit.Test; @@ -27,11 +27,11 @@ import org.springframework.beans.factory public class TestAuth extends AbstractJUnitDefaults { @Autowired - private MainService mService; + private SessiondataDao sessionDao; @Test public void testTestAuth() { - Sessiondata sessionData = mService.getsessiondata(); + Sessiondata sessionData = sessionDao.startsession(); System.out.println("sessionData: " + sessionData.getSessionId()); Modified: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java Fri Nov 13 01:24:41 2015 @@ -35,8 +35,8 @@ import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; -import org.apache.openmeetings.db.dao.user.OrganisationUserDao; +import org.apache.openmeetings.db.dao.user.GroupDao; +import org.apache.openmeetings.db.dao.user.GroupUserDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.SearchResult; import org.apache.openmeetings.db.dto.basic.ServiceResult; @@ -44,8 +44,8 @@ import org.apache.openmeetings.db.dto.ba import org.apache.openmeetings.db.dto.user.UserSearchResult; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.RoomGroup; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.webservice.error.ServiceException; @@ -70,9 +70,9 @@ public class GroupWebService { private static final Logger log = Red5LoggerFactory.getLogger(GroupWebService.class, webAppRootKey); @Autowired - private OrganisationDao groupDao; + private GroupDao groupDao; @Autowired - private OrganisationUserDao groupUserDao; + private GroupUserDao groupUserDao; @Autowired private UserDao userDao; @Autowired @@ -95,7 +95,7 @@ public class GroupWebService { public ServiceResult add(@QueryParam("sid") @WebParam(name="sid") String sid, @QueryParam("name") @WebParam(name="name") String name) throws ServiceException { Long userId = sessionDao.checkSession(sid); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { - Organisation o = new Organisation(); + Group o = new Group(); o.setName(name); return new ServiceResult(groupDao.update(o, userId).getId(), "Success", Type.SUCCESS); } else { @@ -127,9 +127,9 @@ public class GroupWebService { try { Long authUserId = sessionDao.checkSession(sid); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) { - if (!groupUserDao.isUserInOrganization(id, userid)) { + if (!groupUserDao.isUserInGroup(id, userid)) { User u = userDao.get(userid); - u.getOrganisation_users().add(new Organisation_Users(groupDao.get(id))); + u.getGroupUsers().add(new GroupUser(groupDao.get(id))); userDao.update(u, authUserId); } return new ServiceResult(userid, "Success", Type.SUCCESS); @@ -169,7 +169,7 @@ public class GroupWebService { } boolean found = false; for (RoomGroup ro : r.getRoomGroups()) { - if (ro.getOrganisation().getId().equals(id)) { + if (ro.getGroup().getId().equals(id)) { found = true; } } @@ -224,7 +224,7 @@ public class GroupWebService { if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { result.setRecords(groupUserDao.count(id)); result.setResult(new ArrayList<User>()); - for (Organisation_Users ou : groupUserDao.get(id, null, start, max, orderby + " " + (asc ? "ASC" : "DESC"))) { + for (GroupUser ou : groupUserDao.get(id, null, start, max, orderby + " " + (asc ? "ASC" : "DESC"))) { result.getResult().add(ou.getUser()); } } else { Added: openmeetings/branches/3.1.x/src/site/resources/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/src/site/resources/site.xml?rev=1714149&view=auto ============================================================================== --- openmeetings/branches/3.1.x/src/site/resources/site.xml (added) +++ openmeetings/branches/3.1.x/src/site/resources/site.xml Fri Nov 13 01:24:41 2015 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<project xmlns="http://maven.apache.org/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <body> + <menu ref="parent"/> + <menu name="Project"> + <item name="About" href="/index.html" /> + <item name="Info" href="/project-info.html" /> + <item name="Summary" href="/project-summary.html" /> + <item name="License" href="/license.html" /> + <item name="Dependencies" href="/dependencies.html" /> + <item name="Dependency Convergence" href="/dependency-convergence.html" /> + <item name="RAT Report" href="/rat-report.html" /> + <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> + </menu> + </body> +</project> Added: openmeetings/branches/3.1.x/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/src/site/site.xml?rev=1714149&view=auto ============================================================================== --- openmeetings/branches/3.1.x/src/site/site.xml (added) +++ openmeetings/branches/3.1.x/src/site/site.xml Fri Nov 13 01:24:41 2015 @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<project xmlns="http://maven.apache.org/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <bannerLeft> + <name>Apache OpenMeetings</name> + <src>http://openmeetings.apache.org/images/logo-2.jpg</src> + <href>http://openmeetings.apache.org/index.html</href> + </bannerLeft> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.4</version> + </skin> + + <version position="none"/> + + <body> + <head> + <script type="text/javascript" src="http://openmeetings.apache.org/js/site.js";></script> + </head> + + <links> + <item name="Demo" href="http://openmeetings.apache.org/demo.html"/> + <item name="Download" href="http://openmeetings.apache.org/downloads.html"/> + <item name="Installation" href="http://openmeetings.apache.org/installation.html"/> + <item name="Wiki" href="https://cwiki.apache.org/confluence/display/OPENMEETINGS"/> + </links> + <menu ref="modules" inherit="bottom"/> + </body> + + <poweredBy></poweredBy> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <sideBarEnabled>true</sideBarEnabled> + </fluidoSkin> + </custom> +</project> Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java Fri Nov 13 01:24:41 2015 @@ -19,6 +19,7 @@ package org.apache.openmeetings.core.converter; import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.io.File; import java.util.ArrayList; @@ -30,7 +31,6 @@ import org.apache.openmeetings.db.dao.fi import org.apache.openmeetings.db.dao.record.RecordingLogDao; import org.apache.openmeetings.db.entity.file.FileExplorerItem; import org.apache.openmeetings.db.entity.file.FileItem.Type; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import org.apache.openmeetings.util.process.ConverterProcessResult; import org.apache.openmeetings.util.process.ProcessHelper; import org.red5.logging.Red5LoggerFactory; Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java Fri Nov 13 01:24:41 2015 @@ -18,10 +18,10 @@ */ package org.apache.openmeetings.core.converter; -import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION; import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix; import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix; import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir; +import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION; import static org.apache.openmeetings.util.OmFileHelper.profileFileName; import static org.apache.openmeetings.util.OmFileHelper.profileImagePrefix; import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix; Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java Fri Nov 13 01:24:41 2015 @@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Locale; import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; @@ -69,7 +70,7 @@ public class FileUtils { log.debug("calling [1] FileExplorerItemDaoImpl.updateFileOrFolder()"); fileExplorerItemDao.update(file); - FileExplorerItem[] childElements = fileExplorerItemDao.getByParent(file.getId()).toArray(new FileExplorerItem[0]); + List<FileExplorerItem> childElements = fileExplorerItemDao.getByParent(file.getId()); for (FileExplorerItem childExplorerItem : childElements) { fileSize += this.getSizeOfDirectoryAndSubs(childExplorerItem); @@ -90,7 +91,7 @@ public class FileUtils { log.debug("calling [2] FileExplorerItemDaoImpl.updateFileOrFolder()"); fileExplorerItemDao.update(file); - FileExplorerItem[] childElements = fileExplorerItemDao.getByParent(file.getId()).toArray(new FileExplorerItem[0]); + List<FileExplorerItem> childElements = fileExplorerItemDao.getByParent(file.getId()); for (FileExplorerItem childExplorerItem : childElements) { setFileToOwnerOrRoomByParent(childExplorerItem, userId, roomId); Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Fri Nov 13 01:24:41 2015 @@ -66,47 +66,11 @@ public class ConferenceService { @Autowired private ISessionManager sessionManager = null; - /** - * ( get a List of all available Rooms of this group - * (non-appointments) - * - * @param SID - * @param groupId - * @return - all available Rooms of this group - */ - public List<RoomGroup> getRoomsByGroupAndType(String SID, long groupId, long roomTypeId) { - try { - Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - log.debug("getRoomsByGroupAndType"); - List<RoomGroup> roomGroupsList = roomManager.getRoomGroupByGroupIdAndRoomType(groupId, roomTypeId); - - List<RoomGroup> filtered = new ArrayList<RoomGroup>(); - - for (Iterator<RoomGroup> iter = roomGroupsList.iterator(); iter - .hasNext();) { - RoomGroup orgRoom = iter.next(); - - if (!orgRoom.getRoom().isAppointment()) { - orgRoom.getRoom().setCurrentusers( - this.getRoomClientsListByRoomId(orgRoom.getRoom() - .getId())); - filtered.add(orgRoom); - } - } - return filtered; - } - } catch (Exception err) { - log.error("[getRoomsByGroupAndType]", err); - } - return null; - } - public List<RoomGroup> getRoomsByGroupWithoutType(String SID, long groupId) { try { Long userId = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - log.debug("getRoomsByGroupAndType"); + log.debug("getRoomsByGroupWithoutType"); List<RoomGroup> roomGroupsList = roomManager.getRoomGroupByGroupId(groupId); for (RoomGroup roomGroup : roomGroupsList) { @@ -116,7 +80,7 @@ public class ConferenceService { return roomGroupsList; } } catch (Exception err) { - log.error("[getRoomsByGroupAndType]", err); + log.error("[getRoomsByGroupWithoutType]", err); } return null; } @@ -237,47 +201,6 @@ public class ConferenceService { return null; } - } - - // -------------------------------------------------------------------------------------------- - - /** - * - */ - // -------------------------------------------------------------------------------------------- - public List<Room> getAppointedMeetings(String SID, Long roomTypeId) { - log.debug("ConferenceService.getAppointedMeetings"); - - Long userId = sessiondataDao.checkSession(SID); - - if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - - List<Appointment> points = appointmentDao.getForToday(userId); - List<Room> result = new ArrayList<Room>(); - - if (points != null) { - for (int i = 0; i < points.size(); i++) { - Appointment ment = points.get(i); - - Long roomId = ment.getRoom().getId(); - Room room = roomDao.get(roomId); - - if (roomTypeId == null || !roomTypeId.equals(room.getType().getId())) { - continue; - } - - room.setCurrentusers(getRoomClientsListByRoomId(room.getId())); - result.add(room); - } - } - - log.debug("Found " + result.size() + " rooms"); - return result; - - } else { - return null; - } - } // -------------------------------------------------------------------------------------------- Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Fri Nov 13 01:24:41 2015 @@ -74,7 +74,7 @@ public class InvitationService implement * @param message * @param email * @param subject - * @param room_id + * @param roomId * @param conferencedomain * @param isPasswordProtected * @param invitationpass @@ -89,29 +89,29 @@ public class InvitationService implement */ public Object sendInvitationHash(String SID, String firstname, String lastname, String message, String email, String subject, - Long room_id, String conferencedomain, Boolean isPasswordProtected, + Long roomId, String conferencedomain, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, String validFromTime, String validToDate, String validToTime, Long languageId, String iCalTz, boolean sendMail) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { log.debug("sendInvitationHash: "); Date from = getDate(validFromDate, validFromTime, iCalTz); Date to = getDate(validToDate, validToTime, iCalTz); User owner = null; - if (users_id < 0) { - owner = userDao.get(-users_id); + if (userId < 0) { + owner = userDao.get(-userId); } - users_id = owner == null ? users_id : owner.getOwnerId(); - User invitee = userDao.getContact(email, firstname, lastname, users_id); - Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id), + userId = owner == null ? userId : owner.getOwnerId(); + User invitee = userDao.getContact(email, firstname, lastname, userId); + Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(roomId), isPasswordProtected, invitationpass, Valid.fromInt(valid) - , userDao.get(users_id), languageId, + , userDao.get(userId), languageId, from, to, null); if (invitation != null) { @@ -135,12 +135,12 @@ public class InvitationService implement } public String sendInvitationByHash(String SID, String invitationHash, String message, String subject - , Long language_id) throws Exception { - Long users_id = sessiondataDao.checkSession(SID); + , Long languageId) throws Exception { + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { Invitation inv = (Invitation)invitationManager.getInvitationByHashCode(invitationHash, false); - inv.getInvitee().setLanguageId(language_id); + inv.getInvitee().setLanguageId(languageId); invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false); } else { return "Need User Privileges to perfom the Action"; Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Fri Nov 13 01:24:41 2015 @@ -36,7 +36,7 @@ import org.apache.openmeetings.db.dao.se import org.apache.openmeetings.db.dao.user.IUserManager; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.basic.Configuration; -import org.apache.openmeetings.db.entity.log.ConferenceLog.Type; +import org.apache.openmeetings.db.entity.log.ConferenceLog; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.server.RemoteSessionObject; import org.apache.openmeetings.db.entity.server.SOAPLogin; @@ -145,7 +145,7 @@ public class MainService implements IPen SOAPLogin soapLogin = soapLoginDao.get(secureHash); - if (soapLogin.getUsed()) { + if (soapLogin.isUsed()) { if (soapLogin.getAllowSameURLMultipleTimes()) { @@ -197,7 +197,7 @@ public class MainService implements IPen SOAPLogin returnSoapLogin = new SOAPLogin(); returnSoapLogin.setRoomId(soapLogin.getRoomId()); - returnSoapLogin.setBecomemoderator(soapLogin.getBecomemoderator()); + returnSoapLogin.setBecomemoderator(soapLogin.isBecomemoderator()); returnSoapLogin.setShowAudioVideoTest(soapLogin.getShowAudioVideoTest()); returnSoapLogin.setRecordingId(soapLogin.getRecordingId()); returnSoapLogin.setShowNickNameDialog(soapLogin.getShowNickNameDialog()); @@ -234,7 +234,7 @@ public class MainService implements IPen // Log the User conferenceLogDao.addConferenceLog( - Type.nicknameEnter, currentClient.getUserId(), streamId, + ConferenceLog.Type.nicknameEnter, currentClient.getUserId(), streamId, null, currentClient.getUserip(), currentClient.getScope()); sessionManager.updateClientByStreamId(streamId, currentClient, false, null); Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java Fri Nov 13 01:24:41 2015 @@ -111,7 +111,7 @@ public class RecordingService implements recording.setInsertedBy(ownerId); recording.setType(Type.Recording); recording.setComment(comment); - recording.setIsInterview(isInterview); + recording.setInterview(isInterview); recording.setRoomId(room_id); recording.setRecordStart(now); @@ -360,7 +360,7 @@ public class RecordingService implements log.debug("recordingConverterTask ", recordingConverterTask); Recording recording = recordingDao.get(recordingId); - if (recording.getIsInterview() == null || !recording.getIsInterview()) { + if (!recording.isInterview()) { recordingConverterTask.startConversionThread(recordingId); } else { interviewConverterTask.startConversionThread(recordingId); @@ -452,7 +452,7 @@ public class RecordingService implements // Start FLV Recording recordShow(conn, rcl.getStreamPublishName(), streamName_Screen, metaDataId, true, - recording.getIsInterview()); + recording.isInterview()); // Add Meta Data rcl.setRecordingMetaDataId(metaDataId); @@ -481,7 +481,7 @@ public class RecordingService implements // Start FLV recording recordShow(conn, String.valueOf(rcl.getBroadCastID()).toString(), streamName, metaDataId, false, - recording.getIsInterview()); + recording.isInterview()); rcl.setRecordingMetaDataId(metaDataId); Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Fri Nov 13 01:24:41 2015 @@ -51,7 +51,7 @@ import org.apache.openmeetings.db.dto.ro import org.apache.openmeetings.db.dto.room.RoomStatus; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; -import org.apache.openmeetings.db.entity.log.ConferenceLog.Type; +import org.apache.openmeetings.db.entity.log.ConferenceLog; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.server.Server; @@ -191,7 +191,7 @@ public class ScopeApplicationAdapter ext } // Log the User - conferenceLogDao.addConferenceLog(Type.clientConnect, + conferenceLogDao.addConferenceLog(ConferenceLog.Type.clientConnect, rcm.getUserId(), streamId, null, rcm.getUserip(), rcm.getScope()); return true; @@ -498,7 +498,7 @@ public class ScopeApplicationAdapter ext Long roomId = currentClient.getRoomId(); // Log the User - conferenceLogDao.addConferenceLog(Type.roomLeave, + conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomLeave, currentClient.getUserId(), currentClient.getStreamid(), roomId, currentClient.getUserip(), ""); @@ -1156,7 +1156,7 @@ public class ScopeApplicationAdapter ext } // Log the User - conferenceLogDao.addConferenceLog(Type.roomEnter, + conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomEnter, currentClient.getUserId(), streamid, roomId, currentClient.getUserip(), ""); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java Fri Nov 13 01:24:41 2015 @@ -35,7 +35,7 @@ public class RoomModeratorDao { public RoomModerator get(long id) { List<RoomModerator> list = em.createNamedQuery("getRoomModeratorById", RoomModerator.class) - .setParameter("roomModeratorsId", id).getResultList(); + .setParameter("id", id).getResultList(); if (!list.isEmpty()) { return list.get(0); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java Fri Nov 13 01:24:41 2015 @@ -65,7 +65,7 @@ public class SOAPLoginDao { soapLogin.setAllowRecording(allowRecording); soapLogin = em.merge(soapLogin); - Long soapLoginId = soapLogin.getSoapLoginId(); + Long soapLoginId = soapLogin.getId(); if (soapLoginId > 0) { return hash; @@ -102,7 +102,7 @@ public class SOAPLoginDao { public void update(SOAPLogin soapLogin) { try { - if (soapLogin.getSoapLoginId() == 0) { + if (soapLogin.getId() == null) { em.persist(soapLogin); } else { if (!em.contains(soapLogin)) { Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java Fri Nov 13 01:24:41 2015 @@ -20,7 +20,7 @@ package org.apache.openmeetings.db.dao.u //FIXME HACK to bypass cross project compilation public interface IUserService { - Boolean kickUserByStreamId(String SID, String streamid, long serverId); + Boolean kickUserByStreamId(String sid, String streamid, long serverId); Boolean kickUserBySessionId(String sid, long userId, String sessionId); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java Fri Nov 13 01:24:41 2015 @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.db.dto.file; +import java.util.List; + import org.apache.openmeetings.db.entity.file.FileExplorerItem; /** @@ -26,23 +28,23 @@ import org.apache.openmeetings.db.entity */ public class FileExplorerObject { - private FileExplorerItem[] userHome; - private FileExplorerItem[] roomHome; + private List<FileExplorerItem> userHome; + private List<FileExplorerItem> roomHome; private Long userHomeSize; private Long roomHomeSize; public FileExplorerObject() {} - public FileExplorerItem[] getUserHome() { + public List<FileExplorerItem> getUserHome() { return userHome; } - public void setUserHome(FileExplorerItem[] userHome) { + public void setUserHome(List<FileExplorerItem> userHome) { this.userHome = userHome; } - public FileExplorerItem[] getRoomHome() { + public List<FileExplorerItem> getRoomHome() { return roomHome; } - public void setRoomHome(FileExplorerItem[] roomHome) { + public void setRoomHome(List<FileExplorerItem> roomHome) { this.roomHome = roomHome; } public Long getUserHomeSize() { Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java Fri Nov 13 01:24:41 2015 @@ -54,7 +54,7 @@ public class RecordingDTO implements Ser this.aviName = r.getAlternateDownload(); this.roomId = r.getRoomId(); this.status = r.getStatus().name(); - this.interview = r.getIsInterview(); + this.interview = r.isInterview(); this.start = r.getRecordStart(); this.end = r.getRecordEnd(); this.width = r.getWidth(); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Fri Nov 13 01:24:41 2015 @@ -79,7 +79,7 @@ public class Configuration implements ID private Date updated; @Lob - @Column(name = "comment_field", length = 2048) + @Column(name = "comment", length = 2048) @Element(data = true, required = false) private String comment; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Fri Nov 13 01:24:41 2015 @@ -118,7 +118,7 @@ public class Recording extends FileItem @Element(data = true, required = false) private String alternateDownload; - @Column(name = "comment_field") + @Column(name = "comment") @Element(data = true, required = false) private String comment; @@ -152,7 +152,7 @@ public class Recording extends FileItem @Column(name = "is_interview") @Element(data = true, required = false) - private Boolean isInterview; + private boolean interview; @Column(name = "progress_post_processing") @Element(data = true, required = false) @@ -290,12 +290,12 @@ public class Recording extends FileItem this.log = log; } - public Boolean getIsInterview() { - return isInterview; + public boolean isInterview() { + return interview; } - public void setIsInterview(Boolean isInterview) { - this.isInterview = isInterview; + public void setInterview(boolean interview) { + this.interview = interview; } public Integer getProgressPostProcessing() { Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Fri Nov 13 01:24:41 2015 @@ -180,13 +180,13 @@ public class Client implements IDataProv private String formatedDate; /** - * @see Client#getIsScreenClient() + * @see Client#isScreenClient() */ @Column(name = "is_screenclient") private boolean screenClient; /** - * @see Client#getIsAVClient() + * @see Client#isAvClient() */ @Column(name = "is_avclient") private boolean avClient; @@ -879,7 +879,7 @@ public class Client implements IDataProv @Override public String toString() { return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + screenClient - + ", isAVClient=" + avClient + ", isMobile = " + mobile + ", roomId=" + roomId + ", broadCastID=" + broadCastID + ", userId=" + + ", avClient=" + avClient + ", isMobile = " + mobile + ", roomId=" + roomId + ", broadCastID=" + broadCastID + ", userId=" + userId + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", recordingId=" + recordingId + ", recordingMetaDataId=" + recordingMetaDataId + ", screenPublishStarted=" + screenPublishStarted + ", interviewPodId=" + interviewPodId + ", server=" + server + "]"; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Nov 13 01:24:41 2015 @@ -139,7 +139,7 @@ public class Room implements IDataProvid private String name; @Lob - @Column(name = "comment_field") + @Column(name = "comment") @Element(data = true, required = false) private String comment; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java Fri Nov 13 01:24:41 2015 @@ -44,7 +44,7 @@ import org.simpleframework.xml.Root; @NamedQuery(name = "getRoomModeratorsByIds", query = "select c from RoomModerator as c where c.id IN :ids"), @NamedQuery(name = "getRoomModeratorByRoomId", query = "select c from RoomModerator as c where c.roomId = :roomId AND c.deleted = false"), @NamedQuery(name = "getRoomModeratorByUserAndRoomId", query = "select c from RoomModerator as c " - + "where c.roomId = :roomId AND c.deleted false AND c.user.id = :userId") + + "where c.roomId = :roomId AND c.deleted = false AND c.user.id = :userId") }) @Table(name = "room_moderator") @Root(name = "room_moderator") Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Fri Nov 13 01:24:41 2015 @@ -95,7 +95,7 @@ public class LdapConfig implements IData private boolean deleted; @Lob - @Column(name = "comment_field", length = 2048) + @Column(name = "comment", length = 2048) @Element(data = true, required = false) private String comment; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Fri Nov 13 01:24:41 2015 @@ -35,7 +35,7 @@ public class SOAPLogin implements Serial @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") - private long soapLoginId; + private Long id; @Column(name="hash") private String hash; @@ -79,11 +79,11 @@ public class SOAPLogin implements Serial @Column(name="allow_recording") private boolean allowRecording; - public long getSoapLoginId() { - return soapLoginId; + public Long getId() { + return id; } - public void setSoapLoginId(long soapLoginId) { - this.soapLoginId = soapLoginId; + public void setId(Long id) { + this.id = id; } public String getHash() { @@ -114,7 +114,7 @@ public class SOAPLogin implements Serial this.created = created; } - public boolean getUsed() { + public boolean isUsed() { return used; } public void setUsed(boolean used) { @@ -128,7 +128,7 @@ public class SOAPLogin implements Serial this.useDate = useDate; } - public boolean getBecomemoderator() { + public boolean isBecomemoderator() { return becomemoderator; } public void setBecomemoderator(boolean becomemoderator) { Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Fri Nov 13 01:24:41 2015 @@ -93,7 +93,7 @@ public class Server implements IDataProv public User updatedby; @Lob - @Column(name = "comment_field", length = 2048) + @Column(name = "comment", length = 2048) @Element(data = true, required = false) private String comment; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Fri Nov 13 01:24:41 2015 @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlRoot @Entity @NamedQueries({ - @NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c " - + "where c.sessionId LIKE :sessionId"), - @NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c " - + "WHERE c.refreshed < :refreshed AND c.permanent = false") + @NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c " + + "where c.sessionId LIKE :sessionId"), + @NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c " + + "WHERE c.refreshed < :refreshed AND c.permanent = false") }) @Table(name = "sessiondata") @XmlRootElement @@ -45,75 +45,81 @@ public class Sessiondata implements Seri private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name="id") + @Column(name = "id") private Long id; - - @Column(name="user_id") + + @Column(name = "user_id") private Long userId; - - @Column(name="session_id") + + @Column(name = "session_id") private String sessionId; - - @Column(name="created") + + @Column(name = "created") private Date created; - - @Column(name="refreshed") + + @Column(name = "refreshed") private Date refreshed; - + @Lob - @Column(name="xml") + @Column(name = "xml") private String xml; - - @Column(name="permanent") + + @Column(name = "permanent") private boolean permanent; - - @Column(name="language_id") + + @Column(name = "language_id") private Long languageId; - - @Column(name="group_id") + + @Column(name = "group_id") private Long groupId; - + public Sessiondata() { } - - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public Date getRefreshed() { - return refreshed; - } - public void setRefreshed(Date refreshed) { - this.refreshed = refreshed; - } - - public String getSessionId() { - return sessionId; - } - public void setSessionId(String sessionId) { - this.sessionId = sessionId; - } - - public Date getCreated() { - return created; - } - public void setCreated(Date created) { - this.created = created; - } - - public Long getUserId() { - return userId; - } - public void setUserId(Long userId) { - this.userId = userId; - } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Date getRefreshed() { + return refreshed; + } + + public void setRefreshed(Date refreshed) { + this.refreshed = refreshed; + } + + public String getSessionId() { + return sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } public String getXml() { return xml; } + public void setXml(String xml) { this.xml = xml; } @@ -121,6 +127,7 @@ public class Sessiondata implements Seri public boolean isPermanent() { return permanent; } + public void setPermanent(boolean permanent) { this.permanent = permanent; } @@ -128,6 +135,7 @@ public class Sessiondata implements Seri public Long getLanguageId() { return languageId; } + public void setLanguageId(Long languageId) { this.languageId = languageId; } @@ -135,8 +143,9 @@ public class Sessiondata implements Seri public Long getGroupId() { return groupId; } + public void setGroupId(Long groupId) { this.groupId = groupId; } - + } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Fri Nov 13 01:24:41 2015 @@ -51,7 +51,7 @@ public class Address implements IDataPro private String additionalname; @Lob - @Column(name = "comment_field", length=2048) + @Column(name = "comment", length=2048) @Element(data=true, required=false) private String comment; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java Fri Nov 13 01:24:41 2015 @@ -103,14 +103,14 @@ public class Group implements IDataProvi this.updatedby = updatedby; } - + public Date getInserted() { return inserted; } public void setInserted(Date inserted) { this.inserted = inserted; } - + public Date getUpdated() { return updated; } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java Fri Nov 13 01:24:41 2015 @@ -77,7 +77,7 @@ public class GroupUser implements IDataP @Column(name = "is_moderator") @Element(data = true, required = false) - private Boolean isModerator; + private boolean moderator; public GroupUser(Group group) { this.group = group; @@ -123,12 +123,12 @@ public class GroupUser implements IDataP this.deleted = deleted; } - public Boolean getIsModerator() { - return isModerator; + public boolean isModerator() { + return moderator; } - public void setIsModerator(Boolean isModerator) { - this.isModerator = isModerator; + public void setModerator(boolean moderator) { + this.moderator = moderator; } public User getUser() { Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Fri Nov 13 01:24:41 2015 @@ -89,7 +89,7 @@ import org.simpleframework.xml.Root; + "OR lower(c.firstname) LIKE :search " + "OR lower(c.lastname) LIKE :search )"), @NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u ORDER BY u.id"), - @NamedQuery(name = "checkPassword", query = "select count(c.id) from User c where c.deleted = false AND c.id = :userId " // + @NamedQuery(name = "checkPassword", query = "select count(c) from User c where c.deleted = false AND c.id = :userId " // + "AND c.password LIKE :password"), // @NamedQuery(name = "updatePassword", query = "UPDATE User u SET u.password = :password WHERE u.id = :userId"), // @NamedQuery(name = "getNondeletedUsers", query = "SELECT u FROM User u WHERE u.deleted = false"), @@ -252,7 +252,7 @@ public class User implements IDataProvid @JoinColumn(name = "user_id", insertable = true, updatable = true) @ElementList(name = "organisations", required = false) @ElementDependent - private List<GroupUser> groupUsers = new ArrayList<GroupUser>(); + private List<GroupUser> groupUsers = new ArrayList<>(); @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @PrimaryKeyJoinColumn(name="sip_user_id", referencedColumnName="id") @@ -481,7 +481,7 @@ public class User implements IDataProvid public List<GroupUser> getGroupUsers() { if (groupUsers == null) { - groupUsers = new ArrayList<GroupUser>(); + groupUsers = new ArrayList<>(); } return groupUsers; } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java Fri Nov 13 01:24:41 2015 @@ -46,7 +46,7 @@ public class AuthLevelUtil { if (!result && groupId != null) { for (GroupUser ou : u.getGroupUsers()) { if (groupId.equals(ou.getGroup().getId())) { - if (Boolean.TRUE.equals(ou.getIsModerator())) { + if (ou.isModerator()) { result = true; } break; Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java Fri Nov 13 01:24:41 2015 @@ -33,9 +33,9 @@ import javax.xml.xpath.XPathFactory; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.openmeetings.util.ConnectionProperties.DbType; import org.apache.openmeetings.util.ConnectionProperties; import org.apache.openmeetings.util.OmFileHelper; -import org.apache.openmeetings.util.ConnectionProperties.DbType; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java Fri Nov 13 01:24:41 2015 @@ -48,7 +48,7 @@ public class EmailManager { public static String getString(long id) { return ((IApplication)Application.get(wicketApplicationName)).getOmString(id); } - + /** * sends a mail address to the user with his account data * Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java Fri Nov 13 01:24:41 2015 @@ -31,7 +31,7 @@ public class CreatedAppointmentTemplate private CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) { super(langId, a, tz); - + add(new Label("titleLbl", getString(1151L, langId))); add(new Label("title", a.getTitle())); add(new WebMarkupContainer("descContainer") Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java Fri Nov 13 01:24:41 2015 @@ -27,9 +27,9 @@ public class InvitationTemplate extends private InvitationTemplate(Long langId, String invitorName, String message, String link) { super(langId); - - add(new Label("titleLbl", getString(500, langId))); - add(new Label("userLbl", getString(501, langId))); + + add(new Label("titleLbl", getString(500, langId))); + add(new Label("userLbl", getString(501, langId))); add(new Label("user", invitorName)); add(new Label("messageLbl", getString(502, langId))); add(new Label("message", message).setEscapeModelStrings(false)); 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=1714149&r1=1714148&r2=1714149&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 Fri Nov 13 01:24:41 2015 @@ -44,8 +44,6 @@ import java.util.Locale; import java.util.Set; import java.util.TimeZone; -import org.apache.openmeetings.IWebSession; -import org.apache.openmeetings.core.ldap.LdapLoginManagement; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.dao.server.SOAPLoginDao; @@ -60,6 +58,8 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.db.util.TimezoneUtil; +import org.apache.openmeetings.IWebSession; +import org.apache.openmeetings.core.ldap.LdapLoginManagement; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.web.pages.SwfPage; import org.apache.openmeetings.web.user.dashboard.MyRoomsWidget; @@ -90,6 +90,7 @@ public class WebSession extends Abstract private static final long serialVersionUID = 1L; public static int MILLIS_IN_MINUTE = 60000; public static final String SECURE_HASH = "secureHash"; + public static final String INVITATION_HASH = "invitationHash"; private long userId = -1; private Set<Right> rights = new HashSet<User.Right>(); //TODO renew somehow on user edit !!!! private long languageId = -1; //TODO renew somehow on user edit !!!! @@ -136,7 +137,7 @@ public class WebSession extends Abstract try { IRequestParameters params = RequestCycle.get().getRequest().getRequestParameters(); StringValue secureHash = params.getParameterValue(SECURE_HASH); - StringValue invitationHash = params.getParameterValue("invitationHash"); + StringValue invitationHash = params.getParameterValue(INVITATION_HASH); if (!secureHash.isEmpty() || !invitationHash.isEmpty()) { PageParameters pp = new PageParameters(); for (String p : params.getParameterNames()) { @@ -196,7 +197,7 @@ public class WebSession extends Abstract //FIXME code is duplicated from MainService, need to be unified SOAPLoginDao soapDao = getBean(SOAPLoginDao.class); SOAPLogin soapLogin = soapDao.get(secureHash); - if (soapLogin != null && !soapLogin.getUsed()) { //add code for || (soapLogin.getAllowSameURLMultipleTimes()) + if (soapLogin != null && !soapLogin.isUsed()) { //add code for || (soapLogin.getAllowSameURLMultipleTimes()) SessiondataDao sessionDao = getBean(SessiondataDao.class); Sessiondata sd = sessionDao.getSessionByHash(soapLogin.getSessionHash()); if (sd != null && sd.getXml() != null) { Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html Fri Nov 13 01:24:41 2015 @@ -39,7 +39,7 @@ </td> <td style="vertical-align: top"> <!-- Users in this Room --> - <fieldset wicket:id="details"> + <fieldset class="ui-widget-content" wicket:id="details"> <div class="formelement" style="font-style: italic;"> <label><wicket:message key="404" /></label> </div> 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=1714149&r1=1714148&r2=1714149&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 Fri Nov 13 01:24:41 2015 @@ -87,7 +87,8 @@ public class RoomsPanel extends UserPane @Override public void onClick(AjaxRequestTarget target) { roomId = r.getId(); - target.add(curUsers.setDefaultModelObject(Application.getBean(ISessionManager.class).getClientListByRoom(r.getId()).size())); updateRoomDetails(target); + target.add(curUsers.setDefaultModelObject(Application.getBean(ISessionManager.class).getClientListByRoom(r.getId()).size())); + updateRoomDetails(target); } }); } Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Fri Nov 13 01:24:41 2015 @@ -49,9 +49,9 @@ <class>org.apache.openmeetings.db.entity.room.Client</class> <class>org.apache.openmeetings.db.entity.room.RoomModerator</class> <class>org.apache.openmeetings.db.entity.room.Room</class> + <class>org.apache.openmeetings.db.entity.room.RoomGroup</class> <class>org.apache.openmeetings.db.entity.room.Whiteboard</class> <class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class> - <class>org.apache.openmeetings.db.entity.room.RoomGroup</class> <class>org.apache.openmeetings.db.entity.user.Address</class> <class>org.apache.openmeetings.db.entity.user.State</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> 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=1714149&r1=1714148&r2=1714149&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 Fri Nov 13 01:24:41 2015 @@ -26,6 +26,7 @@ import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import java.util.LinkedHashMap; +import java.util.List; import javax.jws.WebService; import javax.ws.rs.Path; @@ -581,8 +582,7 @@ public class FileWebService { FileExplorerObject fileExplorerObject = new FileExplorerObject(); // Home File List - FileExplorerItem[] fList = fileExplorerItemDao.getByOwner(ownerId) - .toArray(new FileExplorerItem[0]); + List<FileExplorerItem> fList = fileExplorerItemDao.getByOwner(ownerId); long homeFileSize = 0; @@ -595,7 +595,7 @@ public class FileWebService { fileExplorerObject.setUserHomeSize(homeFileSize); // Public File List - FileExplorerItem[] rList = fileExplorerItemDao.getByRoom(roomId).toArray(new FileExplorerItem[0]); + List<FileExplorerItem> rList = fileExplorerItemDao.getByRoom(roomId); long roomFileSize = 0; @@ -644,8 +644,7 @@ public class FileWebService { FileExplorerObject fileExplorerObject = new FileExplorerObject(); // Home File List - FileExplorerItem[] fList = fileExplorerItemDao.getByOwner(userId) - .toArray(new FileExplorerItem[0]); + List<FileExplorerItem> fList = fileExplorerItemDao.getByOwner(userId); long homeFileSize = 0; @@ -658,7 +657,7 @@ public class FileWebService { fileExplorerObject.setUserHomeSize(homeFileSize); // Public File List - FileExplorerItem[] rList = fileExplorerItemDao.getByRoom(roomId).toArray(new FileExplorerItem[0]); + List<FileExplorerItem> rList = fileExplorerItemDao.getByRoom(roomId); long roomFileSize = 0;
