NIFI-3362 update FlowConfiguration.xsd to allow all current time period units
This closes #1509. Signed-off-by: Aldrin Piri <ald...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bd497a74 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bd497a74 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bd497a74 Branch: refs/heads/support/nifi-0.7.x Commit: bd497a7457a60fe6cd01d60c27bf9ce472dfd1f4 Parents: 7d23bd7 Author: Mike Moser <mose...@apache.org> Authored: Fri Feb 10 20:06:16 2017 +0000 Committer: Aldrin Piri <ald...@apache.org> Committed: Thu Feb 16 21:25:02 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/util/FormatUtils.java | 4 ++-- .../nifi-framework-core/src/main/resources/FlowConfiguration.xsd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/bd497a74/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java index a30c14e..3d4b976 100644 --- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java +++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java @@ -35,8 +35,8 @@ public class FormatUtils { private static final double BYTES_IN_TERABYTE = BYTES_IN_GIGABYTE * 1024; // for Time Durations - private static final String NANOS = join(UNION, "ns", "nano", "nanos", "nanoseconds"); - private static final String MILLIS = join(UNION, "ms", "milli", "millis", "milliseconds"); + private static final String NANOS = join(UNION, "ns", "nano", "nanos", "nanosecond", "nanoseconds"); + private static final String MILLIS = join(UNION, "ms", "milli", "millis", "millisecond", "milliseconds"); private static final String SECS = join(UNION, "s", "sec", "secs", "second", "seconds"); private static final String MINS = join(UNION, "m", "min", "mins", "minute", "minutes"); private static final String HOURS = join(UNION, "h", "hr", "hrs", "hour", "hours"); http://git-wip-us.apache.org/repos/asf/nifi/blob/bd497a74/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd index 56f08a6..3765957 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd @@ -302,7 +302,7 @@ <xs:simpleType name="TimePeriod"> <xs:restriction base="xs:string"> - <xs:pattern value="\d+\s*(ns|nano|nanos|nanoseconds|ms|milli|millis|milliseconds|s|sec|secs|seconds|m|min|mins|minutes|h|hr|hrs|hours|d|day|days)"></xs:pattern> + <xs:pattern value="\d+\s*(ns|nano|nanos|nanosecond|nanoseconds|ms|milli|millis|millisecond|milliseconds|s|sec|secs|second|seconds|m|min|mins|minute|minutes|h|hr|hrs|hour|hours|d|day|days|w|wk|wks|week|weeks)"></xs:pattern> </xs:restriction> </xs:simpleType> @@ -371,4 +371,4 @@ <xs:element name="annotationData" type="xs:string" minOccurs="0" maxOccurs="1" /> </xs:sequence> </xs:complexType> -</xs:schema> \ No newline at end of file +</xs:schema>
