Revision: 4158
Author: solomax666
Date: Wed Aug 31 11:01:53 2011
Log: - IcalHandler is fixed (not a bean, no need to be Autowired)
http://code.google.com/p/openmeetings/source/detail?r=4158
Added:
/trunk/singlewebapp/lib/ical4j/backport-util-concurrent-3.1.jar
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
=======================================
--- /dev/null
+++ /trunk/singlewebapp/lib/ical4j/backport-util-concurrent-3.1.jar Wed Aug
31 11:01:53 2011
Binary file, no diff available.
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Wed Aug 31 11:01:53 2011
@@ -686,7 +686,7 @@
// OmTimeZone omTimeZone =
// omTimeZoneDaoImpl.getOmTimeZone(jNameTimeZone);
- IcalHandler handler = new
IcalHandler(IcalHandler.ICAL_METHOD_CANCEL);
+ IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
IcalHandler.ICAL_METHOD_CANCEL);
// refresh appointment
point =
appointmentLogic.getAppointMentById(point.getAppointmentId());
@@ -739,7 +739,7 @@
// Defining Organizer
Users user = userManagement.getUserById(organizer_userId);
- IcalHandler handler = new
IcalHandler(IcalHandler.ICAL_METHOD_REQUEST);
+ IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
IcalHandler.ICAL_METHOD_REQUEST);
// refresh appointment
point =
appointmentLogic.getAppointMentById(point.getAppointmentId());
@@ -800,7 +800,7 @@
username, message, invitation_link,
language_id, starttime,
endtime);
- IcalHandler handler = new IcalHandler(
+ IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
IcalHandler.ICAL_METHOD_REQUEST);
Appointment point = appointmentLogic
@@ -1105,6 +1105,7 @@
Query query = em.createQuery(hql);
query.setParameter("appointmentId", appointmentId);
+ @SuppressWarnings("unchecked")
List<Invitations> listInvitations =
query.getResultList();
for (Invitations inv : listInvitations) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
Wed Aug 31 11:01:53 2011
@@ -32,7 +32,6 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -40,8 +39,6 @@
*
*/
public class IcalHandler {
-
- @Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
private static final Logger log = Red5LoggerFactory.getLogger(
@@ -59,9 +56,6 @@
public final static String ICAL_METHOD_CANCEL = "CANCEL";
public final static String ICAL_METHOD_REFRESH = "REFRESH";
- // Default is a new Request
- private String ICAL_METHOD = ICAL_METHOD_REQUEST;
-
/**
* Konstruktor with DefaultTimeZone
*
@@ -69,9 +63,10 @@
* (@see IcalHandler Constants)
* @throws Exception
*/
- public IcalHandler(String methodType) {
+ public IcalHandler(OmTimeZoneDaoImpl omTimeZoneDaoImpl, String
methodType) {
log.debug("Icalhandler method type : " + methodType);
-
+ this.omTimeZoneDaoImpl = omTimeZoneDaoImpl;
+
icsCalendar = new net.fortuna.ical4j.model.Calendar();
// timeRegistry =
@@ -92,8 +87,6 @@
else
icsCalendar.getProperties().add(Method.REQUEST);
- ICAL_METHOD = methodType;
-
}
/**
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
