You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/07/13 03:31:53 UTC
openmeetings git commit: [OPENMEETINGS-980] ical4j version is updated
Repository: openmeetings
Updated Branches:
refs/heads/master 21ee02288 -> 1b6538717
[OPENMEETINGS-980] ical4j version is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1b653871
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1b653871
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1b653871
Branch: refs/heads/master
Commit: 1b6538717a62dd2affe2bc052ce7b28d930de149
Parents: 21ee022
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jul 13 10:31:45 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jul 13 10:31:45 2017 +0700
----------------------------------------------------------------------
.../openmeetings/core/util/IClientUtil.java | 6 --
.../service/calendar/caldav/iCalUtils.java | 70 +++++++++++++-------
pom.xml | 2 +-
3 files changed, 47 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b653871/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
index ebc670e..665afd33 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
@@ -18,16 +18,10 @@
*/
package org.apache.openmeetings.core.util;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
import org.apache.openmeetings.db.entity.room.StreamClient;
-import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
-import org.slf4j.Logger;
public class IClientUtil {
- private static final Logger log = Red5LoggerFactory.getLogger(IClientUtil.class, webAppRootKey);
-
private enum ConAttrs {
omId
, sharing
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b653871/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java
index c1fbad5..ecc3343 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.service.calendar.caldav;
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.*;
-import net.fortuna.ical4j.model.component.CalendarComponent;
-import net.fortuna.ical4j.model.component.VEvent;
-import net.fortuna.ical4j.model.parameter.Cn;
-import net.fortuna.ical4j.model.parameter.Role;
-import net.fortuna.ical4j.model.property.*;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import java.net.URI;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.UUID;
+
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -38,13 +42,31 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import java.net.URI;
-import java.text.ParsePosition;
-import java.util.*;
-import java.util.Date;
-import java.util.TimeZone;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.ComponentList;
+import net.fortuna.ical4j.model.DateTime;
+import net.fortuna.ical4j.model.Parameter;
+import net.fortuna.ical4j.model.Property;
+import net.fortuna.ical4j.model.PropertyList;
+import net.fortuna.ical4j.model.Recur;
+import net.fortuna.ical4j.model.TimeZoneRegistry;
+import net.fortuna.ical4j.model.TimeZoneRegistryFactory;
+import net.fortuna.ical4j.model.component.CalendarComponent;
+import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.model.parameter.Cn;
+import net.fortuna.ical4j.model.parameter.Role;
+import net.fortuna.ical4j.model.property.Attendee;
+import net.fortuna.ical4j.model.property.CalScale;
+import net.fortuna.ical4j.model.property.DateProperty;
+import net.fortuna.ical4j.model.property.Description;
+import net.fortuna.ical4j.model.property.Location;
+import net.fortuna.ical4j.model.property.Organizer;
+import net.fortuna.ical4j.model.property.ProdId;
+import net.fortuna.ical4j.model.property.Sequence;
+import net.fortuna.ical4j.model.property.Transp;
+import net.fortuna.ical4j.model.property.Uid;
+import net.fortuna.ical4j.model.property.Version;
/**
* Class which provides iCalendar Utilities.
@@ -139,34 +161,34 @@ public class iCalUtils {
* @return Updated Appointment
*/
private Appointment addVEventPropertiestoAppointment(Appointment a, CalendarComponent event, TimeZone tz) {
- Property dtstart = event.getProperty(Property.DTSTART),
- dtend = event.getProperty(Property.DTEND),
- uid = event.getProperty(Property.UID),
- dtstamp = event.getProperty(Property.DTSTAMP),
+ DateProperty dtstart = (DateProperty)event.getProperty(Property.DTSTART)
+ , dtend = (DateProperty)event.getProperty(Property.DTEND)
+ , dtstamp = (DateProperty)event.getProperty(Property.DTSTAMP)
+ , lastmod = (DateProperty)event.getProperty(Property.LAST_MODIFIED);
+ Property uid = event.getProperty(Property.UID),
description = event.getProperty(Property.DESCRIPTION),
summary = event.getProperty(Property.SUMMARY),
location = event.getProperty(Property.LOCATION),
- lastmod = event.getProperty(Property.LAST_MODIFIED),
organizer = event.getProperty(Property.ORGANIZER),
recur = event.getProperty(Property.RRULE);
- PropertyList attendees = event.getProperties(Property.ATTENDEE);
+ PropertyList<Attendee> attendees = event.getProperties(Property.ATTENDEE);
if (uid != null) {
a.setIcalId(uid.getValue());
}
- Date d = parseDate(dtstart, tz);
+ Date d = dtstart.getDate();
a.setStart(d);
if (dtend == null) {
a.setEnd(addTimetoDate(d, java.util.Calendar.HOUR_OF_DAY, 1));
} else {
- a.setEnd(parseDate(dtend, tz));
+ a.setEnd(dtend.getDate());
}
- a.setInserted(parseDate(dtstamp, tz));
+ a.setInserted(dtstamp.getDate());
if (lastmod != null) {
- a.setUpdated(parseDate(lastmod, tz));
+ a.setUpdated(lastmod.getDate());
}
if (description != null) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b653871/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8777f55..03b2c49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<spring.version>4.3.6.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
<tomcat.version>8.5.12</tomcat.version>
- <ical4j.version>2.0.0</ical4j.version>
+ <ical4j.version>2.0.2</ical4j.version>
<cxf.version>3.1.11</cxf.version>
<selenium.version>3.4.0</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>