svn commit: r1654727 [1/2] - in /openmeetings: branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/ branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/ branches/3.0.x/src/main/java/org/apache/openmeetings/data/...

solomax Sun, 25 Jan 2015 22:36:13 -0800

Author: solomax
Date: Mon Jan 26 06:35:46 2015
New Revision: 1654727

URL: http://svn.apache.org/r1654727
Log:
[OPENMEETINGS-1130] appointment reminders are moved to the templates; tags in 
the description are displayed as expected


Added:
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.html
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
      - copied, changed from r1654723, 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.html
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java
      - copied, changed from r1654717, 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java
      - copied, changed from r1654717, 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java
      - copied, changed from r1654717, 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java
Removed:
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/
Modified:
    
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
    openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/chinese simplified.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
traditional.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.html
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.html
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.html
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.html
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.html
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.html
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese
 simplified.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese
 traditional.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch
 (studIP).xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues
 brazil.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
    openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
    
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
    
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java

Modified: 
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Date;
 
 import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.data.user.UserManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.basic.ErrorDao;
@@ -72,8 +71,6 @@ public class UserWebService {
        @Autowired
        private UserManager userManagement;
        @Autowired
-       private FieldManager fieldManager;
-       @Autowired
        private ErrorDao errorDao;
        @Autowired
        private OrganisationDao orgDao;

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
 Mon Jan 26 06:35:46 2015
@@ -29,7 +29,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.data.conference.InvitationManager;
 import org.apache.openmeetings.data.conference.RoomManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -38,6 +37,7 @@ import org.apache.openmeetings.db.dao.ca
 import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
 import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType;
 import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
 import org.apache.openmeetings.db.dao.room.InvitationDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -48,7 +48,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.web.mail.template.AppointmentReminderTemplate;
 import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -66,7 +66,7 @@ public class AppointmentLogic {
        @Autowired
        private ConfigurationDao configurationDao;
        @Autowired
-       private FieldManager fieldManager;
+       private FieldLanguagesValuesDao langDao;
        @Autowired
        private RoomDao roomDao;
        @Autowired
@@ -146,6 +146,7 @@ public class AppointmentLogic {
                i.setInvitedBy(u);
                i.setInvitee(u);
                i.setAppointment(a);
+               i.setRoom(a.getRoom());
                sendReminder(u, a, i);
        }
        
@@ -156,23 +157,18 @@ public class AppointmentLogic {
                        return;
                }
 
-               TimeZone tZone = timezoneUtil.getTimeZone(u.getTimeZoneId());
+               TimeZone tz = timezoneUtil.getTimeZone(u.getTimeZoneId());
 
-               long language_id = u.getLanguage_id();
+               long langId = u.getLanguage_id();
                // Get the required labels one time for all meeting members. The
                // Language of the email will be the system default language
-               String labelid1158 = fieldManager.getString(1158L, language_id);
-               String labelid1153 = fieldManager.getString(1153L, language_id);
-               String labelid1154 = fieldManager.getString(1154L, language_id);
 
-               String subject = generateSubject(labelid1158, a, tZone);
-               String smsSubject = generateSMSSubject(labelid1158, a);
+               String smsSubject = generateSMSSubject(langDao.getString(1158L, 
langId), a);
 
-               String message = generateMessage(labelid1158, a, language_id, 
labelid1153, labelid1154, tZone);
+               AppointmentReminderTemplate t = 
AppointmentReminderTemplate.get(langId, a, tz);
+               invitationManager.sendInvitionLink(inv, MessageType.Create, 
t.getSubject(), t.getEmail(), false);
 
-               invitationManager.sendInvitionLink(inv, MessageType.Create, 
subject, message, false);
-
-               
invitationManager.sendInvitationReminderSMS(u.getAdresses().getPhone(), 
smsSubject, language_id);
+               
invitationManager.sendInvitationReminderSMS(u.getAdresses().getPhone(), 
smsSubject, langId);
                if (inv.getHash() != null) {
                        inv.setUpdated(new Date());
                        invitationDao.update(inv);
@@ -250,52 +246,12 @@ public class AppointmentLogic {
                }
        }
 
-       private String generateSubject(String labelid1158, Appointment ment, 
TimeZone timezone) {
-               StringBuilder message = new StringBuilder(labelid1158);
-               message.append(" ").append(ment.getTitle()).append(' ')
-                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getStart(),
 timezone))
-                       .append(" - 
").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getEnd(),
 timezone));
