Author: solomax
Date: Sun Dec 29 13:03:46 2013
New Revision: 1554024
URL: http://svn.apache.org/r1554024
Log:
[OPENMEETINGS-757] Appointment invitations are sent as expected; code clean up;
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1554024&r1=1554023&r2=1554024&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
Sun Dec 29 13:03:46 2013
@@ -157,7 +157,7 @@ public class AppointmentDao {
if (mmList != null){
Appointment a0 = a.getId() == null ? null :
get(a.getId());
for (MeetingMember mm : mmList) {
- if (mm.getId() != null &&
!mmIds.contains(mm.getId())) {
+ if (mm.getId() == null ||
!mmIds.contains(mm.getId())) {
invitationManager.processInvitation(a,
mm, MessageType.Create, baseUrl);
} else {
boolean sendMail = a0 == null ||
!a0.getTitle().equals(a.getTitle()) ||
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1554024&r1=1554023&r2=1554024&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
Sun Dec 29 13:03:46 2013
@@ -34,7 +34,6 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
-import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.room.Room;
@@ -185,21 +184,9 @@ public class InvitationManager implement
log.debug("Invitation for Appointment : simple email");
try {
- User createdBy = a.getOwner();
- Invitation invitation = null;
- /* TODO check delete cascade
- if (MessageType.Cancel == type) {
- if (member.getInvitation() != null) {
-
member.getInvitation().setDeleted(true);
-
invitationDao.updateInvitation(member.getInvitation());
- }
- } else */
- if (MessageType.Cancel != type) {
- invitation =
getInvitation(mm.getInvitation()
- , mm.getUser(),
a.getRoom(), a.isPasswordProtected(), a.getPassword()
- , Valid.Period,
createdBy, baseUrl, null, a.getStart(), a.getEnd(), a);
- }
- mm.setInvitation(invitation);
+
mm.setInvitation(getInvitation(mm.getInvitation()
+ , mm.getUser(), a.getRoom(),
a.isPasswordProtected(), a.getPassword()
+ , Valid.Period, a.getOwner(),
baseUrl, null, a.getStart(), a.getEnd(), a));
if (sendMail) {
sendInvitionLink(a, mm, type,
remindType > 2);
}
@@ -209,156 +196,114 @@ public class InvitationManager implement
}
}
- private String formatSubject(Long language_id, Appointment point,
TimeZone timezone) {
- String message = fieldManager.getString(1151L, language_id) + "
" + point.getTitle();
+ private String formatSubject(Long langId, Appointment a, TimeZone tz) {
+ String message = fieldManager.getString(1151L, langId) + " " +
a.getTitle();
message += " "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(point.getStart(),
timezone);
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz);
message += " - "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(point.getEnd(),
timezone);
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz);
return message;
}
- private String formatMessage(Long language_id, Appointment point,
TimeZone timezone, String invitorName) {
- String message = fieldManager.getString(1151L, language_id) + "
" + point.getTitle();
+ private String formatMessage(Long langId, Appointment a, TimeZone tz,
String invitorName) {
+ String message = fieldManager.getString(1151L, langId) + " " +
a.getTitle();
- if (point.getDescription() != null &&
point.getDescription().length() != 0) {
- message += fieldManager.getString(1152L, language_id) +
point.getDescription();
+ if (a.getDescription() != null && a.getDescription().length()
!= 0) {
+ message += fieldManager.getString(1152L, langId) +
a.getDescription();
}
message += "<br/>"
- + fieldManager.getString(1153L, language_id)
+ + fieldManager.getString(1153L, langId)
+ ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(point.getStart(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ "<br/>";
- message += fieldManager.getString(1154L, language_id)
+ message += fieldManager.getString(1154L, langId)
+ ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(point.getEnd(),
timezone) + "<br/>";
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz) +
"<br/>";
- message += fieldManager.getString(1156L, language_id) +
invitorName + "<br/>";
+ message += fieldManager.getString(1156L, langId) + invitorName
+ "<br/>";
return message;
}
- private String formatCancelSubject(Long language_id, Appointment
appointment, TimeZone timezone) {
- String message = fieldManager.getString(1157L, language_id)
- + appointment.getTitle();
+ private String formatCancelSubject(Long langId, Appointment a, TimeZone
tz) {
+ String message = fieldManager.getString(1157L, langId) +
a.getTitle();
message += " "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getStart(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ " - "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getEnd(), timezone);
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz);
return message;
}
- private String formatCancelMessage(Long language_id,
- Appointment appointment, TimeZone timezone, String
invitorName) {
+ private String formatCancelMessage(Long langId, Appointment a, TimeZone
tz, String invitorName) {
try {
- String message = fieldManager.getString(1157L,
language_id)
- + appointment.getTitle();
-
- if (appointment.getDescription() != null &&
- appointment.getDescription().length()
!= 0) {
-
- Fieldlanguagesvalues labelid1152 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1152), language_id);
- message += labelid1152.getValue()
- + appointment.getDescription();
+ String message = fieldManager.getString(1157L, langId)
+ a.getTitle();
+ if (a.getDescription() != null &&
a.getDescription().length() != 0) {
+ message += fieldManager.getString(1152L,
langId) + a.getDescription();
}
- Fieldlanguagesvalues labelid1153 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1153), language_id);
- Fieldlanguagesvalues labelid1154 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1154), language_id);
-
message += "<br/>"
- + labelid1153.getValue()
+ + fieldManager.getString(1153L, langId)
+ ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getStart(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ "<br/>";
- message += labelid1154.getValue()
+ message += fieldManager.getString(1154L, langId)
+ ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getEnd(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)
+ "<br/>";
- Fieldlanguagesvalues labelid1156 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1156), language_id);
- message += labelid1156.getValue() + invitorName +
"<br/>";
+ message += fieldManager.getString(1156L, langId) +
invitorName + "<br/>";
return message;
} catch (Exception err) {
- log.error("Could not format cancel message");
+ log.error("Could not format cancel message", err);
return "Error formatCancelMessage";
}
}
- private String formatUpdateSubject(Long language_id, Appointment
appointment, TimeZone timezone) {
- String message = fieldManager.getString(1155L, language_id) + "
"
- + appointment.getTitle();
+ private String formatUpdateSubject(Long langId, Appointment a, TimeZone
tz) {
+ String message = fieldManager.getString(1155L, langId) + " " +
a.getTitle();
message += " "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getStart(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ " - "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getEnd(), timezone);
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz);
return message;
}
- private String formatUpdateMessage(Long language_id,
- Appointment appointment, TimeZone timezone,
- String invitorName) {
+ private String formatUpdateMessage(Long langId, Appointment a, TimeZone
tz, String invitorName) {
try {
+ String message = fieldManager.getString(1155L, langId)
+ " " + a.getTitle();
- String message = fieldManager.getString(1155L,
language_id) + " "
- + appointment.getTitle();
-
- if (appointment.getDescription().length() != 0) {
-
- Fieldlanguagesvalues labelid1152 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1152), language_id);
- message += labelid1152.getValue()
- + appointment.getDescription();
-
+ if (a.getDescription().length() != 0) {
+ message += fieldManager.getString(1152L,
langId) + a.getDescription();
}
- Fieldlanguagesvalues labelid1153 = fieldManager
- .getFieldByIdAndLanguage(1153L,
language_id);
- Fieldlanguagesvalues labelid1154 = fieldManager
- .getFieldByIdAndLanguage(1154L,
language_id);
-
message += "<br/>"
- + labelid1153.getValue()
+ + fieldManager.getString(1153L, langId)
+ ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getStart(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ "<br/>";
- message += labelid1154.getValue()
+ message += fieldManager.getString(1154L, langId)
+ ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getEnd(),
timezone)
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)
+ "<br/>";
- Fieldlanguagesvalues labelid1156 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1156), language_id);
- message += labelid1156.getValue() + invitorName +
"<br/>";
+ message += fieldManager.getString(1156L, langId) +
invitorName + "<br/>";
return message;
-
} catch (Exception err) {
- log.error("Could not format update message");
+ log.error("Could not format update message", err);
return "Error formatUpdateMessage";
}
}
@@ -374,7 +319,6 @@ public class InvitationManager implement
* @throws Exception
*/
private void sendInvitionLink(Appointment a, MeetingMember mm,
MessageType type, boolean ical) throws Exception {
-
User owner = a.getOwner();
String invitorName = owner.getFirstname() + " " +
owner.getLastname();
Long langId = mm.getUser().getLanguage_id();
Modified:
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1554024&r1=1554023&r2=1554024&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
(original)
+++
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
Sun Dec 29 13:03:46 2013
@@ -79,7 +79,7 @@
<property name="openjpa.ConnectionDriverName"
value="org.apache.commons.dbcp.BasicDataSource" />
<property name="openjpa.ConnectionProperties"
value="DriverClassName=com.mysql.jdbc.Driver
- ,
Url=jdbc:mysql://192.168.15.178:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000
+ ,
Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000
, MaxActive=100
, MaxWait=10000
, TestOnBorrow=true
