Index: E:/trunk/portal-impl/src/com/liferay/portal/scheduler/quartz/MessageSenderJob.java =================================================================== --- E:/trunk/portal-impl/src/com/liferay/portal/scheduler/quartz/MessageSenderJob.java (revision 17218) +++ E:/trunk/portal-impl/src/com/liferay/portal/scheduler/quartz/MessageSenderJob.java (working copy) @@ -24,6 +24,9 @@ import com.liferay.portal.kernel.messaging.MessageBusUtil; import com.liferay.portal.kernel.scheduler.SchedulerEngine; +import com.liferay.portal.kernel.util.StringMaker; + +import java.util.Date; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,7 +59,16 @@ String messageBody = jobDataMap.getString( SchedulerEngine.MESSAGE_BODY); - MessageBusUtil.sendMessage(destination, messageBody); + Date scheduledFireTime = jobExecutionContext.getScheduledFireTime(); + + StringMaker sm = new StringMaker(); + + sm.append(messageBody.substring(0, messageBody.length() - 1)); + sm.append(",\"scheduledFireTime\":{\"time\":"); + sm.append(scheduledFireTime.getTime()); + sm.append(",\"javaClass\":\"java.util.Date\"}}"); + + MessageBusUtil.sendMessage(destination, sm.toString()); } catch (Exception e) { _log.error(e, e); Index: E:/trunk/portal-impl/src/com/liferay/portlet/communities/messaging/LayoutsLocalPublisherRequest.java =================================================================== --- E:/trunk/portal-impl/src/com/liferay/portlet/communities/messaging/LayoutsLocalPublisherRequest.java (revision 17218) +++ E:/trunk/portal-impl/src/com/liferay/portlet/communities/messaging/LayoutsLocalPublisherRequest.java (working copy) @@ -137,6 +137,14 @@ _endDate = endDate; } + public Date getScheduledFireTime() { + return _scheduledFireTime; + } + + public void setScheduledFireTime(Date scheduledFireTime) { + _scheduledFireTime = scheduledFireTime; + } + private String _command; private String _cronText; private long _userId; @@ -147,5 +155,6 @@ private Map _parameterMap; private Date _startDate; private Date _endDate; + private Date _scheduledFireTime; } \ No newline at end of file Index: E:/trunk/portal-impl/src/com/liferay/portlet/communities/messaging/LayoutsRemotePublisherRequest.java =================================================================== --- E:/trunk/portal-impl/src/com/liferay/portlet/communities/messaging/LayoutsRemotePublisherRequest.java (revision 17218) +++ E:/trunk/portal-impl/src/com/liferay/portlet/communities/messaging/LayoutsRemotePublisherRequest.java (working copy) @@ -163,6 +163,14 @@ _endDate = endDate; } + public Date getScheduledFireTime() { + return _scheduledFireTime; + } + + public void setScheduledFireTime(Date scheduledFireTime) { + _scheduledFireTime = scheduledFireTime; + } + private String _cronText; private long _userId; private long _sourceGroupId; @@ -176,5 +184,6 @@ private boolean _remotePrivateLayout; private Date _startDate; private Date _endDate; + private Date _scheduledFireTime; } \ No newline at end of file