Merge pull request #372 from sco0ter/deprecated

Replace deprecated JiveConstants.XMPP_DELAY_DATETIME_FORMAT usage

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/history/ChatTranscriptManager.java

@@ -42,8 +42,8 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.util.EmailService;
-import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.util.XMPPDateTimeFormat;
 import org.jivesoftware.xmpp.workgroup.DbProperties;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
 import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
@@ -175,7 +175,7 @@ public class ChatTranscriptManager {
         }
 
         // Define time zone used in the transcript.
-        SimpleDateFormat UTC_FORMAT = new SimpleDateFormat(JiveConstants.XMPP_DELAY_DATETIME_FORMAT);
+        SimpleDateFormat UTC_FORMAT = new SimpleDateFormat(XMPPDateTimeFormat.XMPP_DELAY_DATETIME_FORMAT);
         UTC_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
 
         final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");
@@ -378,7 +378,7 @@ public class ChatTranscriptManager {
         if (transcript == null || "".equals(transcript)) {
             return "";
         }
-        final SimpleDateFormat UTC_FORMAT = new SimpleDateFormat(JiveConstants.XMPP_DELAY_DATETIME_FORMAT);
+        final SimpleDateFormat UTC_FORMAT = new SimpleDateFormat(XMPPDateTimeFormat.XMPP_DELAY_DATETIME_FORMAT);
         UTC_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
 
         final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/util/XmppDateUtil.java

 package com.reucon.openfire.plugin.archive.util;
 
-import org.jivesoftware.util.JiveConstants;
+import org.jivesoftware.util.XMPPDateTimeFormat;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -16,7 +16,7 @@ public class XmppDateUtil {
 	private static final DateFormat dateFormatWithoutMillis;
 
 	static {
-		dateFormat = new SimpleDateFormat(JiveConstants.XMPP_DATETIME_FORMAT);
+		dateFormat = new SimpleDateFormat(XMPPDateTimeFormat.XMPP_DATETIME_FORMAT);
 		dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
 		dateFormatWithoutMillis = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 		dateFormatWithoutMillis.setTimeZone(TimeZone.getTimeZone("UTC"));