Commit dbcc3498 authored by guus's avatar guus

OF-600: When replacing code during a refactoring, old public references should...

OF-600: When replacing code during a refactoring, old public references should remain (but marked deprecated) to allow third party code time for migration.
OF-617: Updated usage of time formatting to the new Date and Time formatting class.
Both changes should allow Fastpath to compile properly again.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13476 b35dd754-fafc-0310-a699-88a17e54d16e
parent b266817e
......@@ -37,4 +37,27 @@ public class JiveConstants {
public static final long HOUR = 60 * MINUTE;
public static final long DAY = 24 * HOUR;
public static final long WEEK = 7 * DAY;
/**
* Date/time format for use by SimpleDateFormat. The format conforms to
* <a href="http://www.xmpp.org/extensions/xep-0082.html">XEP-0082</a>, which defines
* a unified date/time format for XMPP.
*
* @deprecated Deprecated by the org.jivesoftware.util.XMPPDateTimeFormat class
* @see {@link org.jivesoftware.util.XMPPDateTimeFormat}
*/
@Deprecated
public static final String XMPP_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
/**
* Date/time format for use by SimpleDateFormat. The format conforms to the format
* defined in <a href="http://www.xmpp.org/extensions/xep-0091.html">XEP-0091</a>,
* a specialized date format for historical XMPP usage.
*
* @deprecated Deprecated by the org.jivesoftware.util.XMPPDateTimeFormat class
* @see {@link org.jivesoftware.util.XMPPDateTimeFormat}
*/
@Deprecated
public static final String XMPP_DELAY_DATETIME_FORMAT = "yyyyMMdd'T'HH:mm:ss";
}
\ No newline at end of file
......@@ -36,6 +36,7 @@ import org.jivesoftware.openfire.fastpath.util.TaskEngine;
import org.jivesoftware.util.ConcurrentHashSet;
import org.jivesoftware.util.FastDateFormat;
import org.jivesoftware.util.JiveConstants;
import org.jivesoftware.util.XMPPDateTimeFormat;
import org.jivesoftware.xmpp.workgroup.interceptor.AgentInterceptorManager;
import org.jivesoftware.xmpp.workgroup.interceptor.InterceptorManager;
import org.jivesoftware.xmpp.workgroup.interceptor.PacketRejectedException;
......@@ -65,7 +66,7 @@ public class WorkgroupPresence {
private static final Logger Log = LoggerFactory.getLogger(WorkgroupPresence.class);
private static final FastDateFormat UTC_FORMAT = FastDateFormat
.getInstance(JiveConstants.XMPP_DELAY_DATETIME_FORMAT, TimeZone.getTimeZone("UTC"));
.getInstance(XMPPDateTimeFormat.XMPP_DELAY_DATETIME_FORMAT, TimeZone.getTimeZone("UTC"));
private static final String LOAD_ROSTER =
"SELECT jid FROM fpWorkgroupRoster WHERE workgroupID=?";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment