Author: kwright
Date: Thu Jun 4 12:06:22 2015
New Revision: 1683530
URL: http://svn.apache.org/r1683530
Log:
Pull up fix for CONNECTORS-1208 from trunk.
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConfig.java
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_en_US.properties
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_ja_JP.properties
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_zh_CN.properties
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationHeader.js
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationView.html
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/Specification_Message.html
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 4 12:06:22 2015
@@ -124,4 +124,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Thu Jun 4 12:06:22 2015
@@ -3,6 +3,9 @@ $Id$
======================= 1.10-dev =====================
+CONNECTORS-1208: Provide more full-featured notification ability.
+(Karl Wright)
+
CONNECTORS-1204: Add ability to post original binary length of document
to Solr from JCIFS connector. Also improve efficiency of JCIFS connector.
(Karl Wright)
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConfig.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConfig.java?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConfig.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConfig.java
Thu Jun 4 12:06:22 2015
@@ -74,6 +74,13 @@ public class EmailConfig {
// Specification nodes
+ public static final String NODE_FINISHED = "finished";
+ public static final String NODE_ERRORABORTED = "erroraborted";
+ public static final String NODE_MANUALABORTED = "manualaborted";
+ public static final String NODE_MANUALPAUSED = "manualpaused";
+ public static final String NODE_SCHEDULEPAUSED = "schedulepaused";
+ public static final String NODE_RESTARTED = "restarted";
+
public static final String NODE_TO = "to";
public static final String NODE_FROM = "from";
public static final String NODE_SUBJECT = "subject";
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
Thu Jun 4 12:06:22 2015
@@ -216,28 +216,63 @@ public class EmailConnector extends org.
//////////////////////////////Start of Notification Connector
Method///////////////////////////////////
- /** Notify of job stop.
+ /** Notify of job stop due to error abort.
*@param spec is the notification specification.
*/
@Override
- public void notifyOfJobStop(Specification spec)
+ public void notifyOfJobStopErrorAbort(final Specification spec)
throws ManifoldCFException, ServiceInterruption {
- sendMail(spec);
+ sendMail(spec, EmailConfig.NODE_ERRORABORTED);
}
-
+
+ /** Notify of job stop due to manual abort.
+ *@param spec is the notification specification.
+ */
+ @Override
+ public void notifyOfJobStopManualAbort(final Specification spec)
+ throws ManifoldCFException, ServiceInterruption {
+ sendMail(spec, EmailConfig.NODE_MANUALABORTED);
+ }
+
+ /** Notify of job stop due to manual pause.
+ *@param spec is the notification specification.
+ */
+ @Override
+ public void notifyOfJobStopManualPause(final Specification spec)
+ throws ManifoldCFException, ServiceInterruption {
+ sendMail(spec, EmailConfig.NODE_MANUALPAUSED);
+ }
+
+ /** Notify of job stop due to schedule pause.
+ *@param spec is the notification specification.
+ */
+ @Override
+ public void notifyOfJobStopSchedulePause(final Specification spec)
+ throws ManifoldCFException, ServiceInterruption {
+ sendMail(spec, EmailConfig.NODE_SCHEDULEPAUSED);
+ }
+
+ /** Notify of job stop due to restart.
+ *@param spec is the notification specification.
+ */
+ @Override
+ public void notifyOfJobStopRestart(final Specification spec)
+ throws ManifoldCFException, ServiceInterruption {
+ sendMail(spec, EmailConfig.NODE_RESTARTED);
+ }
+
/** Notify of job end.
*@param spec is the notification specification.
*/
@Override
- public void notifyOfJobEnd(Specification spec)
+ public void notifyOfJobEnd(final Specification spec)
throws ManifoldCFException, ServiceInterruption {
- sendMail(spec);
+ sendMail(spec, EmailConfig.NODE_FINISHED);
}
- protected void sendMail(Specification spec)
+ protected void sendMail(final Specification spec, final String nodeType)
throws ManifoldCFException, ServiceInterruption
{
- // Grab the necessary info from the spec
final List<String> to = new ArrayList<String>();
String from = null;
String subject = "";
@@ -253,6 +288,30 @@ public class EmailConnector extends org.
else if (sn.getType().equals(EmailConfig.NODE_BODY))
body = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
}
+ // Look for node of the specified type
+ if (nodeType != null)
+ {
+ for (int i = 0; i < spec.getChildCount(); i++) {
+ SpecificationNode childNode = spec.getChild(i);
+ if (childNode.getType().equals(nodeType))
+ {
+ for (int j = 0; j < childNode.getChildCount(); i++) {
+ SpecificationNode sn = childNode.getChild(j);
+ if (sn.getType().equals(EmailConfig.NODE_TO))
+ to.add(sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE));
+ else if (sn.getType().equals(EmailConfig.NODE_FROM))
+ from = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ else if (sn.getType().equals(EmailConfig.NODE_SUBJECT))
+ subject = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ else if (sn.getType().equals(EmailConfig.NODE_BODY))
+ body = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ }
+ }
+ }
+ }
+
+ if (to.size() == 0)
+ return;
// Construct and send an email
getSession();
@@ -519,13 +578,14 @@ public class EmailConnector extends org.
*/
protected static void fillInMessageTab(Map<String, Object> paramMap,
Specification ds) {
+
+ // Preload default values, for backwards compatibility
String toValue = "";
String fromValue = "";
String subjectValue = "";
String bodyValue = "";
- int i = 0;
- while (i < ds.getChildCount()) {
- SpecificationNode sn = ds.getChild(i++);
+ for (int i = 0; i < ds.getChildCount(); i++) {
+ SpecificationNode sn = ds.getChild(i);
if (sn.getType().equals(EmailConfig.NODE_TO)) {
toValue = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
} else if (sn.getType().equals(EmailConfig.NODE_FROM)) {
@@ -536,13 +596,65 @@ public class EmailConnector extends org.
bodyValue = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
}
}
- paramMap.put("TO", toValue);
- paramMap.put("FROM", fromValue);
- paramMap.put("SUBJECT", subjectValue);
- paramMap.put("BODY", bodyValue);
-
+ // If ANY of the above are non-empty, we create a new dummy record
+ if (toValue.length() > 0) {
+ // Add the dummy records
+ addRecord(paramMap, EmailConfig.NODE_FINISHED, toValue, fromValue,
subjectValue, bodyValue);
+ addRecord(paramMap, EmailConfig.NODE_ERRORABORTED, toValue, fromValue,
subjectValue, bodyValue);
+ addRecord(paramMap, EmailConfig.NODE_MANUALABORTED, toValue, fromValue,
subjectValue, bodyValue);
+ addRecord(paramMap, EmailConfig.NODE_MANUALPAUSED, toValue, fromValue,
subjectValue, bodyValue);
+ addRecord(paramMap, EmailConfig.NODE_SCHEDULEPAUSED, toValue, fromValue,
subjectValue, bodyValue);
+ addRecord(paramMap, EmailConfig.NODE_RESTARTED, toValue, fromValue,
subjectValue, bodyValue);
+
+ }
+ else
+ {
+ // Initialize all records with blanks
+ addRecord(paramMap, EmailConfig.NODE_FINISHED, "", "", "", "");
+ addRecord(paramMap, EmailConfig.NODE_ERRORABORTED, "", "", "", "");
+ addRecord(paramMap, EmailConfig.NODE_MANUALABORTED, "", "", "", "");
+ addRecord(paramMap, EmailConfig.NODE_MANUALPAUSED, "", "", "", "");
+ addRecord(paramMap, EmailConfig.NODE_SCHEDULEPAUSED, "", "", "", "");
+ addRecord(paramMap, EmailConfig.NODE_RESTARTED, "", "", "" ,"");
+
+ // Loop through nodes and pick them out that way
+ for (int i = 0; i < ds.getChildCount(); i++) {
+ SpecificationNode childNode = ds.getChild(i);
+ if (childNode.getType().equals(EmailConfig.NODE_FINISHED) ||
+ childNode.getType().equals(EmailConfig.NODE_ERRORABORTED) ||
+ childNode.getType().equals(EmailConfig.NODE_MANUALABORTED) ||
+ childNode.getType().equals(EmailConfig.NODE_MANUALPAUSED) ||
+ childNode.getType().equals(EmailConfig.NODE_SCHEDULEPAUSED) ||
+ childNode.getType().equals(EmailConfig.NODE_RESTARTED)) {
+ toValue = "";
+ fromValue = "";
+ subjectValue = "";
+ bodyValue = "";
+ for (int j = 0; j < childNode.getChildCount(); j++) {
+ SpecificationNode sn = childNode.getChild(j);
+ if (sn.getType().equals(EmailConfig.NODE_TO)) {
+ toValue = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ } else if (sn.getType().equals(EmailConfig.NODE_FROM)) {
+ fromValue = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ } else if (sn.getType().equals(EmailConfig.NODE_SUBJECT)) {
+ subjectValue = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ } else if (sn.getType().equals(EmailConfig.NODE_BODY)) {
+ bodyValue = sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE);
+ }
+ }
+ addRecord(paramMap, childNode.getType(), toValue, fromValue,
subjectValue, bodyValue);
+ }
+ }
+ }
}
+ protected static void addRecord(Map<String,Object> paramMap, String
nodeType, String toValue, String fromValue, String subjectValue, String
bodyValue) {
+ paramMap.put(nodeType+"_TO", toValue);
+ paramMap.put(nodeType+"_FROM", fromValue);
+ paramMap.put(nodeType+"_SUBJECT", subjectValue);
+ paramMap.put(nodeType+"_BODY", bodyValue);
+ }
+
/** Process a specification post.
* This method is called at the start of job's edit or view page, whenever
there is a possibility that form
* data for a connection has been posted. Its purpose is to gather form
information and modify the
@@ -569,31 +681,47 @@ public class EmailConnector extends org.
String seqPrefix = "s"+connectionSequenceNumber+"_";
- String toString = variableContext.getParameter(seqPrefix + "to");
+ // Remove legacy nodes always
+ removeNodes(ds, EmailConfig.NODE_TO);
+ removeNodes(ds, EmailConfig.NODE_FROM);
+ removeNodes(ds, EmailConfig.NODE_SUBJECT);
+ removeNodes(ds, EmailConfig.NODE_BODY);
+
+ // Gather all different kinds.
+ gatherRecord(ds, seqPrefix, variableContext, EmailConfig.NODE_FINISHED);
+ gatherRecord(ds, seqPrefix, variableContext,
EmailConfig.NODE_ERRORABORTED);
+ gatherRecord(ds, seqPrefix, variableContext,
EmailConfig.NODE_MANUALABORTED);
+ gatherRecord(ds, seqPrefix, variableContext,
EmailConfig.NODE_MANUALPAUSED);
+ gatherRecord(ds, seqPrefix, variableContext,
EmailConfig.NODE_SCHEDULEPAUSED);
+ gatherRecord(ds, seqPrefix, variableContext, EmailConfig.NODE_RESTARTED);
+
+ return null;
+ }
+
+ protected static void gatherRecord(Specification ds, String seqPrefix,
IPostParameters variableContext, String nodeType) {
+ removeNodes(ds, nodeType);
+ SpecificationNode sn = new SpecificationNode(nodeType);
+ String toString = variableContext.getParameter(seqPrefix + nodeType +
"_to");
if (toString != null)
{
- removeNodes(ds, EmailConfig.NODE_TO);
- addNodeValue(ds, EmailConfig.NODE_TO, toString);
+ addNodeValue(sn, EmailConfig.NODE_TO, toString);
}
- String fromString = variableContext.getParameter(seqPrefix + "from");
+ String fromString = variableContext.getParameter(seqPrefix + nodeType +
"_from");
if (fromString != null)
{
- removeNodes(ds, EmailConfig.NODE_FROM);
- addNodeValue(ds, EmailConfig.NODE_FROM, fromString);
+ addNodeValue(sn, EmailConfig.NODE_FROM, fromString);
}
- String subjectString = variableContext.getParameter(seqPrefix + "subject");
+ String subjectString = variableContext.getParameter(seqPrefix + nodeType +
"_subject");
if (subjectString != null)
{
- removeNodes(ds, EmailConfig.NODE_SUBJECT);
- addNodeValue(ds, EmailConfig.NODE_SUBJECT, subjectString);
+ addNodeValue(sn, EmailConfig.NODE_SUBJECT, subjectString);
}
- String bodyString = variableContext.getParameter(seqPrefix + "body");
+ String bodyString = variableContext.getParameter(seqPrefix + nodeType +
"_body");
if (bodyString != null)
{
- removeNodes(ds, EmailConfig.NODE_BODY);
- addNodeValue(ds, EmailConfig.NODE_BODY, bodyString);
+ addNodeValue(sn, EmailConfig.NODE_BODY, bodyString);
}
- return null;
+ ds.addChild(ds.getChildCount(),sn);
}
/** View specification.
@@ -626,8 +754,7 @@ public class EmailConnector extends org.
parameters.addChild(parameters.getChildCount(), cn);
}
- protected static void removeNodes(ConfigParams parameters,
- String nodeTypeName) {
+ protected static void removeNodes(ConfigParams parameters, String
nodeTypeName) {
int i = 0;
while (i < parameters.getChildCount()) {
ConfigNode cn = parameters.getChild(i);
@@ -638,8 +765,7 @@ public class EmailConnector extends org.
}
}
- protected static void removeNodes(Specification ds,
- String nodeTypeName) {
+ protected static void removeNodes(Specification ds, String nodeTypeName) {
int i = 0;
while (i < ds.getChildCount()) {
SpecificationNode sn = ds.getChild(i);
@@ -650,7 +776,7 @@ public class EmailConnector extends org.
}
}
- protected static void addNodeValue(Specification ds, String nodeType, String
value)
+ protected static void addNodeValue(SpecificationNode ds, String nodeType,
String value)
{
SpecificationNode sn = new SpecificationNode(nodeType);
sn.setAttribute(EmailConfig.ATTRIBUTE_VALUE,value);
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_en_US.properties?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_en_US.properties
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_en_US.properties
Thu Jun 4 12:06:22 2015
@@ -36,6 +36,13 @@ EmailConnector.Add=Add
EmailConnector.DeletePropertyNumber=Delete property #
EmailConnector.Delete=Delete
+EmailConnector.JobFinished=Job finished
+EmailConnector.JobStopErrorAbort=Job stopped due to error abort
+EmailConnector.JobStopManualAbort=Job stopped due to manual abort
+EmailConnector.JobStopManualPause=Job stopped due to manual pause
+EmailConnector.JobStopSchedulePause=Job stopped due to scheduled pause
+EmailConnector.JobStopRestart=Job stopped due to job restart
+
EmailConnector.ToColon=To:
EmailConnector.FromColon=From:
EmailConnector.SubjectColon=Subject:
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_ja_JP.properties?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_ja_JP.properties
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_ja_JP.properties
Thu Jun 4 12:06:22 2015
@@ -36,6 +36,13 @@ EmailConnector.Add=Add
EmailConnector.DeletePropertyNumber=Delete property #
EmailConnector.Delete=Delete
+EmailConnector.JobFinished=Job finished
+EmailConnector.JobStopErrorAbort=Job stopped due to error abort
+EmailConnector.JobStopManualAbort=Job stopped due to manual abort
+EmailConnector.JobStopManualPause=Job stopped due to manual pause
+EmailConnector.JobStopSchedulePause=Job stopped due to scheduled pause
+EmailConnector.JobStopRestart=Job stopped due to job restart
+
EmailConnector.ToColon=To:
EmailConnector.FromColon=From:
EmailConnector.SubjectColon=Subject:
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_zh_CN.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_zh_CN.properties?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_zh_CN.properties
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/email/common_zh_CN.properties
Thu Jun 4 12:06:22 2015
@@ -36,6 +36,13 @@ EmailConnector.Add=Add
EmailConnector.DeletePropertyNumber=Delete property #
EmailConnector.Delete=Delete
+EmailConnector.JobFinished=Job finished
+EmailConnector.JobStopErrorAbort=Job stopped due to error abort
+EmailConnector.JobStopManualAbort=Job stopped due to manual abort
+EmailConnector.JobStopManualPause=Job stopped due to manual pause
+EmailConnector.JobStopSchedulePause=Job stopped due to scheduled pause
+EmailConnector.JobStopRestart=Job stopped due to job restart
+
EmailConnector.ToColon=To:
EmailConnector.FromColon=From:
EmailConnector.SubjectColon=Subject:
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationHeader.js
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationHeader.js?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationHeader.js
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationHeader.js
Thu Jun 4 12:06:22 2015
@@ -33,19 +33,112 @@ function s${SeqNum}_SpecOp(n, opValue, a
function s${SeqNum}_checkMessageTabForSave()
{
- if (editjob.s${SeqNum}_to.value == "")
+ if (editjob.s${SeqNum}_finished_subject.value != "" ||
editjob.s${SeqNum}_finished_body.value != "")
{
-
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
-
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
- editjob.s${SeqNum}_to.focus();
- return false;
- }
- if (editjob.s${SeqNum}_from.value == "")
- {
-
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
-
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
- editjob.s${SeqNum}_from.focus();
- return false;
+ if (editjob.s${SeqNum}_finished_to.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_finished_to.focus();
+ return false;
+ }
+ if (editjob.s${SeqNum}_finished_from.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_finished_from.focus();
+ return false;
+ }
+ }
+
+ if (editjob.s${SeqNum}_erroraborted_subject.value != "" ||
editjob.s${SeqNum}_erroraborted_body.value != "")
+ {
+ if (editjob.s${SeqNum}_erroraborted_to.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_erroraborted_to.focus();
+ return false;
+ }
+ if (editjob.s${SeqNum}_erroraborted_from.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_erroraborted_from.focus();
+ return false;
+ }
+ }
+
+ if (editjob.s${SeqNum}_manualaborted_subject.value != "" ||
editjob.s${SeqNum}_manualaborted_body.value != "")
+ {
+ if (editjob.s${SeqNum}_manualaborted_to.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_manualaborted_to.focus();
+ return false;
+ }
+ if (editjob.s${SeqNum}_manualaborted_from.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_manualaborted_from.focus();
+ return false;
+ }
+ }
+
+ if (editjob.s${SeqNum}_manualpaused_subject.value != "" ||
editjob.s${SeqNum}_manualpaused_body.value != "")
+ {
+ if (editjob.s${SeqNum}_manualpaused_to.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_manualpaused_to.focus();
+ return false;
+ }
+ if (editjob.s${SeqNum}_manualpaused_from.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_manualpaused_from.focus();
+ return false;
+ }
+ }
+
+ if (editjob.s${SeqNum}_schedulepaused_subject.value != "" ||
editjob.s${SeqNum}_schedulepaused_body.value != "")
+ {
+ if (editjob.s${SeqNum}_schedulepaused_to.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_schedulepaused_to.focus();
+ return false;
+ }
+ if (editjob.s${SeqNum}_schedulepaused_from.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_schedulepaused_from.focus();
+ return false;
+ }
+ }
+
+ if (editjob.s${SeqNum}_restarted_subject.value != "" ||
editjob.s${SeqNum}_restarted_body.value != "")
+ {
+ if (editjob.s${SeqNum}_restarted_to.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.ToFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_restarted_to.focus();
+ return false;
+ }
+ if (editjob.s${SeqNum}_restarted_from.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.FromFieldCannotBeBlank'))");
+
SelectSequencedTab("$Encoder.attributeJavascriptEscape($ResourceBundle.getString('EmailConnector.Message'))",${SeqNum})
+ editjob.s${SeqNum}_restarted_from.focus();
+ return false;
+ }
}
return true;
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationView.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationView.html?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationView.html
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/SpecificationView.html
Thu Jun 4 12:06:22 2015
@@ -16,28 +16,161 @@ limitations under the License.
-->
<table class="displaytable">
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobFinished'))</nobr></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($finished_TO)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($finished_FROM)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($finished_SUBJECT)
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($finished_BODY)
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopErrorAbort'))</nobr></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($erroraborted_TO)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($erroraborted_FROM)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($erroraborted_SUBJECT)
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($erroraborted_BODY)
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopManualAbort'))</nobr></td></tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr></td>
<td class="value">
- <nobr>$Encoder.bodyEscape($TO)</nobr>
+ <nobr>$Encoder.bodyEscape($manualaborted_TO)</nobr>
</td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr></td>
<td class="value">
- <nobr>$Encoder.bodyEscape($FROM)</nobr>
+ <nobr>$Encoder.bodyEscape($manualaborted_FROM)</nobr>
</td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr></td>
<td class="value">
- $Encoder.bodyEscape($SUBJECT)
+ $Encoder.bodyEscape($manualaborted_SUBJECT)
</td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr></td>
<td class="value">
- $Encoder.bodyEscape($BODY)
+ $Encoder.bodyEscape($manualaborted_BODY)
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopManualPause'))</nobr></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($manualpaused_TO)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($manualpaused_FROM)</nobr>
</td>
</tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($manualpaused_SUBJECT)
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($manualpaused_BODY)
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopSchedulePause'))</nobr></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($schedulepaused_TO)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($schedulepaused_FROM)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($schedulepaused_SUBJECT)
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($schedulepaused_BODY)
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopRestart'))</nobr></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($restarted_TO)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr></td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($restarted_FROM)</nobr>
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($restarted_SUBJECT)
+ </td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($restarted_BODY)
+ </td>
+ </tr>
+
</table>
Modified:
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/Specification_Message.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/Specification_Message.html?rev=1683530&r1=1683529&r2=1683530&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/Specification_Message.html
(original)
+++
manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/email/Specification_Message.html
Thu Jun 4 12:06:22 2015
@@ -18,13 +18,82 @@ limitations under the License.
#if($TabName == $ResourceBundle.getString('EmailConnector.Message') &&
${SeqNum} == ${SelectedNum})
<table class="displaytable">
- <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobFinished'))</nobr></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_finished_to" size="32"
value="$Encoder.attributeEscape($finished_TO)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_finished_from" size="32"
value="$Encoder.attributeEscape($finished_FROM)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_finished_subject" size="50"
value="$Encoder.attributeEscape($finished_SUBJECT)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr>
+ </td>
+ <td class="value">
+ <textarea name="s${SeqNum}_finished_body" rows="10"
cols="50">$Encoder.bodyEscape($finished_BODY)</textarea>
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopErrorAbort'))</nobr></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_erroraborted_to" size="32"
value="$Encoder.attributeEscape($erroraborted_TO)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_erroraborted_from" size="32"
value="$Encoder.attributeEscape($erroraborted_FROM)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_erroraborted_subject" size="50"
value="$Encoder.attributeEscape($erroraborted_SUBJECT)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr>
+ </td>
+ <td class="value">
+ <textarea name="s${SeqNum}_erroraborted_body" rows="10"
cols="50">$Encoder.bodyEscape($erroraborted_BODY)</textarea>
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopManualAbort'))</nobr></td></tr>
<tr>
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr>
</td>
<td class="value">
- <input type="text" name="s${SeqNum}_to" size="32"
value="$Encoder.attributeEscape($TO)"/>
+ <input type="text" name="s${SeqNum}_manualaborted_to" size="32"
value="$Encoder.attributeEscape($manualaborted_TO)"/>
</td>
</tr>
<tr>
@@ -32,7 +101,7 @@ limitations under the License.
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr>
</td>
<td class="value">
- <input type="text" name="s${SeqNum}_from" size="32"
value="$Encoder.attributeEscape($FROM)"/>
+ <input type="text" name="s${SeqNum}_manualaborted_from" size="32"
value="$Encoder.attributeEscape($manualaborted_FROM)"/>
</td>
</tr>
<tr>
@@ -40,7 +109,7 @@ limitations under the License.
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr>
</td>
<td class="value">
- <input type="text" name="s${SeqNum}_subject" size="50"
value="$Encoder.attributeEscape($SUBJECT)"/>
+ <input type="text" name="s${SeqNum}_manualaborted_subject" size="50"
value="$Encoder.attributeEscape($manualaborted_SUBJECT)"/>
</td>
</tr>
<tr>
@@ -48,7 +117,109 @@ limitations under the License.
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr>
</td>
<td class="value">
- <textarea name="s${SeqNum}_body" rows="10"
cols="50">$Encoder.bodyEscape($BODY)</textarea>
+ <textarea name="s${SeqNum}_manualaborted_body" rows="10"
cols="50">$Encoder.bodyEscape($manualaborted_BODY)</textarea>
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopManualPause'))</nobr></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_manualpaused_to" size="32"
value="$Encoder.attributeEscape($manualpaused_TO)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_manualpaused_from" size="32"
value="$Encoder.attributeEscape($manualpaused_FROM)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_manualpaused_subject" size="50"
value="$Encoder.attributeEscape($manualpaused_SUBJECT)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr>
+ </td>
+ <td class="value">
+ <textarea name="s${SeqNum}_manualpaused_body" rows="10"
cols="50">$Encoder.bodyEscape($manualpaused_BODY)</textarea>
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopSchedulePause'))</nobr></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_schedulepaused_to" size="32"
value="$Encoder.attributeEscape($schedulepaused_TO)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_schedulepaused_from" size="32"
value="$Encoder.attributeEscape($schedulepaused_FROM)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_schedulepaused_subject" size="50"
value="$Encoder.attributeEscape($schedulepaused_SUBJECT)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr>
+ </td>
+ <td class="value">
+ <textarea name="s${SeqNum}_schedulepaused_body" rows="10"
cols="50">$Encoder.bodyEscape($schedulepaused_BODY)</textarea>
+ </td>
+ </tr>
+
+ <tr><td class="message"
colspan="2"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.JobStopRestart'))</nobr></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ToColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_restarted_to" size="32"
value="$Encoder.attributeEscape($restarted_TO)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.FromColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_restarted_from" size="32"
value="$Encoder.attributeEscape($restarted_FROM)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.SubjectColon'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" name="s${SeqNum}_restarted_subject" size="50"
value="$Encoder.attributeEscape($restarted_SUBJECT)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.BodyColon'))</nobr>
+ </td>
+ <td class="value">
+ <textarea name="s${SeqNum}_restarted_body" rows="10"
cols="50">$Encoder.bodyEscape($restarted_BODY)</textarea>
</td>
</tr>
@@ -56,9 +227,34 @@ limitations under the License.
#else
-<input type="hidden" name="s${SeqNum}_to"
value="$Encoder.attributeEscape($TO)"/>
-<input type="hidden" name="s${SeqNum}_from"
value="$Encoder.attributeEscape($FROM)"/>
-<input type="hidden" name="s${SeqNum}_subject"
value="$Encoder.attributeEscape($SUBJECT)"/>
-<input type="hidden" name="s${SeqNum}_body"
value="$Encoder.attributeEscape($BODY)"/>
+<input type="hidden" name="s${SeqNum}_finished_to"
value="$Encoder.attributeEscape($finished_TO)"/>
+<input type="hidden" name="s${SeqNum}_finished_from"
value="$Encoder.attributeEscape($finished_FROM)"/>
+<input type="hidden" name="s${SeqNum}_finished_subject"
value="$Encoder.attributeEscape($finished_SUBJECT)"/>
+<input type="hidden" name="s${SeqNum}_finished_body"
value="$Encoder.attributeEscape($finished_BODY)"/>
+
+<input type="hidden" name="s${SeqNum}_erroraborted_to"
value="$Encoder.attributeEscape($erroraborted_TO)"/>
+<input type="hidden" name="s${SeqNum}_erroraborted_from"
value="$Encoder.attributeEscape($erroraborted_FROM)"/>
+<input type="hidden" name="s${SeqNum}_erroraborted_subject"
value="$Encoder.attributeEscape($erroraborted_SUBJECT)"/>
+<input type="hidden" name="s${SeqNum}_erroraborted_body"
value="$Encoder.attributeEscape($erroraborted_BODY)"/>
+
+<input type="hidden" name="s${SeqNum}_manualaborted_to"
value="$Encoder.attributeEscape($manualaborted_TO)"/>
+<input type="hidden" name="s${SeqNum}_manualaborted_from"
value="$Encoder.attributeEscape($manualaborted_FROM)"/>
+<input type="hidden" name="s${SeqNum}_manualaborted_subject"
value="$Encoder.attributeEscape($manualaborted_SUBJECT)"/>
+<input type="hidden" name="s${SeqNum}_manualaborted_body"
value="$Encoder.attributeEscape($manualaborted_BODY)"/>
+
+<input type="hidden" name="s${SeqNum}_manualpaused_to"
value="$Encoder.attributeEscape($manualpaused_TO)"/>
+<input type="hidden" name="s${SeqNum}_manualpaused_from"
value="$Encoder.attributeEscape($manualpaused_FROM)"/>
+<input type="hidden" name="s${SeqNum}_manualpaused_subject"
value="$Encoder.attributeEscape($manualpaused_SUBJECT)"/>
+<input type="hidden" name="s${SeqNum}_manualpaused_body"
value="$Encoder.attributeEscape($manualpaused_BODY)"/>
+
+<input type="hidden" name="s${SeqNum}_schedulepaused_to"
value="$Encoder.attributeEscape($schedulepaused_TO)"/>
+<input type="hidden" name="s${SeqNum}_schedulepaused_from"
value="$Encoder.attributeEscape($schedulepaused_FROM)"/>
+<input type="hidden" name="s${SeqNum}_schedulepaused_subject"
value="$Encoder.attributeEscape($schedulepaused_SUBJECT)"/>
+<input type="hidden" name="s${SeqNum}_schedulepaused_body"
value="$Encoder.attributeEscape($schedulepaused_BODY)"/>
+
+<input type="hidden" name="s${SeqNum}_restarted_to"
value="$Encoder.attributeEscape($restarted_TO)"/>
+<input type="hidden" name="s${SeqNum}_restarted_from"
value="$Encoder.attributeEscape($restarted_FROM)"/>
+<input type="hidden" name="s${SeqNum}_restarted_subject"
value="$Encoder.attributeEscape($restarted_SUBJECT)"/>
+<input type="hidden" name="s${SeqNum}_restarted_body"
value="$Encoder.attributeEscape($restarted_BODY)"/>
#end
