svn commit: r1743492 [4/4] - in /openmeetings/application: branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/ branches/3.1.x/openmeetings...

[solomax]

Modified: 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 Thu May 12 11:35:22 2016
@@ -58,6 +58,7 @@ import java.util.Iterator;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.basic.ErrorDao;
 import org.apache.openmeetings.db.dao.basic.NavigationDao;
+import org.apache.openmeetings.db.dao.label.LabelDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.room.SipDao;
 import org.apache.openmeetings.db.dao.server.OAuth2Dao;
@@ -76,6 +77,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.entity.user.User.Right;
 import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.wicket.util.string.StringValue;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
@@ -102,6 +104,8 @@ public class ImportInitvalues {
        private GroupDao groupDao;
        @Autowired
        private RoomDao roomDao;
+       @Autowired
+       private LabelDao labelDao;
        
        private int progress = 0;
 
@@ -384,29 +388,30 @@ public class ImportInitvalues {
                        ro.setRoom(r);
                        ro.setGroup(groupDao.get(groupId));
                        ro.setInserted(new Date());
+                       r.getRoomGroups().add(ro);
                }
                r = roomDao.update(r, null);
                return r;
        }
        
-       public void loadDefaultRooms(boolean createRooms) {
+       public void loadDefaultRooms(boolean createRooms, long langId) {
                if (createRooms) {
-                       createRoom("public Interview Room", Type.interview, 
16L, true, null);
-                       createRoom("public Conference Room", Type.conference, 
32L, true, null);
-                       Room r = createRoom("public Video Only Room", 
Type.conference, 32L, true, null);
+                       
createRoom(labelDao.getString("install.room.public.interview", langId), 
Type.interview, 16L, true, null);
+                       
createRoom(labelDao.getString("install.room.public.conference", langId), 
Type.conference, 32L, true, null);
+                       Room r = 
createRoom(labelDao.getString("install.room.public.video.only", langId), 
Type.conference, 32L, true, null);
                        r.hide(RoomElement.Whiteboard);
                        roomDao.update(r, null);
-                       createRoom("public Video And Whiteboard Room", 
Type.conference, 32L, true, null);
-                       createRoom("public Restricted Room", Type.restricted, 
100L, true, null);
-                       r = createRoom("restricted room with micro option set", 
Type.restricted, 100L, true, null);
+                       
createRoom(labelDao.getString("install.room.public.video.wb", langId), 
Type.conference, 32L, true, null);
+                       
createRoom(labelDao.getString("install.room.public.restricted", langId), 
Type.restricted, 100L, true, null);
+                       r = 
createRoom(labelDao.getString("install.room.restricted.micro", langId), 
Type.restricted, 100L, true, null);
                        r.getHiddenElements().clear();
                        roomDao.update(r, null);
 
-                       r = createRoom("conference room with micro option set", 
Type.conference, 32L, true, null);
+                       r = 
createRoom(labelDao.getString("install.room.conference.micro", langId), 
Type.conference, 32L, true, null);
                        r.getHiddenElements().clear();
                        roomDao.update(r, null);
 
-                       createRoom("private Conference Room", Type.conference, 
32L, false, 1L);
+                       
createRoom(labelDao.getString("install.room.private.conference", langId), 
Type.conference, 32L, false, 1L);
                }
        }
 
@@ -503,15 +508,15 @@ public class ImportInitvalues {
                        log.debug("System contains users, no need to install 
data one more time.");
                }
                sipDao.delete();
-               progress = 16;
+               progress = 14;
                loadMainMenu();
-               progress = 32;
+               progress = 28;
                loadErrorMappingsFromXML();
-               progress = 48;
+               progress = 42;
                loadConfiguration(cfg);
-               progress = 80;
+               progress = 56;
                loadInitialOAuthServers();
-               progress = 99;
+               progress = 70;
        }
 
        public void loadAll(InstallationConfig cfg, boolean force) throws 
Exception {
@@ -522,9 +527,9 @@ public class ImportInitvalues {
                }
                loadSystem(cfg, force);
                loadInitUserAndGroup(cfg);
-               progress = 94;
+               progress = 84;
 
-               loadDefaultRooms("1".equals(cfg.createDefaultRooms));
+               loadDefaultRooms("1".equals(cfg.createDefaultRooms), 
StringValue.valueOf(cfg.defaultLangId).toLong(1L));
                progress = 100;
        }
 }

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
 Thu May 12 11:35:22 2016