-
-               return message.toString();
-
-       }
-
        private String generateSMSSubject(String labelid1158, Appointment ment) 
{
                String subj = configurationDao.getConfValue("sms.subject", 
String.class, null);
                return subj == null || subj.length() == 0 ? 
                                labelid1158 + " " + ment.getTitle() : subj;
        }
        
-       /**
-        * Generate a localized message including the time and date of the 
meeting
-        * event
-        * 
-        * @param labelid1158
-        * @param ment
-        * @param language_id
-        * @param labelid1153
-        * @param jNameTimeZone
-        * @param labelid1154
-        * @return
-        */
-       private String generateMessage(String labelid1158, Appointment ment, 
Long language_id,
-                       String labelid1153, String labelid1154, TimeZone 
timezone) {
-               StringBuilder message = new StringBuilder(labelid1158);
-               message.append(" ").append(ment.getTitle());
-
-               if (ment.getDescription() != null && 
ment.getDescription().length() > 0) {
-                       message.append(fieldManager.getString(1152L, 
language_id)).append(ment.getDescription());
-               }
-
-               message.append("<br/>").append(labelid1153).append(' ')
-                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getStart(),
 timezone))
-                       .append("<br/>").append(labelid1154).append(' ')
-                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getEnd(), 
timezone))
-                       .append("<br/>");
-
-               return message.toString();
-       }
-
        public Appointment getAppointment(String appointmentName,
                        String appointmentLocation, String 
appointmentDescription,
                        Calendar appointmentstart, Calendar appointmentend,

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
 Mon Jan 26 06:35:46 2015
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.TimeZone;
 import java.util.Vector;
 
-import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.calendar.IInvitationManager;
 import org.apache.openmeetings.db.dao.room.InvitationDao;
@@ -67,8 +66,6 @@ public class InvitationManager implement
        @Autowired
        private InvitationDao invitationDao;
        @Autowired
-       private FieldManager fieldManager;
-       @Autowired
        private MailHandler mailHandler;
        @Autowired
        private SMSHandler smsHandler;

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
 Mon Jan 26 06:35:46 2015
@@ -35,7 +35,6 @@ import javax.persistence.criteria.Criter
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.db.dao.room.IRoomManager;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
@@ -73,8 +72,6 @@ public class RoomManager implements IRoo
        private UserDao usersDao;
        @Autowired
        private ISessionManager sessionManager;
-       @Autowired
-       private FieldManager fieldManager;
     @Autowired
        private RoomDao roomDao;
     @Autowired

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
 Mon Jan 26 06:35:46 2015
@@ -35,7 +35,6 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.server.ISessionManager;
 import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -82,8 +81,6 @@ public class UserManager implements IUse
        @Autowired
        private ConfigurationDao configurationDao;
        @Autowired
-       private FieldManager fieldManager;
-       @Autowired
        private StateDao statemanagement;
        @Autowired
        private OrganisationDao orgDao;

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
 Mon Jan 26 06:35:46 2015
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.TimeZone;
 
 import org.apache.openmeetings.cluster.SlaveHTTPConnectionManager;
-import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.data.conference.InvitationManager;
 import org.apache.openmeetings.data.conference.RoomManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -90,8 +89,6 @@ public class UserService implements IUse
        @Autowired
        private UserDao userDao;
        @Autowired
-       private FieldManager fieldManager;
-       @Autowired
        private SalutationDao salutationmanagement;
        @Autowired
        private RoomManager roomManager;

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
simplified.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/chinese%20simplified.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
simplified.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
simplified.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>æ°ä¼è®®:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>è¯¦ç»æåµ&lt;br/&gt;</value>
+    <value>è¯¦ç»æåµ</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>å¼å§æ¶é´:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
traditional.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/chinese%20traditional.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
traditional.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/chinese 
traditional.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch 
(studIP).xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml 
Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>Neue $APP_NAME Konferenz:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>Ãºj $APP_NAME konferencia:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>RÃ©szletek:&lt;br/&gt;</value>
+    <value>RÃ©szletek:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>KezdÅdik:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml Mon 
Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>$APP_NAMEä¼è°ãè¨å®ããã¾ãã:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>&lt;br/&gt;è©³ç´°:&lt;br/&gt;</value>
+    <value>è©³ç´°:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>éå§æå»:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/portugues 
brazil.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/portugues%20brazil.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml 
Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>Nova conferÃªncia $APP_NAME</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>&lt;br/&gt;Detalhes:&lt;br/&gt;</value>
+    <value>Detalhes:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Inicio:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml Mon Jan 
26 06:35:46 2015
@@ -3485,7 +3485,7 @@ see http://openmeetings.apache.org/Langu
     <value>Nueva $APP_NAME conferencia:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Detalles:&lt;br/&gt;</value>
+    <value>Detalles:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Comenzar:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml Mon Jan 26 
06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml 
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml Mon Jan 
26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
     <value>New $APP_NAME conference:</value>
   </string>
   <string id="1152" name="calendar invitation message">
-    <value>Details:&lt;br/&gt;</value>
+    <value>Details:</value>
   </string>
   <string id="1153" name="calendar invitation message">
     <value>Start:</value>

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -10,7 +10,7 @@ public abstract class AbstractAppointmen
        protected Appointment a;
        protected TimeZone tz;
 
-       public AbstractAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz, String invitorName) {
+       public AbstractAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz) {
                super(TemplatePage.COMP_ID);
                this.langId = langId == null ? 1 : langId;
                this.a = a;

Added: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.html?rev=1654727&view=auto
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.html
 (added)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+       <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
+       <div wicket:id="descContainer">
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
+       </div>
+       <br/>
+       <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>
+       <span wicket:id="endLbl"></span>&nbsp;<span wicket:id="end"></span><br/>
+</wicket:panel>
+</html>

Added: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.java?rev=1654727&view=auto
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.java
 (added)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AppointmentReminderTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.openmeetings.web.mail.template;
+
+import java.util.TimeZone;
+
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.util.string.Strings;
+
+public class AppointmentReminderTemplate extends AbstractAppointmentTemplate {
+       private static final long serialVersionUID = 1L;
+
+       private AppointmentReminderTemplate(Long langId, Appointment a, 
TimeZone tz) {
+               super(langId, a, tz);
+
+               add(new Label("titleLbl", WebSession.getString(1158L, langId)));
+               add(new Label("title", a.getTitle()));
+               add(new WebMarkupContainer("descContainer")
+                       .add(new Label("descLbl", WebSession.getString(1152L, 
langId)))
+                       .add(new Label("desc", 
a.getDescription()).setEscapeModelStrings(false))
+                       .setVisible(!Strings.isEmpty(a.getDescription()))
+                       );
+               add(new Label("startLbl", WebSession.getString(1153L, langId)));
+               add(new Label("start", 
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
+               add(new Label("endLbl", WebSession.getString(1154L, langId)));
+               add(new Label("end", 
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
+       }
+       
+       public static AppointmentReminderTemplate get(Long langId, Appointment 
a, TimeZone tz) {
+               ensureApplication(langId);
+               return new AppointmentReminderTemplate(langId, a, tz);
+       }
+
+       @Override
+       public String getSubject() {
+               StringBuilder sb = new StringBuilder();
+               sb.append(WebSession.getString(1158L, langId)).append(" 
").append(" ").append(a.getTitle()).append(' ')
+                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), 
tz))
+                       .append(" - 
").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), 
tz));
+
+               return sb.toString();
+       }
+}

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.html?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.html
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,9 @@
 <wicket:panel>
        <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
        <div wicket:id="descContainer">
-               <span wicket:id="descLbl"></span>&nbsp;<span 
wicket:id="desc"></span>
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
        </div>
        <br/>
        <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -31,13 +31,13 @@ public class CanceledAppointmentTemplate
        private static final long serialVersionUID = 1L;
 
        private CanceledAppointmentTemplate(Long langId, Appointment a, 
TimeZone tz, String invitorName) {
-               super(langId, a, tz, invitorName);
+               super(langId, a, tz);
 
                add(new Label("titleLbl", WebSession.getString(1157L, langId)));
                add(new Label("title", a.getTitle()));
                add(new WebMarkupContainer("descContainer")
                        .add(new Label("descLbl", WebSession.getString(1152L, 
langId)))
-                       .add(new Label("desc", a.getDescription()))
+                       .add(new Label("desc", 
a.getDescription()).setEscapeModelStrings(false))
                        .setVisible(!Strings.isEmpty(a.getDescription()))
                        );
                add(new Label("startLbl", WebSession.getString(1153L, langId)));

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.html?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.html
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,9 @@
 <wicket:panel>
        <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
        <div wicket:id="descContainer">
-               <span wicket:id="descLbl"></span>&nbsp;<span 
wicket:id="desc"></span>
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
        </div>
        <br/>
        <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -31,7 +31,7 @@ public class CreatedAppointmentTemplate
        private static final long serialVersionUID = 1L;
 
        private CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz, String invitorName) {
-               super(langId, a, tz, invitorName);
+               super(langId, a, tz);
 
                add(new Label("titleLbl", WebSession.getString(1151L, langId)));
                add(new Label("title", a.getTitle()));

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.html?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.html
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,9 @@
 <wicket:panel>
        <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
        <div wicket:id="descContainer">
-               <span wicket:id="descLbl"></span>&nbsp;<span 
wicket:id="desc"></span>
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
        </div>
        <br/>
        <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -31,13 +31,13 @@ public class UpdatedAppointmentTemplate
        private static final long serialVersionUID = 1L;
 
        private UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz, String invitorName) {
-               super(langId, a, tz, invitorName);
+               super(langId, a, tz);
 
                add(new Label("titleLbl", WebSession.getString(1155L, langId)));
                add(new Label("title", a.getTitle()));
                add(new WebMarkupContainer("descContainer")
                        .add(new Label("descLbl", WebSession.getString(1152L, 
langId)))
-                       .add(new Label("desc", a.getDescription()))
+                       .add(new Label("desc", 
a.getDescription()).setEscapeModelStrings(false))
                        .setVisible(!Strings.isEmpty(a.getDescription()))
                        );
                add(new Label("startLbl", WebSession.getString(1153L, langId)));

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=1654727&r1=1654726&r2=1654727&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
 Mon Jan 26 06:35:46 2015
@@ -28,9 +28,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
 import org.apache.openmeetings.core.data.conference.RoomManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
 import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -64,7 +64,7 @@ public class ConferenceService {
        private static final Logger log = 
Red5LoggerFactory.getLogger(ConferenceService.class, webAppRootKey);
 
        @Autowired
-       private AppointmentLogic appointmentLogic;
+       private AppointmentDao appointmentDao;
        @Autowired
        private SessiondataDao sessiondataDao;
        @Autowired
@@ -253,7 +253,7 @@ public class ConferenceService {
                        return null;
 
                try {
-                       Appointment ment = 
appointmentLogic.getAppointmentByRoom(room_id);
+                       Appointment ment = 
appointmentDao.getAppointmentByRoom(room_id);
 
                        return ment;
                } catch (Exception e) {
@@ -276,8 +276,7 @@ public class ConferenceService {
 
                if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
 
-                       List<Appointment> points = appointmentLogic
-                                       .getTodaysAppointmentsForUser(users_id);
+                       List<Appointment> points = 
appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id);
                        List<Room> result = new ArrayList<Room>();
 
                        if (points != null) {
@@ -314,8 +313,7 @@ public class ConferenceService {
                        Long users_id = sessiondataDao.checkSession(SID);
 
                        if 
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
-                               List<Appointment> appointments = 
appointmentLogic
-                                               
.getTodaysAppointmentsForUser(users_id);
+                               List<Appointment> appointments = 
appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id);
                                List<Room> result = new ArrayList<Room>();
 
                                if (appointments != null) {

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=1654727&r1=1654726&r2=1654727&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
 Mon Jan 26 06:35:46 2015
@@ -32,13 +32,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
 import org.apache.openmeetings.core.data.conference.RoomManager;
 import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
 import org.apache.openmeetings.core.remote.FLVRecorderService;
 import org.apache.openmeetings.core.remote.WhiteBoardService;
 import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
 import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
 import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
@@ -91,7 +91,7 @@ public class ScopeApplicationAdapter ext
        @Autowired
        private ConfigurationDao configurationDao;
        @Autowired
-       private AppointmentLogic appointmentLogic;
+       private AppointmentDao appointmentDao;
        @Autowired
        private SessiondataDao sessiondataDao;
        @Autowired
@@ -1283,7 +1283,7 @@ public class ScopeApplicationAdapter ext
                        } else {
                                // If this is an Appointment then the Moderator 
will be set to the Invitor
 
-                               Appointment ment = 
appointmentLogic.getAppointmentByRoom(room_id);
+                               Appointment ment = 
appointmentDao.getAppointmentByRoom(room_id);
 
                                Long userIdInRoomClient = 
currentClient.getUser_id();
 

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 Mon Jan 26 06:35:46 2015
@@ -347,6 +347,11 @@ public class AppointmentDao {
                                .setParameter("roomId", roomId)
                                .getResultList();
 
-               return list.size() > 0 ? list.get(0) : null;
+               Appointment a = list.size() > 0 ? list.get(0) : null;
+               if (a != null && !a.getRoom().isAppointment()) {
+                       throw new RuntimeException("Room " + 
a.getRoom().getName() + " isnt part of an appointed meeting");
+               }
+
+               return a;
        }
 }

Copied: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
 (from r1654723, 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java)
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?p2=openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java&r1=1654723&r2=1654727&rev=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
 Mon Jan 26 06:35:46 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.core.data.calendar.management;
+package org.apache.openmeetings.service.calendar;
 
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
@@ -49,7 +49,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.util.CalendarPatterns;
+import 
org.apache.openmeetings.service.mail.template.AppointmentReminderTemplate;
 import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -85,40 +85,6 @@ public class AppointmentLogic {
        @Autowired
        private RoomTypeDao roomTypeDao;
 
-       public List<Appointment> getTodaysAppointmentsForUser(Long userId) {
-               try {
-                       log.debug("getTodaysAppointmentsForUser");
-                       List<Appointment> points = 
appointmentDao.getTodaysAppointmentsbyRangeAndMember(userId);
-                       log.debug("Count Appointments for Today : " + 
points.size());
-                       return points;
-               } catch (Exception err) {
-                       log.error("[getTodaysAppointmentsForUser]", err);
-               }
-               return null;
-       }
-
-       /**
-        * @author o.becherer
-        * @param room_id
-        * @return
-        */
-       // 
--------------------------------------------------------------------------------------------
-       public Appointment getAppointmentByRoom(Long room_id) throws Exception {
-               log.debug("getAppointmentByRoom");
-
-               Room room = roomDao.get(room_id);
-
-               if (room == null) {
-                       throw new Exception("Room does not exist in database!");
-               }
-
-               if (!room.isAppointment()) {
-                       throw new Exception("Room " + room.getName() + " isnt 
part of an appointed meeting");
-               }
-
-               return appointmentDao.getAppointmentByRoom(room_id);
-       }
-
        // 
--------------------------------------------------------------------------------------------
 
        // next appointment to current date
@@ -145,6 +111,7 @@ public class AppointmentLogic {
                i.setInvitedBy(u);
                i.setInvitee(u);
                i.setAppointment(a);
+               i.setRoom(a.getRoom());
                sendReminder(u, a, i);
        }
        
@@ -155,23 +122,18 @@ public class AppointmentLogic {
                        return;
                }
 
-               TimeZone tZone = timezoneUtil.getTimeZone(u.getTimeZoneId());
+               TimeZone tz = timezoneUtil.getTimeZone(u.getTimeZoneId());
 
-               long language_id = u.getLanguageId();
+               long langId = u.getLanguageId();
                // Get the required labels one time for all meeting members. The
                // Language of the email will be the system default language
-               String labelid1158 = langDao.getString(1158L, language_id);
-               String labelid1153 = langDao.getString(1153L, language_id);
-               String labelid1154 = langDao.getString(1154L, language_id);
 
-               String subject = generateSubject(labelid1158, a, tZone);
-               String smsSubject = generateSMSSubject(labelid1158, a);
+               String smsSubject = generateSMSSubject(langDao.getString(1158L, 
langId), a);
 
-               String message = generateMessage(labelid1158, a, language_id, 
labelid1153, labelid1154, tZone);
+               AppointmentReminderTemplate t = 
AppointmentReminderTemplate.get(langId, a, tz);
+               invitationManager.sendInvitionLink(inv, MessageType.Create, 
t.getSubject(), t.getEmail(), false);
 
-               invitationManager.sendInvitionLink(inv, MessageType.Create, 
subject, message, false);
-
-               
invitationManager.sendInvitationReminderSMS(u.getAdresses().getPhone(), 
smsSubject, language_id);
+               
invitationManager.sendInvitationReminderSMS(u.getAdresses().getPhone(), 
smsSubject, langId);
                if (inv.getHash() != null) {
                        inv.setUpdated(new Date());
                        invitationDao.update(inv);
@@ -248,51 +210,12 @@ public class AppointmentLogic {
                }
        }
 
-       private String generateSubject(String labelid1158, Appointment ment, 
TimeZone timezone) {
-               StringBuilder message = new StringBuilder(labelid1158);
-               message.append(" ").append(ment.getTitle()).append(' ')
-                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getStart(),
 timezone))
-                       .append(" - 
").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getEnd(),
 timezone));
-
-               return message.toString();
-
-       }
 
        private String generateSMSSubject(String labelid1158, Appointment ment) 
{
                String subj = configurationDao.getConfValue("sms.subject", 
String.class, null);
                return subj == null || subj.length() == 0 ? 
                                labelid1158 + " " + ment.getTitle() : subj;
        }
-       
-       /**
-        * Generate a localized message including the time and date of the 
meeting
-        * event
-        * 
-        * @param labelid1158
-        * @param ment
-        * @param language_id
-        * @param labelid1153
-        * @param jNameTimeZone
-        * @param labelid1154
-        * @return
-        */
-       private String generateMessage(String labelid1158, Appointment ment, 
Long language_id,
-                       String labelid1153, String labelid1154, TimeZone 
timezone) {
-               StringBuilder message = new StringBuilder(labelid1158);
-               message.append(" ").append(ment.getTitle());
-
-               if (ment.getDescription() != null && 
ment.getDescription().length() > 0) {
-                       message.append(langDao.getString(1152L, 
language_id)).append(ment.getDescription());
-               }
-
-               message.append("<br/>").append(labelid1153).append(' ')
-                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getStart(),
 timezone))
-                       .append("<br/>").append(labelid1154).append(' ')
-                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(ment.getEnd(), 
timezone))
-                       .append("<br/>");
-
-               return message.toString();
-       }
 
        public Appointment getAppointment(String appointmentName,
                        String appointmentLocation, String 
appointmentDescription,

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -10,7 +10,7 @@ public abstract class AbstractAppointmen
        protected Appointment a;
        protected TimeZone tz;
 
-       public AbstractAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz, String invitorName) {
+       public AbstractAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz) {
                super(TemplatePage.COMP_ID);
                this.langId = langId == null ? 1 : langId;
                this.a = a;

Added: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.html?rev=1654727&view=auto
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.html
 (added)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+       <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
+       <div wicket:id="descContainer">
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
+       </div>
+       <br/>
+       <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>
+       <span wicket:id="endLbl"></span>&nbsp;<span wicket:id="end"></span><br/>
+</wicket:panel>
+</html>

Added: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java?rev=1654727&view=auto
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
 (added)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.openmeetings.service.mail.template;
+
+import java.util.TimeZone;
+
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.util.string.Strings;
+
+public class AppointmentReminderTemplate extends AbstractAppointmentTemplate {
+       private static final long serialVersionUID = 1L;
+
+       private AppointmentReminderTemplate(Long langId, Appointment a, 
TimeZone tz) {
+               super(langId, a, tz);
+
+               add(new Label("titleLbl", getString(1158L, langId)));
+               add(new Label("title", a.getTitle()));
+               add(new WebMarkupContainer("descContainer")
+                       .add(new Label("descLbl", getString(1152L, langId)))
+                       .add(new Label("desc", 
a.getDescription()).setEscapeModelStrings(false))
+                       .setVisible(!Strings.isEmpty(a.getDescription()))
+                       );
+               add(new Label("startLbl", getString(1153L, langId)));
+               add(new Label("start", 
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
+               add(new Label("endLbl", getString(1154L, langId)));
+               add(new Label("end", 
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
+       }
+       
+       public static AppointmentReminderTemplate get(Long langId, Appointment 
a, TimeZone tz) {
+               ensureApplication(langId);
+               return new AppointmentReminderTemplate(langId, a, tz);
+       }
+
+       @Override
+       public String getSubject() {
+               StringBuilder sb = new StringBuilder();
+               sb.append(getString(1158L, langId)).append(" ").append(" 
").append(a.getTitle()).append(' ')
+                       
.append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), 
tz))
+                       .append(" - 
").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), 
tz));
+
+               return sb.toString();
+       }
+}

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.html?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,9 @@
 <wicket:panel>
        <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
        <div wicket:id="descContainer">
-               <span wicket:id="descLbl"></span>&nbsp;<span 
wicket:id="desc"></span>
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
        </div>
        <br/>
        <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -30,7 +30,7 @@ public class CanceledAppointmentTemplate
        private static final long serialVersionUID = 1L;
 
        private CanceledAppointmentTemplate(Long langId, Appointment a, 
TimeZone tz, String invitorName) {
-               super(langId, a, tz, invitorName);
+               super(langId, a, tz);
 
                add(new Label("titleLbl", getString(1157L, langId)));
                add(new Label("title", a.getTitle()));

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.html?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,9 @@
 <wicket:panel>
        <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
        <div wicket:id="descContainer">
-               <span wicket:id="descLbl"></span>&nbsp;<span 
wicket:id="desc"></span>
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
        </div>
        <br/>
        <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>

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=1654727&r1=1654726&r2=1654727&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
 Mon Jan 26 06:35:46 2015
@@ -30,7 +30,7 @@ public class CreatedAppointmentTemplate
        private static final long serialVersionUID = 1L;
 
        private CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz, String invitorName) {
-               super(langId, a, tz, invitorName);
+               super(langId, a, tz);
                
                add(new Label("titleLbl", getString(1151L, langId)));
                add(new Label("title", a.getTitle()));

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.html?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.html
 Mon Jan 26 06:35:46 2015
@@ -22,7 +22,9 @@
 <wicket:panel>
        <span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
        <div wicket:id="descContainer">
-               <span wicket:id="descLbl"></span>&nbsp;<span 
wicket:id="desc"></span>
+               <br/>
+               <span wicket:id="descLbl"></span><br/>
+               &nbsp;<span wicket:id="desc"></span>
        </div>
        <br/>
        <span wicket:id="startLbl"></span>&nbsp;<span 
wicket:id="start"></span><br/>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
 Mon Jan 26 06:35:46 2015
@@ -30,7 +30,7 @@ public class UpdatedAppointmentTemplate
        private static final long serialVersionUID = 1L;
 
        private UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone 
tz, String invitorName) {
-               super(langId, a, tz, invitorName);
+               super(langId, a, tz);
 
                add(new Label("titleLbl", getString(1155L, langId)));
                add(new Label("title", a.getTitle()));

svn commit: r1654727 [1/2] - in /openmeetings: branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/ branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/ branches/3.0.x/src/main/java/org/apache/openmeetings/data/...

Reply via email to