@@ -101,7 +101,7 @@ public class AppointmentLogic {
                String smsSubject = generateSMSSubject(langDao.getString(1158L, 
langId), a);
 
                AppointmentReminderTemplate t = 
AppointmentReminderTemplate.get(langId, a, tz);
-               invitationManager.sendInvitionLink(inv, MessageType.Create, 
t.getSubject(), t.getEmail(), false);
+               invitationManager.sendInvitationLink(inv, MessageType.Create, 
t.getSubject(), t.getEmail(), false);
 
                
invitationManager.sendInvitationReminderSMS(u.getAddress().getPhone(), 
smsSubject, langId);
                if (inv.getHash() != null) {

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.service.mail;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
@@ -66,7 +67,7 @@ public class EmailManager {
                String link = 
((IApplication)Application.get(wicketApplicationName)).urlForActivatePage(new 
PageParameters().add("u",  hash));
                
                if (sendEmailAtRegister == 1) {
-                       RegisterUserTemplate.ensureApplication(langId != null ? 
langId :
+                       ensureApplication(langId != null ? langId :
                                        
configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
                        mailHandler.send(email, getString(512)
                                , RegisterUserTemplate.getEmail(username, 
userpass, email, sendEmailWithVerficationCode ? link : null));

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
 Thu May 12 11:35:22 2016
@@ -18,31 +18,23 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
-import static 
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
 
-import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.IWebSession;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.label.LabelDao;
 import org.apache.openmeetings.db.util.FormatHelper;
-import org.apache.wicket.Application;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ThreadContext;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.mock.MockWebResponse;
 import org.apache.wicket.protocol.http.BufferedWebResponse;
 import org.apache.wicket.protocol.http.WebSession;
-import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
-import org.apache.wicket.protocol.http.mock.MockHttpSession;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.request.Response;
 import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.cycle.RequestCycleContext;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 
@@ -50,12 +42,8 @@ public abstract class AbstractTemplatePa
        private static final long serialVersionUID = 1L;
        protected long langId;
        
-       public static IApplication getApp() {
-               return (IApplication)Application.get(wicketApplicationName);
-       }
-       
        public static <T> T getBean(Class<T> clazz) {
-               return getApp().getOmBean(clazz);
+               return ensureApplication().getOmBean(clazz);
        }
        
        public static IWebSession getOmSession() {
@@ -69,7 +57,7 @@ public abstract class AbstractTemplatePa
        }
        
        public static String getString(long id, long languageId) {
-               return getApp().getOmString(id, languageId);
+               return ensureApplication().getOmString(id, languageId);
        }
 
        /**
@@ -108,25 +96,4 @@ public abstract class AbstractTemplatePa
                        return new StringResourceStream("<wicket:container 
wicket:id='" + COMP_ID + "'></wicket:container>");
                }
        }
-       
-       public static void ensureApplication(long langId) {
-               IApplication a = null;
-               if (Application.exists()) {
-                       a = (IApplication)Application.get();
-               } else {
-                       Application app = 
Application.get(wicketApplicationName);
-                       ThreadContext.setApplication(app);
-                       a = 
(IApplication)Application.get(wicketApplicationName);
-               }
-               if (ThreadContext.getRequestCycle() == null) {
-                       ServletWebRequest req = new ServletWebRequest(new 
MockHttpServletRequest((Application)a, new 
MockHttpSession(a.getServletContext()), a.getServletContext()), "");
-                       RequestCycleContext rctx = new RequestCycleContext(req, 
new MockWebResponse(), a.getRootRequestMapper(), 
a.getExceptionMapperProvider().get()); 
-                       ThreadContext.setRequestCycle(new RequestCycle(rctx));
-               }
-               if (ThreadContext.getSession() == null) {
-                       WebSession s = WebSession.get();
-                       ((IWebSession)s).setLanguage(langId);
-                       ThreadContext.setSession(s);
-               }
-       }
 }

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
 import java.util.TimeZone;
 
 import org.apache.openmeetings.db.entity.calendar.Appointment;

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
 import java.util.TimeZone;
 
 import org.apache.openmeetings.db.entity.calendar.Appointment;

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
 import java.util.TimeZone;
 
 import org.apache.openmeetings.db.entity.calendar.Appointment;

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;
@@ -34,7 +36,7 @@ public class RequestContactTemplate exte
                add(new Label("lastName", user.getLastname()));
                add(new Label("likeToAdd", getString(1193, langId)));
                add(new Label("check", getString(1194, langId)));
-               add(new ExternalLink("link", 
getApp().getOmContactsLink()).add(new Label("contactList", getString(1196, 
langId))));
+               add(new ExternalLink("link", 
ensureApplication().getOmContactsLink()).add(new Label("contactList", 
getString(1196, langId))));
        }
        
        public static String getEmail(User userToAdd, User user) {

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
 Thu May 12 11:35:22 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.service.mail.template;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
 import java.util.TimeZone;
 
 import org.apache.openmeetings.db.entity.calendar.Appointment;

Modified: 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
 Thu May 12 11:35:22 2016
@@ -18,9 +18,9 @@
  */
 package org.apache.openmeetings.service.room;
 
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
 import static org.apache.openmeetings.util.CalendarHelper.getZoneId;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static 
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
 
 import java.util.Date;
 import java.util.Map;
@@ -53,7 +53,6 @@ import org.apache.openmeetings.service.m
 import org.apache.openmeetings.util.CalendarHelper;
 import org.apache.openmeetings.util.crypt.CryptProvider;
 import org.apache.openmeetings.util.mail.IcalHandler;
-import org.apache.wicket.Application;
 import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -108,12 +107,16 @@ public class InvitationManager implement
                                break;
                        
                }
-               sendInvitionLink(mm.getInvitation(), type, t.getSubject(), 
t.getEmail(), ical);
+               sendInvitationLink(mm.getInvitation(), type, t.getSubject(), 
t.getEmail(), ical);
        }
        
        @Override
-       public void sendInvitionLink(Invitation i, MessageType type, String 
subject, String message, boolean ical) throws Exception {
-               String invitation_link = type == MessageType.Cancel ? null : 
((IApplication)Application.get(wicketApplicationName)).getOmInvitationLink(configDao.getBaseUrl(),
 i); //TODO check for exceptions
+       public void sendInvitationLink(Invitation i, MessageType type, String 
subject, String message, boolean ical) throws Exception {
+               String invitation_link = null;
+               if (type != MessageType.Cancel) {
+                       IApplication app = ensureApplication(1L);
+                       invitation_link = 
app.getOmInvitationLink(configDao.getBaseUrl(), i);
+               }
                User owner = i.getInvitedBy();
                
                String invitorName = owner.getFirstname() + " " + 
owner.getLastname();

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 Thu May 12 11:35:22 2016
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.ut
 import static 
org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
 import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
 import static org.red5.logging.Red5LoggerFactory.getLogger;
-import static 
org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE;
 import static 
org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import java.text.MessageFormat;
@@ -37,8 +36,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.ServletContext;
-
 import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.core.remote.MainService;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -91,10 +88,8 @@ import org.apache.wicket.request.mapper.
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
 import org.apache.wicket.util.collections.ConcurrentHashSet;
-import org.apache.wicket.util.tester.WicketTester;
 import org.slf4j.Logger;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
 
 import ro.fortsoft.wicket.dashboard.WidgetRegistry;
 import ro.fortsoft.wicket.dashboard.web.DashboardContext;
@@ -440,39 +435,6 @@ public class Application extends Authent
                }
        }
        
-       public static WicketTester getWicketTester() {
-               return getWicketTester(-1);
-       }
-       
-       public static WicketTester getWicketTester(long langId) {
-               Application app = new Application();
-               
-               WicketTester tester = new WicketTester(app);
-               ServletContext sc = app.getServletContext();
-               XmlWebApplicationContext xmlContext = new 
XmlWebApplicationContext();
-               
xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
-               xmlContext.setServletContext(sc);
-               xmlContext.refresh();
-               sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, 
xmlContext);
-               if (langId > 0) {
-                       WebSession.get().setLanguage(langId);
-               }
-               InitializationContainer.initComplete = true;
-               return tester;
-       }
-       
-       public static void destroy(WicketTester tester) {
-               if (tester != null) {
-                       ServletContext sc = tester.getServletContext();
-                       try {
-                               
((XmlWebApplicationContext)sc.getAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).close();
-                       } catch (Exception e) {
-                               log.error("Unexpected error while destroying 
XmlWebApplicationContext", e);
-                       }
-                       tester.destroy();
-               }
-       }
-       
        @Override
        public <T> T getOmBean(Class<T> clazz) { //FIXME hack for email 
templates support (should be in separate module for now
                return Application.getBean(clazz);

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 Thu May 12 11:35:22 2016
@@ -1920,4 +1920,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unerwarteter Fehler 
während dem Cleanup</entry>
        <entry key="room.action.request.right.moderator">möchte Moderator 
dieses Raums sein.</entry>
        <entry key="admin.room.hidden.elements">versteckte Raumfeatures</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 Thu May 12 11:35:22 2016
@@ -1904,4 +1904,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 Thu May 12 11:35:22 2016
@@ -1876,4 +1876,12 @@
   <entry key="dashboard.widget.admin.cleanup.error">Erreur inattendue en 
effectuant le nettoyage</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 Thu May 12 11:35:22 2016
@@ -1898,4 +1898,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 Thu May 12 11:35:22 2016
@@ -1912,4 +1912,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
 Thu May 12 11:35:22 2016
@@ -1916,4 +1916,12 @@
        <entry 
key="dashboard.widget.admin.cleanup.error">Неизвестная ошибка 
при попытке очистить</entry>
        <entry key="room.action.request.right.moderator">хочет быть 
модератором в этой комнате.</entry>
        <entry key="admin.room.hidden.elements">Скрытые элементы 
комнаты</entry>
+       <entry key="install.room.public.interview">Публичная 
комната для интервью</entry>
+       <entry key="install.room.public.conference">Публичная 
комната для конференций</entry>
+       <entry key="install.room.public.video.only">Публичная 
комната только для видео</entry>
+       <entry key="install.room.public.video.wb">Публичная 
комната для видео с доской</entry>
+       <entry key="install.room.public.restricted">Публичная 
расширенная комната</entry>
+       <entry key="install.room.restricted.micro">Расширенная 
комната со статусом микрофона</entry>
+       <entry key="install.room.conference.micro">Комната для 
конференций со статусом микрофона</entry>
+       <entry key="install.room.private.conference">Закрытая 
комната для конференций</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 Thu May 12 11:35:22 2016
@@ -1880,4 +1880,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 Thu May 12 11:35:22 2016
@@ -1910,4 +1910,12 @@
        <entry key="dashboard.widget.admin.cleanup.error">Unexpected error 
while performing cleanup</entry>
        <entry key="room.action.request.right.moderator">would like to be 
moderator of this room.</entry>
        <entry key="admin.room.hidden.elements">Hidden room elements</entry>
+       <entry key="install.room.public.interview">Public Interview Room</entry>
+       <entry key="install.room.public.conference">Public Conference 
Room</entry>
+       <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
+       <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
+       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
+       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
+       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.private.conference">Private Conference 
Room</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/InvitationDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/InvitationDialog.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/InvitationDialog.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/InvitationDialog.java
 Thu May 12 11:35:22 2016
@@ -235,7 +235,7 @@ public class InvitationDialog extends Ab
                                        for (User u : 
recipients.getModelObject()) {
                                                Invitation i = create(u);
                                                try {
-                                                       
getBean(InvitationManager.class).sendInvitionLink(i, MessageType.Create, 
subject.getObject(), message.getObject(), false);
+                                                       
getBean(InvitationManager.class).sendInvitationLink(i, MessageType.Create, 
subject.getObject(), message.getObject(), false);
                                                } catch (Exception e) {
                                                        log.error("error while 
sending invitation by User ", e);
                                                }
@@ -245,7 +245,7 @@ public class InvitationDialog extends Ab
                                                for (GroupUser ou : 
getBean(GroupUserDao.class).get(g.getId(), 0, Integer.MAX_VALUE)) {
                                                        Invitation i = 
create(ou.getUser());
                                                        try {
-                                                               
getBean(InvitationManager.class).sendInvitionLink(i, MessageType.Create, 
subject.getObject(), message.getObject(), false);
+                                                               
getBean(InvitationManager.class).sendInvitationLink(i, MessageType.Create, 
subject.getObject(), message.getObject(), false);
                                                        } catch (Exception e) {
                                                                
log.error("error while sending invitation by Group ", e);
                                                        }
@@ -255,7 +255,7 @@ public class InvitationDialog extends Ab
                        } else {
                                Invitation i = form.getModelObject();
                                try {
-                                       
getBean(InvitationManager.class).sendInvitionLink(i, MessageType.Create, 
subject.getObject(), message.getObject(), false);
+                                       
getBean(InvitationManager.class).sendInvitationLink(i, MessageType.Create, 
subject.getObject(), message.getObject(), false);
                                } catch (Exception e) {
                                        log.error("error while sending 
invitation by URL ", e);
                                }

Modified: 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 Thu May 12 11:35:22 2016
@@ -19,6 +19,7 @@
 package org.apache.openmeetings.test;
 
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.Date;
@@ -56,6 +57,7 @@ public abstract class AbstractJUnitDefau
 
        @Before
        public void setUp() throws Exception {
+               wicketApplicationName = "openmeetings";
                configurationDao.getCryptKey();
                if (userDao.count() < 1) {
                        makeDefaultScheme();

Modified: 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
 Thu May 12 11:35:22 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.openmeetings.test;
 
-import static org.apache.openmeetings.web.app.Application.getWicketTester;
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.getWicketTester;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 

Modified: 
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1743492&r1=1743491&r2=1743492&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
 Thu May 12 11:35:22 2016
@@ -467,7 +467,7 @@ public class RoomWebService {
                                
                                if (i != null) {
                                        if (sendmail) {
-                                               
invitationManager.sendInvitionLink(i, MessageType.Create, invite.getSubject(), 
invite.getMessage(), false);
+                                               
invitationManager.sendInvitationLink(i, MessageType.Create, 
invite.getSubject(), invite.getMessage(), false);
                                        }
                                        return new ServiceResult(1L, 
i.getHash(), Type.SUCCESS);
                                } else {