You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/01/18 20:03:07 UTC
[01/17] flink git commit: [docs] Clean up documentation figures -
Remove old unused figure image files - Add a file clarifying that figures are
licensed under ASL 2.0
Repository: flink
Updated Branches:
refs/heads/master 3897b47bf -> d3072ba57
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/reduce.svg
----------------------------------------------------------------------
diff --git a/docs/img/reduce.svg b/docs/img/reduce.svg
deleted file mode 100644
index 5349141..0000000
--- a/docs/img/reduce.svg
+++ /dev/null
@@ -1,444 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="185"
- id="svg35289"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="reduce.svg">
- <defs
- id="defs35291">
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35250"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35252"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35254"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35256"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35258"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35260"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-0"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-7"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35403"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35405"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35407"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35409"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35411"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35413"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-6"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-1"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="233.75455"
- inkscape:cy="86.830647"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="1161"
- inkscape:window-x="1400"
- inkscape:window-y="18"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata35294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-492.58981,-171.02527)">
- <g
- id="g44557"
- transform="translate(284.86629,-3.7883928)">
- <g
- transform="translate(2158.7696,-421.90351)"
- id="g35174">
- <g
- id="g33519"
- transform="translate(-475,10)">
- <g
- transform="matrix(1,0,0,1.0123433,-1388.1056,2483.203)"
- id="g7121-1"
- style="opacity:0.95999995">
- <rect
- style="fill:#f3f3f3;fill-opacity:1;stroke:#000000;stroke-width:1.49082756;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25"
- id="rect2994-5-8-90"
- width="57.498154"
- height="134.88037"
- x="267.76794"
- y="-1829.9814" />
- <g
- id="g3792-4-7-6"
- transform="matrix(0.4074212,0,0,0.40742032,190.00545,-1148.6406)"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-0-7-5"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-5-6-7"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.4074212,0,0,0.40742032,190.00545,-1115.5741)"
- id="g3792-8-9-8-25"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-46-7-5"
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-9-3-0"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.4074212,0,0,0.40742032,190.00545,-1080.2331)"
- id="g3792-0-2-2-3"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-2-5-5"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-4-4-8"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.4074212,0,0,0.40742032,190.00545,-1044.8921)"
- id="g3792-8-4-7-3-0"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-4-75-5-7"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-7-4-7-36"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <rect
- style="fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49082756;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.47248249, 4.47248249;stroke-dashoffset:0"
- id="rect2994-3-8-0-9-22"
- width="57.498154"
- height="28.256905"
- x="368.94507"
- y="-1759.9644" />
- <g
- transform="matrix(0.4074212,0,0,0.40742032,291.18262,-1080.0794)"
- id="g3792-8-5-0-5-0"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-7-2-6-3"
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-4-1-5-2"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <rect
- style="fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49082756;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.47248249, 4.47248249;stroke-dashoffset:0"
- id="rect2994-3-3-8-3-7"
- width="57.498154"
- height="27.763"
- x="368.94507"
- y="-1725.4464" />
- <g
- transform="matrix(0.4074212,0,0,0.40742032,291.18262,-1045.8085)"
- id="g3792-0-1-1-5-0"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-8-1-8-8"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-5-0-3-7"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <rect
- style="fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49082756;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.47248248, 4.47248248;stroke-dashoffset:0"
- id="rect2994-3-36-6-8"
- width="57.498154"
- height="60.043583"
- x="368.94507"
- y="-1828.2587" />
- <g
- id="g3792-1-2-1-9"
- transform="matrix(0.4074212,0,0,0.40742032,291.0657,-1147.8529)"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1660.405"
- x="211.71547"
- height="50"
- width="50"
- id="rect2992-7-8-9-3"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1660.405"
- x="261.71548"
- height="50"
- width="50"
- id="rect2992-8-8-9-9-4"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.4074212,0,0,0.40742032,291.18262,-1115.5741)"
- id="g3792-8-4-9-0-1-4"
- style="stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-4-7-6-7-4"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-7-5-4-1-3"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65918398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <path
- style="fill:none;stroke:#000000;stroke-width:1.49082756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
- d="m 316.88805,-1814.1501 51.96735,0"
- id="path4066-2-4-62"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:1.49082756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
- d="m 316.88805,-1781.0836 31.9416,21.7791 c 3.17115,-4.7193 8.17328,-0.6496 5.3385,3.64 l 14.77695,10.0756"
- id="path4066-8-5-0-1"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:1.49082756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
- d="m 316.88805,-1710.4016 51.94148,-70.682"
- id="path4066-0-6-2-3"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:1.49082756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
- d="m 316.88805,-1745.7426 14.775,9.772 c 3.00165,-5.0886 9.07942,-0.9487 5.48925,3.6306 l 31.78455,21.022"
- id="path4066-8-5-2-5-4"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- </g>
- </g>
- </g>
- <path
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
- d="m 559.17478,185.71313 22.75265,-0.035 -0.12654,35.13393"
- id="path4066-2-0-9-4-1-2"
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <text
- sodipodi:linespacing="125%"
- id="text39591"
- y="190.05518"
- x="491.41794"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- y="190.05518"
- x="491.41794"
- id="tspan39593"
- sodipodi:role="line">Key Field</tspan></text>
- </g>
- </g>
-</svg>
[05/17] flink git commit: [LICENSE] Update LICENSE and NOTICE files -
Add missing entries for dependencies - Remove entries for removed
dependencies - Change DEPENDENCIES file to point to src and bin LICENSE and
NOTICE file - Add comments in some fil
Posted by se...@apache.org.
[LICENSE] Update LICENSE and NOTICE files
- Add missing entries for dependencies
- Remove entries for removed dependencies
- Change DEPENDENCIES file to point to src and bin LICENSE and NOTICE file
- Add comments in some files to clarify whether the are Flink original,
or from which third party file they are adapted
- Change some links from incubator to TLP
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0b2edf13
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0b2edf13
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0b2edf13
Branch: refs/heads/master
Commit: 0b2edf132920a3f70770d1f0ec61aec0152f218b
Parents: cd6da11
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Jan 10 18:37:37 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:30 2015 -0800
----------------------------------------------------------------------
DEPENDENCIES | 763 +------------------
LICENSE | 4 +-
docs/_plugins/build_apidoc.rb | 8 +-
docs/_plugins/gh_link.rb | 8 +-
docs/_plugins/organizeLicenseHeaders.rb | 9 +-
docs/coding_guidelines.md | 2 +-
docs/css/bootstrap-lumen-custom.css | 2 +
.../main/resources/web-docs/img/delete-icon.png | Bin 1204 -> 568 bytes
.../src/main/resources/web-docs/js/d3.js | 7 +
flink-dist/src/main/flink-bin/LICENSE | 133 +++-
flink-dist/src/main/flink-bin/NOTICE | 61 +-
flink-dist/src/main/flink-bin/README.txt | 4 +-
.../web-docs-infoserver/css/timeline.css | 5 +
tools/generate_specific_pom.sh | 4 +-
14 files changed, 227 insertions(+), 783 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 8e616b5..bb5b483 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,763 +1,14 @@
-Apache Flink dependencies:
+Apache Flink dependencies
The Apache Flink project depends on various components with separate copyright
notices and license terms. Your use of these subcomponents is subject
to the terms and conditions of their respective licenses.
------------------------------------------------------------------------
- Apache License (Version 2.0)
------------------------------------------------------------------------
+ - See files "LICENSE" and "NOTICE" for licenses and notice files (per section 4(d) of
+ the Apache License) relating to files and dependencies distributed with the
+ Apache Flink sources.
-The Apache Flink project depends on and/or bundles the following components
-under the Apache License (v 2.0):
+ - See files "flink-dist/src/main/flink-bin/LICENSE" and "flink-dist/src/main/flink-bin/NOTICE"
+ for licenses and notice files (per section 4(d) of the Apache License) relating
+ to dependencies bundled with the binary distribution of Apache Flink.
- - Apache Commons Logging (http://commons.apache.org/proper/commons-logging/)
- - Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
- - Apache Commons CLI (http://commons.apache.org/cli/)
- - Apache Commons FileUpload (http://commons.apache.org/fileupload/)
- - Apache Commons IO (http://commons.apache.org/io/)
- - Apache Commons Math (http://commons.apache.org/proper/commons-math/)
- - Apache Log4J (http://logging.apache.org/log4j/1.2/)
- - Apache Avro (http://avro.apache.org)
- - Apache Hadoop (http://hadoop.apache.org)
- - Apache Derby (http://db.apache.org/derby/)
- - Apache Kafka (http://kafka.apache.org)
- - Apache Flume (http://flume.apache.org)
- - Apache Camel (http://camel.apache.org)
- - Google Guava (https://code.google.com/p/guava-libraries/)
- - Netty (http://netty.io)
- - Powermock (http://www.powermock.org)
- - Javassist (http://www.javassist.org)
- - Jetty Web Container (http://www.eclipse.org/jetty/)
- - Amazon Web Services SDK for Java (http://aws.amazon.com/sdkforjava/)
- - ScalaTest (http://www.scalatest.org)
- - StartBootstrap (http://startbootstrap.com)
- - CHAP Links Library Timeline (http://almende.github.io/chap-links-library/)
- - Twitter Hosebird Client (hbc) (https://github.com/twitter/hbc)
- - Akka (http://akka.io)
-
-
------------------------------------------------------------------------
- Eclipse Public License - v 1.0
------------------------------------------------------------------------
-
-The Apache Flink project depends on and/or bundles the following components
-under the Eclipse Public License (v 1.0)
-
- - JUnit (http://junit.org/)
-
-You may obtain a copy of the Eclipse Public License (v 1.0) at
-https://www.eclipse.org/legal/epl-v10.html
-
-
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
-
-The Apache Flink project depends on and/or bundles the following components
-under the MIT License
-
- - Mockito (http://www.mockito.org) - Copyright (c) 2007 Mockito contributors
- - SLF4J (http://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- - jQuery v2.1.0. (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
- - Sizzle.js (http://sizzlejs.com) - Copyright 2010, The Dojo Foundation
- - jCanvas 13.11.21 (http://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- - Flot 0.8.1 (http://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap 3.1.0 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- - normalize.css v3.0.0 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- - Font Awesome - Code (http://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy
- - D3 dagre renderer (https://github.com/cpettitt/dagre-d3) - Copyright (c) 2012-2013 Chris Pettitt
- - scopt v3.2.0 (http://github.com/scopt/scopt)
-
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
------------------------------------------------------------------------
- BSD-style Licenses
------------------------------------------------------------------------
-
-The Apache Flink project depends on and/or bundles the following components
-under BSD-style licenses
-
-(BSD-style License)
- - Hamcrest (https://code.google.com/p/hamcrest/) - Copyright (c) 2000-2006, www.hamcrest.org
-
-(3-clause BSD license)
- - Kryo (https://github.com/EsotericSoftware/kryo) - Copyright (c) 2008, Nathan Sweet
- - D3 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
- - LevelDB JNI (https://github.com/fusesource/leveldbjni/) - Copyright (c) 2011, FuseSource Corp.
- - Memcached (https://github.com/memcached/memcached) - Copyright (c) 2003, Danga Interactive, Inc.
- - Redis (http://redis.io/) - Copyright (c) 2009, Salvatore Sanfilippo and Pieter Noordhuis
-
-(BSD-like License)
- - Scala Library (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Compiler (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Compiler Reflect (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - ASM (BSD-like) - (http://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom
-
-
-(Below is the 3-clause BSD license)
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
------------------------------------------------------------------------
- Mozilla Public License - v 1.1
------------------------------------------------------------------------
-
-The Apache Flink project depends on and/or bundles the following components
-under the Mozilla Public License (v 1.1)
-
- - RabbitMQ (http://www.rabbitmq.com)
- The Initial Developer of the Original Code is GoPivotal,Ltd.
- Copyright (c) 2007-2013 GoPivotal, Inc. All Rights Reserved.
-
-You may obtain a copy of the Mozilla Public License (v 1.1) at
-http://www.mozilla.org/MPL/
-
-
------------------------------------------------------------------------
- The Open Font License
------------------------------------------------------------------------
-
-The Apache Flink project packages the following fonts under the
-Open Font License (OFT) - http://scripts.sil.org/OFL/
-
- - Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy
- -> fonts in "flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts"
-
-
-
-=======================================================================
- NOTICE files corresponding to section 4(d) of the Apache License,
- for bundled components and dependencies
-=======================================================================
-
------------------------------------------------------------------------
- Apache Commons Codec
------------------------------------------------------------------------
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-
------------------------------------------------------------------------
- Apache Log4J
------------------------------------------------------------------------
-
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
-
-
------------------------------------------------------------------------
- Apache Commmons Lang3
------------------------------------------------------------------------
-
-This product includes software from the Spring Framework,
-under the Apache License 2.0 (see: StringUtils.containsWhitespace())
-
-
------------------------------------------------------------------------
- Apache Avro
------------------------------------------------------------------------
-
-C JSON parsing provided by Jansson and
-written by Petri Lehtinen. The original software is
-available from http://www.digip.org/jansson/.
-
-
------------------------------------------------------------------------
- Apache HBase
------------------------------------------------------------------------
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-
-In addition, this product includes software developed by:
-
-Jamon (http://www.jamon.org/) is a text template engine for Java used by our
-UI. It uses the Mozilla Public License (http://www.mozilla.org/MPL/)
-See the tail of http://www.jamon.org/About.html
-
-JUnit (http://www.junit.org/) included under the Common Public License v1.0. See
-the full text here: http://junit.sourceforge.net/cpl-v10.html
-
-JRuby (http://jruby.org) is tri-licensed. We include it under terms of the
-Common Public License v1.0.
-
-JRuby itself includes libraries variously licensed. See its COPYING document
-for details: https://github.com/jruby/jruby/blob/master/COPYING
-
-The JRuby community went out of their way to make JRuby compatible with Apache
-projects: See https://issues.apache.org/jira/browse/HBASE-3374)
-
-
------------------------------------------------------------------------
- Apache Flume
------------------------------------------------------------------------
-
-Portions of this software were developed at
-Cloudera, Inc. (http://www.cloudera.com/).
-
-
------------------------------------------------------------------------
- Amazon Web Services SDK for Java
------------------------------------------------------------------------
-
-AWS SDK for Java
-Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-This product includes software developed by
-Amazon Technologies, Inc (http://www.amazon.com/).
-
-**********************
-THIRD PARTY COMPONENTS
-**********************
-This software includes third party software subject to the following copyrights:
-- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
-- JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org.
-- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
-
-The licenses for these third party components are included in LICENSE.txt
-
-
------------------------------------------------------------------------
- Jetty Web Container
------------------------------------------------------------------------
-
-Copyright 1995-2014 Mort Bay Consulting Pty Ltd.
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted.
-
-Jetty is dual licensed under both
-
- * The Apache 2.0 License
- http://www.apache.org/licenses/LICENSE-2.0.html
-
- and
-
- * The Eclipse Public 1.0 License
- http://www.eclipse.org/legal/epl-v10.html
-
-Jetty may be distributed under either license.
-
-The javax.servlet package used was sourced from the Apache
-Software Foundation and is distributed under the apache 2.0
-license.
-
-The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
-
-
------------------------------------------------------------------------
-For Apache Hadoop Subcomponents
------------------------------------------------------------------------
-
-The Apache Hadoop project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-For the org.apache.hadoop.util.bloom.* classes:
-
-/**
- *
- * Copyright (c) 2005, European Commission project OneLab under contract
- * 034819 (http://www.one-lab.org)
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the distribution.
- * - Neither the name of the University Catholique de Louvain - UCL
- * nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-For portions of the native implementation of slicing-by-8 CRC calculation
-in src/main/native/src/org/apache/hadoop/util:
-
-/**
- * Copyright 2008,2009,2010 Massachusetts Institute of Technology.
- * All rights reserved. Use of this source code is governed by a
- * BSD-style license that can be found in the LICENSE file.
- */
-
-For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,
-lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
-
-/*
- LZ4 - Fast LZ compression algorithm
- Header File
- Copyright (C) 2011-2013, Yann Collet.
- BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- You can contact the author at :
- - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
- - LZ4 source repository : http://code.google.com/p/lz4/
-*/
-
-
------------------------------------------------------------------------
- The Netty Project
------------------------------------------------------------------------
-
-Please visit the Netty web site for more information:
-
- * http://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project licenses this file to you under the Apache License,
-version 2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at:
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
- * LICENSE:
- * license/LICENSE.jsr166y.txt (Public Domain)
- * HOMEPAGE:
- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.base64.txt (Public Domain)
- * HOMEPAGE:
- * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.webbit.txt (BSD License)
- * HOMEPAGE:
- * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.slf4j.txt (MIT License)
- * HOMEPAGE:
- * http://www.slf4j.org/
-
-This product contains a modified portion of 'ArrayDeque', written by Josh
-Bloch of Google, Inc:
-
- * LICENSE:
- * license/LICENSE.deque.txt (Public Domain)
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.harmony.txt (Apache License 2.0)
- * HOMEPAGE:
- * http://archive.apache.org/dist/harmony/
-
-This product contains a modified version of Roland Kuhn's ASL2
-AbstractNodeQueue, which is based on Dmitriy Vyukov's non-intrusive MPSC queue.
-It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.abstractnodequeue.txt (Public Domain)
- * HOMEPAGE:
- * https://github.com/akka/akka/blob/wip-2.2.3-for-scala-2.11/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jbzip2.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.libdivsufsort.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/libdivsufsort/
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jzlib.txt (BSD style License)
- * HOMEPAGE:
- * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.compress-lzf.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/ning/compress
-
-This product optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.protobuf.txt (New BSD License)
- * HOMEPAGE:
- * http://code.google.com/p/protobuf/
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.bouncycastle.txt (MIT License)
- * HOMEPAGE:
- * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.snappy.txt (New BSD License)
- * HOMEPAGE:
- * http://code.google.com/p/snappy/
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
- * HOMEPAGE:
- * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.caliper.txt (Apache License 2.0)
- * HOMEPAGE:
- * http://code.google.com/p/caliper/
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-logging.txt (Apache License 2.0)
- * HOMEPAGE:
- * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
- * LICENSE:
- * license/LICENSE.log4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * http://logging.apache.org/log4j/
-
-
-
------------------------------------------------------------------------
- Redis
------------------------------------------------------------------------
-
-Redis uses source code from third parties. All this code contians a BSD or
-BSD-compatible license. The following is a list of third party files and
-information about their copyright.
-
- * Redis uses the LHF compression library. LibLZF is copyright
- Marc Alexander Lehmann and is released under the terms of the
- two clause BSD license.
- * Redis uses the sha1.c file that is copyright by Steve Reid and released
- under the public domain. This file is extremely popular and used among
- open source and proprietary code.
- * When compiled on Linux Redis uses the Jemalloc allocator, that is
- copyright by Jason Evans, Mozilla Foundation and Facebook, Inc and is
- released under the two clause BSD license.
- * Inside Jemalloc the file pprof is copyright Google Inc and released under
- the three clause BSD license.
- * Inside Jemalloc the files inttypes.h, stdbool.h, stdint.h, strings.h under
- the msvc_compat directory are copyright Alexander Chemeris and released under
- the three clause BSD license.
- * The libraries hiredis and linenoise also included inside the Redis
- distribution are copyright Salvatore Sanfilippo and Pieter Noordhuis and
- released under the terms respectively of the three clause BSD license and
- two clause BSD license.
-
------------------------------------------------------------------------
- Apache Derby
------------------------------------------------------------------------
-
-Apache Derby
-Copyright 2004-2013 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
- ---
-
-Portions of Derby were originally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
-informally known as the "Derby CLA".
-The following copyright notice(s) were affixed to portions of the code
-with which this file is now or was at one time distributed
-and are placed here unaltered.
-
-(C) Copyright 1997,2004 International Business Machines Corporation. All rights reserved.
-
-(C) Copyright IBM Corp. 2003.
-
- ---
-
-The portion of the functionTests under 'nist' was originally
-developed by the National Institute of Standards and Technology (NIST),
-an agency of the United States Department of Commerce, and adapted by
-International Business Machines Corporation in accordance with the NIST
-Software Acknowledgment and Redistribution document at
-http://www.itl.nist.gov/div897/ctg/sql_form.htm
-
- ---
-
-The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
-java/stubs/jdbc3) were produced by trimming sources supplied by the
-Apache Harmony project. In addition, the Harmony SerialBlob and
-SerialClob implementations are used. The following notice covers the Harmony sources:
-
-Portions of Harmony were originally developed by
-Intel Corporation and are licensed to the Apache Software
-Foundation under the "Software Grant and Corporate Contribution
-License Agreement", informally known as the "Intel Harmony CLA".
-
- ---
-
-The Derby build relies on source files supplied by the Apache Felix
-project. The following notice covers the Felix files:
-
- Apache Felix Main
- Copyright 2008 The Apache Software Foundation
-
-
- I. Included Software
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
- Licensed under the Apache License 2.0.
-
- This product includes software developed at
- The OSGi Alliance (http://www.osgi.org/).
- Copyright (c) OSGi Alliance (2000, 2007).
- Licensed under the Apache License 2.0.
-
- This product includes software from http://kxml.sourceforge.net.
- Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
- Licensed under BSD License.
-
- II. Used Software
-
- This product uses software developed at
- The OSGi Alliance (http://www.osgi.org/).
- Copyright (c) OSGi Alliance (2000, 2007).
- Licensed under the Apache License 2.0.
-
-
- III. License Summary
- - Apache License 2.0
- - BSD License
-
- ---
-
-The Derby build relies on jar files supplied by the Apache Xalan
-project. The following notice covers the Xalan jar files:
-
-
- Apache Xalan (Xalan XSLT processor)
- Copyright 1999-2006 The Apache Software Foundation
-
- Apache Xalan (Xalan serializer)
- Copyright 1999-2006 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- =========================================================================
- Portions of this software was originally based on the following:
- - software copyright (c) 1999-2002, Lotus Development Corporation.,
- http://www.lotus.com.
- - software copyright (c) 2001-2002, Sun Microsystems.,
- http://www.sun.com.
- - software copyright (c) 2003, IBM Corporation.,
- http://www.ibm.com.
-
- =========================================================================
- The binary distribution package (ie. jars, samples and documentation) of
- this product includes software developed by the following:
-
- - The Apache Software Foundation
- - Xerces Java - see LICENSE.txt
- - JAXP 1.3 APIs - see LICENSE.txt
- - Bytecode Engineering Library - see LICENSE.txt
- - Regular Expression - see LICENSE.txt
-
- - Scott Hudson, Frank Flannery, C. Scott Ananian
- - CUP Parser Generator runtime (javacup\runtime) - see LICENSE.txt
-
- =========================================================================
- The source distribution package (ie. all source and tools required to build
- Xalan Java) of this product includes software developed by the following:
-
- - The Apache Software Foundation
- - Xerces Java - see LICENSE.txt
- - JAXP 1.3 APIs - see LICENSE.txt
- - Bytecode Engineering Library - see LICENSE.txt
- - Regular Expression - see LICENSE.txt
- - Ant - see LICENSE.txt
- - Stylebook doc tool - see LICENSE.txt
-
- - Elliot Joel Berk and C. Scott Ananian
- - Lexical Analyzer Generator (JLex) - see LICENSE.txt
-
- =========================================================================
- Apache Xerces Java
- Copyright 1999-2006 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
- were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
-
- =========================================================================
- Apache xml-commons xml-apis (redistribution of xml-apis.jar)
-
- Apache XML Commons
- Copyright 2001-2003,2006 The Apache Software Foundation.
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index bb8b845..e58d1a5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -218,16 +218,18 @@ conditions of their respective licenses.
The Apache Flink project bundles the following files under the MIT License:
- jQuery v2.1.0. (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery resize event v1.1 (http://benalman.com/projects/jquery-resize-plugin/) - Copyright (c) 2010 "Cowboy" Ben Alman
- Sizzle.js (http://sizzlejs.com) - Copyright 2010, The Dojo Foundation
- jCanvas 13.11.21 (http://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
+ - query.flot.tooltip (https://github.com/krzysu/flot.tooltip) - Copyright (c) Krzysztof Urbas
- Bootstrap 3.1.0 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootswatch Lumen Theme v3.1.1+1 (http://bootswatch.com) - Copyright (c) 2012-2014 Thomas Park
- normalize.css v3.0.0 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- Font Awesome - Code (http://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy
- D3 dagre renderer (https://github.com/cpettitt/dagre-d3) - Copyright (c) 2012-2013 Chris Pettitt
- scopt (http://github.com/scopt/scopt)
-
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/docs/_plugins/build_apidoc.rb
----------------------------------------------------------------------
diff --git a/docs/_plugins/build_apidoc.rb b/docs/_plugins/build_apidoc.rb
index 303662b..2326148 100644
--- a/docs/_plugins/build_apidoc.rb
+++ b/docs/_plugins/build_apidoc.rb
@@ -14,6 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# ---------------------------------------------------------
+# Triggers building the API docs (javadoc and scaladoc)
+#
+# Written by Aljoscha Krettek
+# ---------------------------------------------------------
+
require 'fileutils'
require 'rubygems'
include FileUtils
@@ -36,7 +42,7 @@ if ENV['BUILD_API'] == '1' then
puts `mvn clean install -DskipTests`
puts "Generating Javadoc"
- javadoc_command = %{mvn javadoc:aggregate -Pdocs-and-source #{java8_doc_fix} -Dmaven.javadoc.failOnError=false -Dquiet=true -Dheader="<a href=\"/docs/0.7-incubating/\" target=\"_top\"><h1>Back to Flink Documentation</h1></a>"}
+ javadoc_command = %{mvn javadoc:aggregate -Pdocs-and-source #{java8_doc_fix} -Dmaven.javadoc.failOnError=false -Dquiet=true -Dheader="<a href=\"/docs/0.8/\" target=\"_top\"><h1>Back to Flink Documentation</h1></a>"}
puts "Running: #{javadoc_command}"
puts `#{javadoc_command}`
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/docs/_plugins/gh_link.rb
----------------------------------------------------------------------
diff --git a/docs/_plugins/gh_link.rb b/docs/_plugins/gh_link.rb
index 5fabc50..6916fda 100644
--- a/docs/_plugins/gh_link.rb
+++ b/docs/_plugins/gh_link.rb
@@ -15,6 +15,12 @@
# specific language governing permissions and limitations
# under the License.
+# ---------------------------------------------------------
+# Expands a github link shortcut into a proper markdown link
+#
+# Written by Ufuk Celebi
+# ---------------------------------------------------------
+
module Jekyll
class GitHubLinkTag < Liquid::Tag
@@ -45,4 +51,4 @@ module Jekyll
end
end
-Liquid::Template.register_tag('gh_link', Jekyll::GitHubLinkTag)
\ No newline at end of file
+Liquid::Template.register_tag('gh_link', Jekyll::GitHubLinkTag)
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/docs/_plugins/organizeLicenseHeaders.rb
----------------------------------------------------------------------
diff --git a/docs/_plugins/organizeLicenseHeaders.rb b/docs/_plugins/organizeLicenseHeaders.rb
index 7758f8c..3c84d17 100644
--- a/docs/_plugins/organizeLicenseHeaders.rb
+++ b/docs/_plugins/organizeLicenseHeaders.rb
@@ -15,6 +15,13 @@
# specific language governing permissions and limitations
# under the License.
+# ---------------------------------------------------------
+# Ensures that teh documentation contains the Apache License
+# headers once, not repeatedly for each include.
+#
+# Written by Fabian Hueske
+# ---------------------------------------------------------
+
module Jekyll
module LicenseRemover
@@ -67,4 +74,4 @@ module Jekyll
end
end
-end
\ No newline at end of file
+end
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/docs/coding_guidelines.md
----------------------------------------------------------------------
diff --git a/docs/coding_guidelines.md b/docs/coding_guidelines.md
index c7168bd..a126f2b 100644
--- a/docs/coding_guidelines.md
+++ b/docs/coding_guidelines.md
@@ -20,4 +20,4 @@ specific language governing permissions and limitations
under the License.
-->
-The coding guidelines are now located [on the project website](http://flink.incubator.apache.org/coding_guidelines.html).
\ No newline at end of file
+The coding guidelines are now located [on the project website](http://flink.apache.org/coding_guidelines.html).
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/docs/css/bootstrap-lumen-custom.css
----------------------------------------------------------------------
diff --git a/docs/css/bootstrap-lumen-custom.css b/docs/css/bootstrap-lumen-custom.css
index dc9ecc8..6d07201 100644
--- a/docs/css/bootstrap-lumen-custom.css
+++ b/docs/css/bootstrap-lumen-custom.css
@@ -1,5 +1,7 @@
@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic");
/*!
+ * Modified version based on bootwatch's lumen theme
+ *
* Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/flink-clients/src/main/resources/web-docs/img/delete-icon.png
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/resources/web-docs/img/delete-icon.png b/flink-clients/src/main/resources/web-docs/img/delete-icon.png
old mode 100755
new mode 100644
index 7fad958..dc4f4fc
Binary files a/flink-clients/src/main/resources/web-docs/img/delete-icon.png and b/flink-clients/src/main/resources/web-docs/img/delete-icon.png differ
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/flink-clients/src/main/resources/web-docs/js/d3.js
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/resources/web-docs/js/d3.js b/flink-clients/src/main/resources/web-docs/js/d3.js
index c5e8d15..2d09bc9 100644
--- a/flink-clients/src/main/resources/web-docs/js/d3.js
+++ b/flink-clients/src/main/resources/web-docs/js/d3.js
@@ -1,3 +1,10 @@
+/**
+ * D3 renderer from http://d3js.org/
+ * Copyright (c) 2010-2014, Michael Bostock
+ *
+ * Under BSD License (as stated under http://d3js.org/)
+ */
+
!function() {
var d3 = {
version: "3.4.6"
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/flink-dist/src/main/flink-bin/LICENSE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
index 5183b59..a18ebb9 100644
--- a/flink-dist/src/main/flink-bin/LICENSE
+++ b/flink-dist/src/main/flink-bin/LICENSE
@@ -220,25 +220,29 @@ under the Apache License (v 2.0):
- Apache Commons Logging (http://commons.apache.org/proper/commons-logging/)
- Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
+ - Apache Commons Collections (http://commons.apache.org/collections/)
- Apache Commons CLI (http://commons.apache.org/cli/)
- Apache Commons FileUpload (http://commons.apache.org/fileupload/)
- Apache Commons IO (http://commons.apache.org/io/)
+ - Apache Commons Lang v.3.3.2 (http://commons.apache.org/proper/commons-lang/)
- Apache Commons Math (http://commons.apache.org/proper/commons-math/)
- Apache Avro (http://avro.apache.org)
- Apache Hadoop (http://hadoop.apache.org)
+ - Apache HBase Client (http://hbase.apache.org)
- Apache Derby (http://db.apache.org/derby/)
- Apache Kafka (http://kafka.apache.org)
- Apache Flume (http://flume.apache.org)
+ - Apache Sling (http://sling.apache.org)
- Google Guava (https://code.google.com/p/guava-libraries/)
- - Netty (http://netty.io)
- - Powermock (http://www.powermock.org)
- - Javassist (http://www.javassist.org)
+ - Netty v4.0.21 (http://netty.io)
+ - Chill_2.10 v0.5.1 (https://github.com/twitter/chill)
- Jetty Web Container (http://www.eclipse.org/jetty/)
- Amazon Web Services SDK for Java (http://aws.amazon.com/sdkforjava/)
- - ScalaTest (http://www.scalatest.org)
- StartBootstrap (http://startbootstrap.com)
- CHAP Links Library Timeline (http://almende.github.io/chap-links-library/)
- Twitter Hosebird Client (hbc) (https://github.com/twitter/hbc)
+ - Jettison (http://jettison.codehaus.org)
+ - Akka (http://akka.io)
-----------------------------------------------------------------------
@@ -249,13 +253,17 @@ The Apache Flink project bundles the following components under the MIT License:
- SLF4J (http://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- jQuery v2.1.0. (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery resize event v1.1 (http://benalman.com/projects/jquery-resize-plugin/) - Copyright (c) 2010 "Cowboy" Ben Alman
- Sizzle.js (http://sizzlejs.com) - Copyright 2010, The Dojo Foundation
- jCanvas 13.11.21 (http://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
+ - query.flot.tooltip (https://github.com/krzysu/flot.tooltip) - Copyright (c) Krzysztof Urbas
- Bootstrap 3.1.0 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootswatch Lumen Theme v3.1.1+1 (http://bootswatch.com) - Copyright (c) 2012-2014 Thomas Park
- normalize.css v3.0.0 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- Font Awesome - Code (http://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy
- D3 dagre renderer (https://github.com/cpettitt/dagre-d3) - Copyright (c) 2012-2013 Chris Pettitt
+ - spymemcached (http://code.google.com/p/spymemcached/) - Copyright (c) 2006-2009 Dustin Sallings, Copyright (c) 2009-2011 Couchbase, Inc.
All rights reserved.
@@ -290,15 +298,14 @@ BSD-style licenses:
- Kryo (https://github.com/EsotericSoftware/kryo) - Copyright (c) 2008, Nathan Sweet
- D3 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
- LevelDB JNI (https://github.com/fusesource/leveldbjni/) - Copyright (c) 2011, FuseSource Corp.
- - Memcached (https://github.com/memcached/memcached) - Copyright (c) 2003, Danga Interactive, Inc.
- Redis (http://redis.io/) - Copyright (c) 2009, Salvatore Sanfilippo and Pieter Noordhuis
[BSD-like License]
- Scala Library (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Compiler (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Compiler Reflect (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Quasiquotes (BSD-like) - (http://scalamacros.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - ASM (BSD-like) - (http://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom
+ - Scala Compiler (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
+ - Scala Compiler Reflect (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
+ - Scala Quasiquotes (http://scalamacros.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
+ - ASM (http://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom
(Below is the 3-clause BSD license)
@@ -374,7 +381,6 @@ Open Font License (OFT) - http://scripts.sil.org/OFL/
For Apache Hadoop Subcomponents
-----------------------------------------------------------------------
-The Apache Flink project bundles components from the Apache Hadoop project.
The Apache Hadoop project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
@@ -423,13 +429,12 @@ in src/main/native/src/org/apache/hadoop/util:
* BSD-style license that can be found in the LICENSE file.
*/
-For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,
-lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
+For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,lz4hc.h,lz4hc.c},
/*
LZ4 - Fast LZ compression algorithm
Header File
- Copyright (C) 2011-2013, Yann Collet.
+ Copyright (C) 2011-2014, Yann Collet.
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
Redistribution and use in source and binary forms, with or without
@@ -456,6 +461,106 @@ lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
- LZ4 source repository : http://code.google.com/p/lz4/
+ - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
+
+
+For hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/gtest
+---------------------------------------------------------------------
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----------------------------------------------------------------------
+ For Apache Sling Subcomponents
+-----------------------------------------------------------------------
+
+Apache Sling includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses.
+
+JSON in Java
+
+ Copyright (c) 2002 JSON.org
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ The Software shall be used for Good, not Evil.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-----------------------------------------------------------------------
+ For Apache Kafka
+-----------------------------------------------------------------------
+
+Apache Kafka depends on SBT licensed under the following license
+
+SBT LICENSE
+
+Copyright (c) 2008, 2009, 2010 Mark Harrah, Jason Zaugg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/flink-dist/src/main/flink-bin/NOTICE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE
index 4381695..bf07029 100644
--- a/flink-dist/src/main/flink-bin/NOTICE
+++ b/flink-dist/src/main/flink-bin/NOTICE
@@ -112,6 +112,23 @@ Foundation (http://www.apache.org/).
Copyright 2009-2014 Typesafe Inc. (http://www.typesafe.com)
-----------------------------------------------------------------------
+ Apache Sling
+-----------------------------------------------------------------------
+
+Apache Sling
+Copyright 2008-2011 The Apache Software Foundation
+
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product contains code derived from JSON in Java code from JSON.org.
+Copyright (c) 2002 JSON.org
+
+
+-----------------------------------------------------------------------
Amazon Web Services SDK for Java
-----------------------------------------------------------------------
@@ -133,6 +150,23 @@ The licenses for these third party components are included in LICENSE.txt
-----------------------------------------------------------------------
+ Twitter Chill Library
+-----------------------------------------------------------------------
+
+Chill is a set of Scala extensions for Kryo.
+Copyright 2012 Twitter, Inc.
+
+Third Party Dependencies:
+
+Kryo 2.17
+BSD 3-Clause License
+http://code.google.com/p/kryo
+
+Commons-Codec 1.7
+Apache Public License 2.0
+http://hadoop.apache.org
+
+-----------------------------------------------------------------------
Jetty Web Container
-----------------------------------------------------------------------
@@ -166,6 +200,25 @@ granted provided that the copyright notice appears in all copies.
-----------------------------------------------------------------------
+ Jettison
+-----------------------------------------------------------------------
+
+Copyright 2006 Envoi Solutions LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+-----------------------------------------------------------------------
The Netty Project
-----------------------------------------------------------------------
@@ -343,9 +396,9 @@ can be obtained at:
Redis
-----------------------------------------------------------------------
-Redis uses source code from third parties. All this code contians a BSD or
-BSD-compatible license. The following is a list of third party files and
-information about their copyright.
+Redis uses source code from third parties. All this code is licensed
+under a BSD or BSD-compatible license. The following is a list of third
+party files and information about their copyright.
* Redis uses the LHF compression library. LibLZF is copyright
Marc Alexander Lehmann and is released under the terms of the
@@ -544,4 +597,4 @@ project. The following notice covers the Xalan jar files:
* March 18, 2012: Eugene adds immutable parser, forks the project to scopt/scopt, and releases
scopt 2.0.0.
* June 7, 2013: Eugene rewrites scopt from scratch for polymorphic options, and releases scopt 3
- .0.0.
\ No newline at end of file
+ .0.0.
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/flink-dist/src/main/flink-bin/README.txt
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/README.txt b/flink-dist/src/main/flink-bin/README.txt
index cd37117..46fab4d 100644
--- a/flink-dist/src/main/flink-bin/README.txt
+++ b/flink-dist/src/main/flink-bin/README.txt
@@ -1,10 +1,10 @@
For the latest information about Flink, please visit our website at:
- http://flink.incubator.apache.org
+ http://flink.apache.org
and our GitHub Account
- https://github.com/apache/incubator-flink
+ https://github.com/apache/flink
If you have any questions, ask on our Mailing lists:
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css b/flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css
index e2ae53f..852066a 100644
--- a/flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css
+++ b/flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css
@@ -15,6 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+/*
+ * Modified from the CHAP Links Library Timeline
+ *(http://almende.github.io/chap-links-library/)
+ */
div.timeline-frame {
border: 1px solid #BEBEBE;
http://git-wip-us.apache.org/repos/asf/flink/blob/0b2edf13/tools/generate_specific_pom.sh
----------------------------------------------------------------------
diff --git a/tools/generate_specific_pom.sh b/tools/generate_specific_pom.sh
index cd7f9d1..e180ff8 100755
--- a/tools/generate_specific_pom.sh
+++ b/tools/generate_specific_pom.sh
@@ -19,8 +19,8 @@
#
-# See https://github.com/stratosphere/stratosphere/issues/95
-# Inspired by: https://github.com/apache/hbase/blob/trunk/dev-support/generate-hadoopX-poms.sh
+# Inspired by and modified from:
+# https://github.com/apache/hbase/blob/trunk/dev-support/generate-hadoopX-poms.sh
#
function usage {
[10/17] flink git commit: [dist] Updated mailing list info in binary
distribution
Posted by se...@apache.org.
[dist] Updated mailing list info in binary distribution
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6f765db2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6f765db2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6f765db2
Branch: refs/heads/master
Commit: 6f765db211c996a36144777a33c67f678793f736
Parents: 839fd03
Author: mbalassi <mb...@apache.org>
Authored: Mon Jan 12 10:50:55 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:28:16 2015 -0800
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/README.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6f765db2/flink-dist/src/main/flink-bin/README.txt
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/README.txt b/flink-dist/src/main/flink-bin/README.txt
index 46fab4d..4ebee19 100644
--- a/flink-dist/src/main/flink-bin/README.txt
+++ b/flink-dist/src/main/flink-bin/README.txt
@@ -8,8 +8,8 @@ and our GitHub Account
If you have any questions, ask on our Mailing lists:
- user@flink.incubator.apache.org
- dev@flink.incubator.apache.org
+ user@flink.apache.org
+ dev@flink.apache.org
This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
[02/17] flink git commit: [docs] Clean up documentation figures -
Remove old unused figure image files - Add a file clarifying that figures are
licensed under ASL 2.0
Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/join.svg
----------------------------------------------------------------------
diff --git a/docs/img/join.svg b/docs/img/join.svg
deleted file mode 100644
index 3143be1..0000000
--- a/docs/img/join.svg
+++ /dev/null
@@ -1,634 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="195"
- id="svg35289"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="match.svg">
- <defs
- id="defs35291">
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35250"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35252"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35254"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35256"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35258"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35260"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-0"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-7"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35403"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35405"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35407"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35409"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35411"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35413"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-9"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-75"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35572"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35574"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35576"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35578"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35580"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35582"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35584"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35586"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35588"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35590"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-5"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-2"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="3.959798"
- inkscape:cx="236.8846"
- inkscape:cy="139.10312"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="374"
- inkscape:window-x="1400"
- inkscape:window-y="412"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata35294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-484.80217,-248.14373)">
- <g
- id="g35027"
- transform="translate(1951.0537,-629.64646)">
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-5-0-7"
- d="m -938.8172,909.44427 0,23.67486"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <rect
- y="932.67249"
- x="-1223.4713"
- height="136.06552"
- width="57.281906"
- id="rect2994-5-9-0-0"
- style="opacity:0.95999995;fill:#f3f3f3;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-3-1-6"
- d="m -1174.1847,1054.5519 32.1253,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.59638965;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40774172,0,0,0.41277371,-1301.4257,1623.5379)"
- id="g3792-4-1-7-5">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65630722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-3-0"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65630722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-1-7"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-8-9-5-1-2"
- transform="matrix(0.40774188,0,0,0.41277387,-1301.4258,1658.2654)">
- <rect
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.65630603;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-46-8-9-8"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65630603;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-9-7-0-0"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-5-2"
- transform="matrix(0.40454759,0,0,0.40954016,-1300.5907,1722.3573)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.6851759;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-6-3"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.6851759;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-7-5"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-8-4-7-0-7-4"
- transform="matrix(0.40560715,0,0,0.41061279,-1300.8677,1689.4088)">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.67554951;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-4-75-4-4-3"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.67554951;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-7-4-2-0-0"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <rect
- y="881.41754"
- x="-1141.5946"
- height="32.721252"
- width="232.56281"
- id="rect2994-5-9-4-2-2"
- style="opacity:0.95999995;fill:#f3f3f3;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25" />
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40774188,0,0,0.41277387,-1045.3506,1572.0715)"
- id="g3792-4-1-1-6-7">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65630603;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-9-47-1"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65630603;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-6-4-8"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.53030467;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-2-8-8"
- transform="matrix(0.39966779,0,0,0.40460014,-1161.2482,1558.5157)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.73017049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-5-5-7"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.73017049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-4-8-4"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc"
- id="path4066-2-0-78-4"
- d="m -1174.4433,949.28372 112.1612,-0.58473 c 0,-7.97392 10.4003,-7.71183 10.4003,0.2622 l 28.6711,0.32253"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc"
- id="path4066-2-0-7-4-2"
- d="m -1174.5501,1018.6844 112.2161,-0.597 c 0,-8.0094 10.5429,-7.991 10.5429,0 l 28.5804,0.5971"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-9-8"
- d="m -1056.6686,907.98234 -0.3925,129.59686"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.51504707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-5-0-8-8"
- d="m -938.7653,907.97323 0.1239,94.69557"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.51167059;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <g
- transform="translate(426.5,-0.5)"
- id="g34412">
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0"
- id="rect2994-3-0-0-6-8"
- width="103.5"
- height="28.5"
- x="-1562.7062"
- y="1041.1628" />
- <g
- transform="translate(-391.67928,287.33529)"
- id="g34070-6">
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-1-17-4-6-9"
- transform="matrix(0.40475762,0,0,0.40915735,-1251.7436,1436.4245)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-8-4-1-8-9"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-5-3-2-1-8"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-2-3-7-5-9"
- transform="matrix(0.40475762,0,0,0.40915735,-1198.4405,1436.4245)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-5-3-9-5-9"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-4-7-60-6-3"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- </g>
- </g>
- <g
- transform="translate(428.43934,-1.3232233)"
- id="g34422">
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0"
- id="rect2994-3-0-0-5-0"
- width="103.5"
- height="28.5"
- x="-1446.7938"
- y="937.06146" />
- <g
- transform="translate(-391.67928,287.33529)"
- id="g34078-7">
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1138.1239,1338.3958)"
- id="g3792-1-9-8-4-0">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-7-3-3-6-1"
- width="50"
- height="50"
- x="211.71547"
- y="-1660.405" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-8-6-83-2-4"
- width="50"
- height="50"
- x="261.71548"
- y="-1660.405" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1082.0231,1337.5985)"
- id="g3792-4-1-1-4-3-1">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-9-1-0-7"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-6-0-2-4"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- </g>
- </g>
- <g
- transform="translate(428.60562,67.816701)"
- id="g34422-3">
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0"
- id="rect2994-3-0-0-5-0-0"
- width="103.5"
- height="28.5"
- x="-1446.7938"
- y="937.06146" />
- <g
- transform="translate(-391.67928,287.33529)"
- id="g34078-7-9">
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1138.1239,1338.3958)"
- id="g3792-1-9-8-4-0-9">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-7-3-3-6-1-1"
- width="50"
- height="50"
- x="211.71547"
- y="-1660.405" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-8-6-83-2-4-4"
- width="50"
- height="50"
- x="261.71548"
- y="-1660.405" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1082.0231,1337.5985)"
- id="g3792-4-1-1-4-3-1-8">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-9-1-0-7-9"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-6-0-2-4-9"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- </g>
- </g>
- </g>
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc"
- id="path4066-2-0-9-4-1-2"
- d="m 723.38563,271.07503 22.75265,-0.035 -0.12654,35.13393"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <text
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="655.62878"
- y="275.41705"
- id="text39591"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan39593"
- x="655.62878"
- y="275.41705">Key Field</tspan></text>
- </g>
-</svg>
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/license.txt
----------------------------------------------------------------------
diff --git a/docs/img/license.txt b/docs/img/license.txt
new file mode 100644
index 0000000..35b8673
--- /dev/null
+++ b/docs/img/license.txt
@@ -0,0 +1,17 @@
+All image files in the folder and its subfolders are
+licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/map.svg
----------------------------------------------------------------------
diff --git a/docs/img/map.svg b/docs/img/map.svg
deleted file mode 100644
index e723fa7..0000000
--- a/docs/img/map.svg
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="143.05"
- id="svg35289"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="New document 124">
- <defs
- id="defs35291">
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35250"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35252"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35254"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35256"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35258"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35260"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.49497475"
- inkscape:cx="-815.60294"
- inkscape:cy="64.274519"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="570"
- inkscape:window-x="1400"
- inkscape:window-y="609"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata35294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-242.76955,-215.47765)">
- <g
- id="g35210"
- transform="translate(2485.7696,-422.90351)">
- <g
- id="g33877">
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.50000041, 4.50000041;stroke-dashoffset:0"
- id="rect2994-3-8-0-9-2-8"
- width="57.498154"
- height="28.746929"
- x="-1821.1605"
- y="676.76147" />
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.50000041, 4.50000041;stroke-dashoffset:0"
- id="rect2994-3-8-0-9-2-6"
- width="57.498154"
- height="28.746929"
- x="-1821.1605"
- y="643.2868" />
- <rect
- style="opacity:0.95999995;fill:#f3f3f3;fill-opacity:1;stroke:#000000;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25"
- id="rect2994-5-8-9"
- width="57.498154"
- height="136.54524"
- x="-1922.3376"
- y="641.63354" />
- <rect
- style="opacity:0.95999995;fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-7-4"
- width="20.371059"
- height="20.622461"
- x="-1913.9596"
- y="647.34906" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-6-6"
- width="20.371059"
- height="20.622461"
- x="-1893.5885"
- y="647.34906" />
- <rect
- style="opacity:0.95999995;fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-46-7-1"
- width="20.371059"
- height="20.622461"
- x="-1913.9596"
- y="680.82367" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-9-3-9"
- width="20.371059"
- height="20.622461"
- x="-1893.5885"
- y="680.82367" />
- <rect
- style="opacity:0.95999995;fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-5-4"
- width="20.371059"
- height="20.622461"
- x="-1913.9596"
- y="716.60101" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-4-0"
- width="20.371059"
- height="20.622461"
- x="-1893.5885"
- y="716.60101" />
- <rect
- style="opacity:0.95999995;fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-4-75-5-3"
- width="20.371059"
- height="20.622461"
- x="-1913.9596"
- y="752.37817" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-7-4-7-3"
- width="20.371059"
- height="20.622461"
- x="-1893.5885"
- y="752.37817" />
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.50000041, 4.50000041;stroke-dashoffset:0"
- id="rect2994-3-8-0-9-2"
- width="57.498154"
- height="28.746929"
- x="-1821.1605"
- y="712.60596" />
- <rect
- style="opacity:0.95999995;fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-7-2-6-4"
- width="20.371059"
- height="20.622461"
- x="-1812.7825"
- y="716.75659" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-4-1-5-6"
- width="20.371059"
- height="20.622461"
- x="-1792.4115"
- y="716.75659" />
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.50000043, 4.50000043;stroke-dashoffset:0"
- id="rect2994-3-3-8-3-4"
- width="57.498154"
- height="29.100485"
- x="-1821.1605"
- y="747.47668" />
- <rect
- style="opacity:0.95999995;fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-8-1-8-3"
- width="20.371059"
- height="20.622461"
- x="-1812.7825"
- y="751.4505" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-5-0-3-5"
- width="20.371059"
- height="20.622461"
- x="-1792.4115"
- y="751.4505" />
- <rect
- style="opacity:0.95999995;fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-7-8-9-5"
- width="20.371059"
- height="20.622461"
- x="-1812.7825"
- y="647.349" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-8-9-9-6"
- width="20.371059"
- height="20.622461"
- x="-1792.4115"
- y="647.349" />
- <rect
- style="opacity:0.95999995;fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-4-7-6-7-8"
- width="20.371059"
- height="20.622461"
- x="-1812.7825"
- y="680.82367" />
- <rect
- style="opacity:0.95999995;fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-7-5-4-1-6"
- width="20.371059"
- height="20.622461"
- x="-1792.4115"
- y="680.82367" />
- <path
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
- d="m -1873.2175,657.6603 51.9673,0"
- id="path4066-2-4-6"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-4-6-3"
- d="m -1873.2175,691.16137 51.9674,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-4-6-4"
- d="m -1873.2175,726.93859 51.9674,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-4-6-6"
- d="m -1873.2175,762.71582 51.9674,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- </g>
- </g>
- </g>
-</svg>
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/operator.svg
----------------------------------------------------------------------
diff --git a/docs/img/operator.svg b/docs/img/operator.svg
deleted file mode 100644
index 67c3c41..0000000
--- a/docs/img/operator.svg
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="170"
- id="svg6946"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="operator.svg">
- <defs
- id="defs6948">
- <marker
- inkscape:stockid="Arrow1Mend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow1Mend"
- style="overflow:visible">
- <path
- id="path3864"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- inkscape:connector-curvature="0" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.5452459"
- inkscape:cx="388.74049"
- inkscape:cy="101.23661"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="1161"
- inkscape:window-x="1400"
- inkscape:window-y="18"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata6951">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-127.12556,-140.3642)">
- <g
- id="g8234"
- transform="translate(181.30051,-1.8278624)">
- <g
- id="g7569">
- <rect
- style="fill:#a7dbd8;fill-opacity:1;stroke:#333333;stroke-width:1.99999976;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect7007"
- width="271.42856"
- height="134.01833"
- x="206.42857"
- y="145.01993" />
- <text
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="338.51025"
- y="270.93359"
- id="text7535"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- x="338.51025"
- y="270.93359"
- id="tspan7539">Operator Function</tspan></text>
- </g>
- <g
- transform="translate(2.7779195,-6.8185297)"
- id="g7564">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect7007-0"
- width="169.28571"
- height="88.571434"
- x="293.57141"
- y="163.32396" />
- <text
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="299.37442"
- y="244.45761"
- id="text7535-3"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- x="299.37442"
- y="244.45761"
- id="tspan7539-2">User-defined Function</tspan></text>
- </g>
- <path
- inkscape:connector-curvature="0"
- id="rect7760"
- d="m 158.27381,149.96659 0,25.28125 -26.71577,0 0,73.5625 26.71577,0 0,25.28125 36.08334,-62.0625 -36.08334,-62.0625 z"
- style="fill:#b4a7d6;fill-opacity:1;stroke:#333333;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <text
- xml:space="preserve"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="162.55525"
- y="287.18451"
- id="text3845-0-1"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3847-6-2"
- x="162.55525"
- y="287.18451"
- style="font-size:16px;text-align:center;text-anchor:middle" /><tspan
- sodipodi:role="line"
- x="162.55525"
- y="307.18451"
- style="font-size:16px;text-align:center;text-anchor:middle"
- id="tspan8170">Input Data</tspan></text>
- <path
- sodipodi:nodetypes="cccccccc"
- inkscape:connector-curvature="0"
- id="rect7760-2"
- d="m 247.45907,159.58539 0,5.24456 -26.71577,0 0,6.85017 26.71577,0 0,4.88742 36.08334,-8.49108 z"
- style="fill:#b4a7d6;fill-opacity:1;stroke:#333333;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <path
- sodipodi:nodetypes="cccccccc"
- inkscape:connector-curvature="0"
- id="rect7760-2-3"
- d="m 247.45907,185.29972 0,5.24456 -26.71577,0 0,6.85017 26.71577,0 0,4.88742 36.08334,-8.49108 z"
- style="fill:#b4a7d6;fill-opacity:1;stroke:#333333;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <path
- sodipodi:nodetypes="cccccccc"
- inkscape:connector-curvature="0"
- id="rect7760-2-2"
- d="m 247.45907,211.01397 0,5.24456 -26.71577,0 0,6.85017 26.71577,0 0,4.88742 36.08334,-8.49108 z"
- style="fill:#b4a7d6;fill-opacity:1;stroke:#333333;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <g
- transform="translate(8.8900712,-1.6668884)"
- id="g8092">
- <path
- style="fill:#f3b33f;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 344.01749,180.66459 c -1.00984,0 -2.00307,0.0799 -2.97054,0.2303 l 0,2.95759 c -1.30309,0.241 -2.55224,0.63153 -3.72535,1.16364 l -1.4731,-2.53334 c -1.55054,0.73183 -2.98661,1.67422 -4.2732,2.77576 l 1.49745,2.56971 c -0.89425,0.81963 -1.6956,1.73909 -2.38618,2.7394 l -2.54444,-1.46667 c -0.94054,1.39727 -1.69549,2.93147 -2.24008,4.55759 l 2.60531,1.49092 c -0.30383,1.03528 -0.50752,2.11403 -0.59654,3.22425 l -2.93402,0 c -0.029,0.42867 -0.0487,0.86099 -0.0487,1.29698 0,1.29482 0.11742,2.55972 0.36523,3.78183 l 3.00706,0 c 0.23267,0.96251 0.55193,1.88931 0.9496,2.77576 l -2.54444,1.46667 c 0.72632,1.55023 1.66379,2.97813 2.76358,4.26668 l 2.56879,-1.47879 c 0.61288,0.67281 1.27837,1.29285 1.9966,1.85456 l -1.4731,2.53333 c 1.35328,1.01142 2.84542,1.85684 4.44364,2.48486 l 1.48527,-2.55758 c 0.82162,0.29731 1.67903,0.52861 2.55662,0.69091 l 0,2.95759 c 0.96746,0.1504 1.96069,0.2303 2.97054,0.2303 0.72232,0 1.42903,-0.0434 2.13051,-0.12122 l 0,-2.93333 c 0.92198,-0.12
099 1.82433,-0.31291 2.69053,-0.58183 l 1.49746,2.56971 c 1.62727,-0.56836 3.1491,-1.35393 4.54103,-2.31516 l -1.46092,-2.53334 c 0.8221,-0.58602 1.59164,-1.23797 2.28878,-1.96364 l 2.58097,1.47879 c 1.13091,-1.26838 2.10046,-2.6809 2.86096,-4.21819 l -2.53226,-1.45456 c 0.47863,-0.99754 0.85459,-2.05339 1.12004,-3.15152 l 2.99488,0 c 0.24782,-1.22211 0.37742,-2.48701 0.37742,-3.78183 0,-0.43599 -0.0318,-0.86831 -0.0609,-1.29698 l -2.92185,0 c -0.10054,-1.25362 -0.34579,-2.46806 -0.71829,-3.62425 l 2.58096,-1.47879 c -0.58053,-1.61591 -1.37593,-3.12911 -2.34965,-4.50911 l -2.53227,1.45456 c -0.77844,-1.06674 -1.67797,-2.03832 -2.69053,-2.88487 l 1.4731,-2.54546 c -1.32833,-1.05198 -2.80059,-1.9333 -4.38277,-2.60607 l -1.4731,2.54546 c -1.22625,-0.48946 -2.53039,-0.82848 -3.88362,-1.00607 l 0,-2.93333 c -0.70148,-0.0778 -1.40819,-0.12122 -2.13051,-0.12122 z m 0,13.5758 c 3.01222,0 5.45411,2.43125 5.45411,5.43033 0,2.99908 -2.44189,5.43032 -5.45411,5.43032 -3.01223,0 -5.45411,-2.43124
-5.45411,-5.43032 0,-2.99908 2.44188,-5.43033 5.45411,-5.43033 z"
- id="path7903-09"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f3b33f;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 369.14084,167.18601 c -0.63817,0 -1.26583,0.0505 -1.87721,0.14554 l 0,1.86903 c -0.82348,0.15229 -1.61288,0.39908 -2.35421,0.73534 l -0.9309,-1.60091 c -0.97987,0.46246 -1.88737,1.058 -2.70042,1.75411 l 0.94629,1.62391 c -0.56511,0.51796 -1.0715,1.099 -1.50792,1.73114 l -1.60794,-0.92685 c -0.59436,0.88299 -1.07144,1.8525 -1.4156,2.88013 l 1.64641,0.94217 c -0.192,0.65424 -0.32073,1.33593 -0.37697,2.03754 l -1.85414,0 c -0.0184,0.27088 -0.0308,0.54409 -0.0308,0.81961 0,0.81825 0.0742,1.61759 0.23081,2.38989 l 1.90028,0 c 0.14703,0.60825 0.34879,1.19393 0.60009,1.75412 l -1.60793,0.92685 c 0.45899,0.97966 1.05142,1.88199 1.74642,2.6963 l 1.62332,-0.93452 c 0.3873,0.42517 0.80786,0.81701 1.26174,1.17197 l -0.93092,1.60092 c 0.85519,0.63916 1.79814,1.17341 2.80812,1.57029 l 0.9386,-1.61625 c 0.51923,0.18789 1.06105,0.33405 1.61564,0.43662 l 0,1.86902 c 0.61137,0.0951 1.23904,0.14554 1.87721,0.14554 0.45645,0 0.90306,-0.0274 1.34635,-0.0765 l 0,-1.8537 c 0.58263,-0.0765
1.15287,-0.19773 1.70027,-0.36768 l 0.94629,1.62391 c 1.02834,-0.35918 1.99006,-0.85561 2.86967,-1.46305 l -0.92321,-1.60092 c 0.51952,-0.37033 1.00582,-0.78233 1.44637,-1.24091 l 1.63102,0.93451 c 0.71468,-0.80155 1.32738,-1.69418 1.80797,-2.66565 l -1.60025,-0.9192 c 0.30247,-0.63038 0.54006,-1.29762 0.7078,-1.99157 l 1.89258,0 c 0.15661,-0.7723 0.23852,-1.57165 0.23852,-2.3899 0,-0.27552 -0.0202,-0.54872 -0.0385,-0.81961 l -1.84643,0 c -0.0635,-0.79221 -0.21852,-1.55967 -0.45392,-2.29031 l 1.63102,-0.93452 c -0.36686,-1.02115 -0.86951,-1.97741 -1.48484,-2.84948 l -1.60025,0.91919 c -0.49193,-0.6741 -1.06037,-1.2881 -1.70026,-1.82307 l 0.93092,-1.60858 c -0.83943,-0.66479 -1.76981,-1.22172 -2.76966,-1.64689 l -0.93092,1.60859 c -0.77491,-0.30932 -1.59905,-0.52354 -2.45421,-0.63577 l 0,-1.8537 c -0.44329,-0.0491 -0.88989,-0.0765 -1.34635,-0.0765 z m 0,8.57911 c 1.90355,0 3.44667,1.5364 3.44667,3.43165 0,1.89525 -1.54312,3.43164 -3.44667,3.43164 -1.90355,0 -3.44669,-1.53639 -3.44669
,-3.43164 0,-1.89525 1.54314,-3.43165 3.44669,-3.43165 z"
- id="path7903-0-4"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f3b33f;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 399.41472,172.32967 c -1.00984,0 -2.00307,0.0799 -2.97054,0.2303 l 0,2.95759 c -1.30309,0.24099 -2.55225,0.63153 -3.72536,1.16364 l -1.47309,-2.53335 c -1.55054,0.73184 -2.98661,1.67423 -4.2732,2.77578 l 1.49745,2.5697 c -0.89425,0.81963 -1.69559,1.73908 -2.38618,2.73941 l -2.54444,-1.46668 c -0.94053,1.39727 -1.6955,2.93146 -2.24008,4.55759 l 2.60531,1.49091 c -0.30383,1.03529 -0.50751,2.11404 -0.59655,3.22426 l -2.93401,0 c -0.029,0.42866 -0.0487,0.86098 -0.0487,1.29697 0,1.29484 0.11742,2.55973 0.36523,3.78183 l 3.00707,0 c 0.23266,0.96252 0.55192,1.88932 0.94959,2.77577 l -2.54444,1.46666 c 0.72632,1.55025 1.66379,2.97814 2.76359,4.26669 l 2.56879,-1.47879 c 0.61288,0.6728 1.27836,1.29285 1.99659,1.85456 l -1.4731,2.53333 c 1.35327,1.01143 2.84542,1.85684 4.44364,2.48486 l 1.48526,-2.55758 c 0.82163,0.29731 1.67904,0.52861 2.55663,0.6909 l 0,2.95759 c 0.96745,0.15041 1.96069,0.2303 2.97054,0.2303 0.72232,0 1.42904,-0.0434 2.13051,-0.1212 l 0,-2.93335 c 0.92198,-0
.12099 1.82433,-0.3129 2.69054,-0.58182 l 1.49744,2.56971 c 1.62728,-0.56836 3.14911,-1.35393 4.54104,-2.31516 l -1.46093,-2.53335 c 0.82211,-0.58602 1.59165,-1.23796 2.28879,-1.96364 l 2.58096,1.47879 c 1.13093,-1.26838 2.10047,-2.6809 2.86098,-4.21819 l -2.53227,-1.45456 c 0.47863,-0.99753 0.85459,-2.05338 1.12004,-3.15152 l 2.99489,0 c 0.2478,-1.2221 0.37741,-2.48699 0.37741,-3.78183 0,-0.43599 -0.0318,-0.86831 -0.0609,-1.29697 l -2.92185,0 c -0.10053,-1.25363 -0.34578,-2.46807 -0.71829,-3.62426 l 2.58097,-1.47879 c -0.58052,-1.61591 -1.37593,-3.12911 -2.34966,-4.5091 l -2.53226,1.45455 c -0.77844,-1.06673 -1.67798,-2.03832 -2.69053,-2.88486 l 1.4731,-2.54546 c -1.32833,-1.05199 -2.80059,-1.9333 -4.38277,-2.60608 l -1.4731,2.54547 c -1.22626,-0.48947 -2.53039,-0.82848 -3.88363,-1.00607 l 0,-2.93334 c -0.70147,-0.0778 -1.40818,-0.12121 -2.1305,-0.12121 z m 0,13.5758 c 3.01223,0 5.45412,2.43124 5.45412,5.43032 0,2.99909 -2.44189,5.43033 -5.45412,5.43033 -3.01222,0 -5.45411,-2.43124
-5.45411,-5.43033 0,-2.99908 2.44189,-5.43032 5.45411,-5.43032 z"
- id="path7903-6-1"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="translate(367.1568,8.8134766e-7)"
- id="g8115-1">
- <path
- style="fill:#b4a7d6;fill-opacity:1;stroke:#333333;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 150.27381,149.96659 0,25.28125 -26.71577,0 0,73.5625 26.71577,0 0,25.28125 36.08334,-62.0625 -36.08334,-62.0625 z"
- id="rect7760-0"
- inkscape:connector-curvature="0" />
- </g>
- <text
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="251.40457"
- y="247.67683"
- id="text7535-1"
- sodipodi:linespacing="125%"><tspan
- style="font-style:italic;text-align:center;text-anchor:middle;-inkscape-font-specification:Arial Italic"
- sodipodi:role="line"
- x="251.40457"
- y="247.67683"
- id="tspan7539-3">UDF</tspan><tspan
- style="font-style:italic;text-align:center;text-anchor:middle;-inkscape-font-specification:Arial Italic"
- id="tspan8168"
- sodipodi:role="line"
- x="251.40457"
- y="267.67682">Calls</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="522.07141"
- y="287.18451"
- id="text3845-0-1-8"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3847-6-2-4"
- x="522.07141"
- y="287.18451"
- style="font-size:16px;text-align:center;text-anchor:middle" /><tspan
- sodipodi:role="line"
- x="522.07141"
- y="307.18451"
- style="font-size:16px;text-align:center;text-anchor:middle"
- id="tspan8170-7">Output Data</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="341.65457"
- y="287.18451"
- id="text3845-0-1-8-1"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3847-6-2-4-5"
- x="341.65457"
- y="287.18451"
- style="font-size:16px;text-align:center;text-anchor:middle" /><tspan
- sodipodi:role="line"
- x="341.65457"
- y="307.18451"
- style="font-size:16px;text-align:center;text-anchor:middle"
- id="tspan8170-7-1">Operator</tspan></text>
- </g>
- </g>
-</svg>
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/plan_visualizer1.png
----------------------------------------------------------------------
diff --git a/docs/img/plan_visualizer1.png b/docs/img/plan_visualizer1.png
deleted file mode 100644
index 3fa45ea..0000000
Binary files a/docs/img/plan_visualizer1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/plan_visualizer2.png
----------------------------------------------------------------------
diff --git a/docs/img/plan_visualizer2.png b/docs/img/plan_visualizer2.png
deleted file mode 100644
index ef07f7e..0000000
Binary files a/docs/img/plan_visualizer2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/recorddm.svg
----------------------------------------------------------------------
diff --git a/docs/img/recorddm.svg b/docs/img/recorddm.svg
deleted file mode 100644
index c40223f..0000000
--- a/docs/img/recorddm.svg
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="125.61"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="recorddm.svg">
- <defs
- id="defs4">
- <marker
- inkscape:stockid="Arrow1Mend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow1Mend"
- style="overflow:visible">
- <path
- id="path3864"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- inkscape:stockid="Arrow1Mstart"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow1Mstart"
- style="overflow:visible">
- <path
- id="path3861"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
- transform="matrix(0.4,0,0,0.4,4,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- inkscape:stockid="Arrow1Lstart"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow1Lstart"
- style="overflow:visible">
- <path
- id="path3855"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
- transform="matrix(0.8,0,0,0.8,10,0)"
- inkscape:connector-curvature="0" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.69753138"
- inkscape:cx="-137.00168"
- inkscape:cy="180.66416"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="986"
- inkscape:window-x="1400"
- inkscape:window-y="193"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-330.7807,-543.08649)">
- <flowRoot
- xml:space="preserve"
- id="flowRoot4781"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- transform="translate(92.933548,154.52058)"><flowRegion
- id="flowRegion4783"><rect
- id="rect4785"
- width="326.42029"
- height="111.51003"
- x="256.47308"
- y="449.82095" /></flowRegion><flowPara
- id="flowPara4789" /></flowRoot> <g
- id="g6802"
- transform="translate(269.2258,-3.4995098)">
- <g
- transform="matrix(0.35294118,0,0,0.35294118,328.10303,357.09655)"
- id="g4847">
- <rect
- style="fill:#eeeeee;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5-3-1"
- width="482.55975"
- height="82"
- x="10.420063"
- y="649.36505" />
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5"
- width="77.441345"
- height="78"
- x="12.920331"
- y="651.04889" />
- <rect
- style="fill:#eeeeee;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5-3"
- width="77.441345"
- height="78"
- x="93.032051"
- y="651.04889" />
- <rect
- style="fill:#b4a7d6;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5-7"
- width="77.441345"
- height="78"
- x="173.1438"
- y="651.04889" />
- <rect
- style="fill:#666666;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5-8"
- width="77.441345"
- height="78"
- x="253.25552"
- y="651.04889" />
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5-4"
- width="77.441345"
- height="78"
- x="333.36725"
- y="651.04889" />
- <rect
- style="fill:#e1f5c4;fill-opacity:1;stroke:#333333;stroke-width:5.66666651;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect2985-5-0"
- width="77.441345"
- height="78"
- x="413.47897"
- y="651.04889" />
- </g>
- <text
- sodipodi:linespacing="125%"
- id="text3845"
- y="649.5304"
- x="441.89203"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:16px"
- y="649.5304"
- x="441.89203"
- id="tspan3847"
- sodipodi:role="line">Field: Type</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text3845-0"
- y="561.53864"
- x="391.07892"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:16px"
- y="561.53864"
- x="391.07892"
- id="tspan3847-6"
- sodipodi:role="line">Record</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4753"
- y="639.59271"
- x="553.21973"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:16px"
- id="tspan4757"
- y="639.59271"
- x="553.21973"
- sodipodi:role="line">Value</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4799"
- y="658.17999"
- x="540.8418"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:12px"
- y="658.17999"
- x="540.8418"
- id="tspan4801"
- sodipodi:role="line">●</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4799-8"
- y="637.34369"
- x="540.8418"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:12px"
- y="637.34369"
- x="540.8418"
- id="tspan4801-8"
- sodipodi:role="line">●</tspan></text>
- <text
- inkscape:transform-center-y="66.906019"
- inkscape:transform-center-x="196.66315"
- sodipodi:linespacing="125%"
- id="text4827"
- y="660.42902"
- x="552.11816"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:16px"
- y="660.42902"
- x="552.11816"
- id="tspan4829"
- sodipodi:role="line">Key</tspan></text>
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4878"
- d="m 331.78518,578.49146 0,-3.70254 80.12761,0 5.47415,-4.53532 5.40619,4.53532 79.29829,0 0,3.62459"
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4878-7"
- d="m 446.54075,621.05807 0,3.77371 8.224,0 5.14272,4.62249 5.22951,-4.62249 8.86137,0 0,-3.69427"
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4878-7-9"
- d="m 537.48048,623.51239 -4.794,0 0,15.62417 -5.87227,6.39539 5.87227,6.50333 0,15.66121 4.69308,0"
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
-</svg>
[17/17] flink git commit: Commit for year 2015
Posted by se...@apache.org.
Commit for year 2015
Updated NOTICE files
Updated inceptionYear in pom
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e818729e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e818729e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e818729e
Branch: refs/heads/master
Commit: e818729e076a1a3d4cee90d721ca24e8a652f392
Parents: d14f383
Author: mbalassi <mb...@apache.org>
Authored: Wed Jan 14 22:31:17 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:58:21 2015 -0800
----------------------------------------------------------------------
NOTICE | 2 +-
flink-dist/src/main/flink-bin/NOTICE | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e818729e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 0ebf694..7be7a0e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Flink
-Copyright 2014 The Apache Software Foundation
+Copyright 2014-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flink/blob/e818729e/flink-dist/src/main/flink-bin/NOTICE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE
index bf07029..45b189d 100644
--- a/flink-dist/src/main/flink-bin/NOTICE
+++ b/flink-dist/src/main/flink-bin/NOTICE
@@ -1,5 +1,5 @@
Apache Flink
-Copyright 2014 The Apache Software Foundation
+Copyright 2014-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flink/blob/e818729e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e368f3a..0ad423c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@ under the License.
<name>Apache Flink</name>
<packaging>pom</packaging>
<url>http://flink.apache.org</url>
- <inceptionYear>2014</inceptionYear>
+ <inceptionYear>2015</inceptionYear>
<licenses>
<license>
[04/17] flink git commit: [FLINK-1375] [assembly] Remove incubator
DISCLAIMER file from binary distribution
Posted by se...@apache.org.
[FLINK-1375] [assembly] Remove incubator DISCLAIMER file from binary distribution
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ce5ce6af
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ce5ce6af
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ce5ce6af
Branch: refs/heads/master
Commit: ce5ce6af514542a4d936748f999f2876abd6ece7
Parents: 3897b47
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Jan 9 18:13:27 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:29 2015 -0800
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/DISCLAIMER | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ce5ce6af/flink-dist/src/main/flink-bin/DISCLAIMER
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/DISCLAIMER b/flink-dist/src/main/flink-bin/DISCLAIMER
deleted file mode 100644
index 48a1a19..0000000
--- a/flink-dist/src/main/flink-bin/DISCLAIMER
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Flink is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
-
[09/17] flink git commit: Minor dependencies cleanup: - Move sling
JSON dependency to streaming connectors (prev streaming core) - Exclude YARN
API from transitive mapreduce-core dependencies we use the dependency only
for .mapred and .mapreduce
Posted by se...@apache.org.
Minor dependencies cleanup:
- Move sling JSON dependency to streaming connectors (prev streaming core)
- Exclude YARN API from transitive mapreduce-core dependencies we use the dependency
only for .mapred and .mapreduce interfaces
- Remove some unnecessary dependencies (junit in java8)
- Manage Kryo dependency
- Cleanup minor POM warnings.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/543453d4
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/543453d4
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/543453d4
Branch: refs/heads/master
Commit: 543453d486a446552ea83bbc797d8dd2aa7193dd
Parents: f38e203
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Jan 10 18:28:01 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:30 2015 -0800
----------------------------------------------------------------------
.../flink-streaming-connectors/pom.xml | 6 +++++
.../flink-streaming-core/pom.xml | 5 ----
flink-addons/flink-tachyon/pom.xml | 8 +++----
flink-java/pom.xml | 1 -
flink-java8/pom.xml | 7 ------
flink-scala/pom.xml | 6 ++---
pom.xml | 25 +++++++++++++++++---
7 files changed, 35 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index 7c8126e..df34b20 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -208,6 +208,12 @@ under the License.
<artifactId>spymemcached</artifactId>
<version>2.8.4</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.json</artifactId>
+ <version>2.0.6</version>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/flink-addons/flink-streaming/flink-streaming-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
index beea37c..9231cbf 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -35,11 +35,6 @@ under the License.
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.6</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/flink-addons/flink-tachyon/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/pom.xml b/flink-addons/flink-tachyon/pom.xml
index 08046a3..887fa4b 100644
--- a/flink-addons/flink-tachyon/pom.xml
+++ b/flink-addons/flink-tachyon/pom.xml
@@ -64,7 +64,7 @@ under the License.
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.8.v20121106</version>
+ <version>7.6.8.v20121106</version><!--$NO-MVN-MAN-VER$-->
<scope>test</scope>
</dependency>
<dependency>
@@ -82,14 +82,14 @@ under the License.
<artifactId>hadoop-hdfs</artifactId>
<scope>test</scope>
<type>test-jar</type>
- <version>${hadoop.version}</version>
+ <version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>test</scope>
<type>test-jar</type>
- <version>${hadoop.version}</version>
+ <version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>
</dependencies>
<dependencyManagement>
@@ -108,4 +108,4 @@ under the License.
</dependency>
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 47d8c7d..8abe3d4 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -50,7 +50,6 @@ under the License.
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
- <version>2.24.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/flink-java8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index 2862788..0d82ea2 100644
--- a/flink-java8/pom.xml
+++ b/flink-java8/pom.xml
@@ -69,12 +69,6 @@ under the License.
<artifactId>flink-java-examples</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- </dependency>
</dependencies>
<build>
@@ -87,7 +81,6 @@ under the License.
<configuration>
<source>1.8</source>
<target>1.8</target>
- <!-- High optimization, no debugging <compilerArgument>-g:none -O</compilerArgument> -->
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index b902655..3b686ab 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -67,9 +67,9 @@ under the License.
</dependency>
<dependency>
- <groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_${scala.binary.version}</artifactId>
- <version>${scala.macros.version}</version>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ <version>${scala.macros.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/543453d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5610668..e368f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@ under the License.
<artifactId>flink-parent</artifactId>
<version>0.9-SNAPSHOT</version>
- <name>flink</name>
+ <name>Apache Flink</name>
<packaging>pom</packaging>
- <url>http://flink.incubator.apache.org/</url>
+ <url>http://flink.apache.org</url>
<inceptionYear>2014</inceptionYear>
<licenses>
@@ -47,7 +47,7 @@ under the License.
<scm>
<url>https://github.com/apache/incubator-flink</url>
- <connection>git@github.com:apache/incubator-flink.git</connection>
+ <connection>git@github.com:apache/flink.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-flink.git</developerConnection>
</scm>
@@ -232,6 +232,13 @@ under the License.
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>
+
+ <!-- kryo used in different versions by Flink an chill -->
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <version>2.24.0</version>
+ </dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -513,6 +520,18 @@ under the License.
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[12/17] flink git commit: [docs] Prepare documentation for 0.8 release
Posted by se...@apache.org.
[docs] Prepare documentation for 0.8 release
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/839fd030
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/839fd030
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/839fd030
Branch: refs/heads/master
Commit: 839fd0309b4ef699b1c55ea7c3e267b5a31bde6a
Parents: 0b2edf1
Author: Robert Metzger <me...@web.de>
Authored: Sat Jan 10 12:21:56 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:28:16 2015 -0800
----------------------------------------------------------------------
docs/README.md | 2 +-
docs/_config.yml | 10 +++++-----
docs/cli.md | 12 ++++++------
docs/cluster_execution.md | 4 ++--
docs/example_connectors.md | 8 ++++----
docs/hadoop_compatibility.md | 2 +-
docs/index.md | 4 ++--
docs/java_api_quickstart.md | 2 +-
docs/local_execution.md | 2 +-
docs/programming_guide.md | 12 ++++++------
docs/scala_api_quickstart.md | 2 +-
docs/setup_quickstart.md | 8 ++++----
docs/spargel_guide.md | 2 +-
docs/streaming_guide.md | 2 +-
docs/yarn_setup.md | 14 +++++++-------
15 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 8a19034..6dc76f2 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -44,7 +44,7 @@ title of the page. This title is used as the top-level heading for the page.
Furthermore, you can access variables found in `docs/_config.yml` as follows:
- {{ site.FLINK_VERSION_STABLE }}
+ {{ site.FLINK_VERSION_SHORT }}
This will be replaced with the value of the variable when generating the docs.
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index f9e3690..0fccf8c 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -22,9 +22,9 @@
# {{ site.CONFIG_KEY }}
#------------------------------------------------------------------------------
-FLINK_VERSION_STABLE: "0.7.0-incubating" # this variable can point to a SNAPSHOT version in the git source.
-FLINK_VERSION_SHORT: "0.7.0"
-FLINK_VERSION_HADOOP_2_STABLE: 0.7-hadoop2-incubating
+FLINK_VERSION_HADOOP1_STABLE: "0.8.0-hadoop1" # this variable can point to a SNAPSHOT version in the git source.
+FLINK_VERSION_SHORT: "0.8.0"
+FLINK_VERSION_HADOOP2_STABLE: "0.8.0"
FLINK_SCALA_VERSION: "2.10.4"
FLINK_SCALA_VERSION_SHORT: "2.10"
FLINK_ISSUES_URL: https://issues.apache.org/jira/browse/FLINK
@@ -33,8 +33,8 @@ FLINK_GITHUB_URL: https://github.com/apache/incubator-flink
FLINK_WEBSITE_URL: http://flink.incubator.apache.org
FLINK_DOWNLOAD_URL: http://flink.incubator.apache.org/downloads.html
-FLINK_DOWNLOAD_URL_HADOOP_1_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.7.0-incubating/flink-0.7.0-incubating-bin-hadoop1.tgz
-FLINK_DOWNLOAD_URL_HADOOP_2_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.7.0-incubating/flink-0.7.0-incubating-bin-hadoop2.tgz
+FLINK_DOWNLOAD_URL_HADOOP1_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.7.0-incubating/flink-0.7.0-incubating-bin-hadoop1.tgz
+FLINK_DOWNLOAD_URL_HADOOP2_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.7.0-incubating/flink-0.7.0-incubating-bin-hadoop2.tgz
FLINK_DOWNLOAD_URL_YARN_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.7.0-incubating/flink-0.7.0-incubating-bin-hadoop2-yarn.tgz
FLINK_WGET_URL_YARN_STABLE: http://artfiles.org/apache.org/incubator/flink/flink-0.7.0-incubating/flink-0.7.0-incubating-bin-hadoop2-yarn.tgz
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/cli.md
----------------------------------------------------------------------
diff --git a/docs/cli.md b/docs/cli.md
index 7db31a6..ceab6e4 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -46,33 +46,33 @@ The command line can be used to
- Run example program with no arguments.
- ./bin/flink run ./examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-WordCount.jar
+ ./bin/flink run ./examples/flink-java-examples-{{ site.FLINK_VERSION_SHORT }}-WordCount.jar
- Run example program with arguments for input and result files
- ./bin/flink run ./examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-WordCount.jar \
+ ./bin/flink run ./examples/flink-java-examples-{{ site.FLINK_VERSION_SHORT }}-WordCount.jar \
file:///home/user/hamlet.txt file:///home/user/wordcount_out
- Run example program with parallelism 16 and arguments for input and result files
- ./bin/flink run -p 16 ./examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-WordCount.jar \
+ ./bin/flink run -p 16 ./examples/flink-java-examples-{{ site.FLINK_VERSION_SHORT }}-WordCount.jar \
file:///home/user/hamlet.txt file:///home/user/wordcount_out
- Run example program on a specific JobManager:
./bin/flink run -m myJMHost:6123 \
- ./examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-WordCount.jar \
+ ./examples/flink-java-examples-{{ site.FLINK_VERSION_SHORT }}-WordCount.jar \
-file:///home/user/hamlet.txt file:///home/user/wordcount_out
- Display the expected arguments for the WordCount example program:
- ./bin/flink info -d ./examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-WordCount.jar
+ ./bin/flink info -d ./examples/flink-java-examples-{{ site.FLINK_VERSION_SHORT }}-WordCount.jar
- Display the optimized execution plan for the WordCount example program as JSON:
./bin/flink info -e
- ./examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-WordCount.jar \
+ ./examples/flink-java-examples-{{ site.FLINK_VERSION_SHORT }}-WordCount.jar \
file:///home/user/hamlet.txt file:///home/user/wordcount_out
- List scheduled and running jobs (including their JobIDs):
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/cluster_execution.md
----------------------------------------------------------------------
diff --git a/docs/cluster_execution.md b/docs/cluster_execution.md
index c80c384..34879dd 100644
--- a/docs/cluster_execution.md
+++ b/docs/cluster_execution.md
@@ -49,7 +49,7 @@ If you are developing your program as a Maven project, you have to add the
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>{{ site.FLINK_VERSION_STABLE }}</version>
+ <version>{{ site.FLINK_VERSION_SHORT }}</version>
</dependency>
~~~
@@ -95,7 +95,7 @@ If you are developing your program in a Maven project, you have to add the
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>{{ site.FLINK_VERSION_STABLE }}</version>
+ <version>{{ site.FLINK_VERSION_SHORT }}</version>
</dependency>
~~~
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/example_connectors.md
----------------------------------------------------------------------
diff --git a/docs/example_connectors.md b/docs/example_connectors.md
index 69c613d..c65f06f 100644
--- a/docs/example_connectors.md
+++ b/docs/example_connectors.md
@@ -40,7 +40,7 @@ interface. Hadoop ships adapters for FTP, [Hftp](http://hadoop.apache.org/docs/r
Flink has integrated testcases to validate the integration with [Tachyon](http://tachyon-project.org/).
Other file systems we tested the integration is the
-[Google Cloud Storage Connector for Hadoop](https://cloud.google.com/hadoop/google-cloud-storage-connector).
+[Google Cloud Storage Connector for Hadoop](https://cloud.google.com/hadoop/google-cloud-storage-connector) and [XtreemFS](http://www.xtreemfs.org/).
In order to use a Hadoop file system with Flink, make sure that the `flink-conf.yaml` has set the
`fs.hdfs.hadoopconf` property set to the Hadoop configuration directory.
@@ -90,16 +90,16 @@ Execute the following commands:
curl https://raw.githubusercontent.com/apache/incubator-flink/master/flink-quickstart/quickstart.sh | bash
~~~
-3. Set the the version of Flink to `{{site.FLINK_VERSION_HADOOP_2_STABLE}}` in the `pom.xml` file. The quickstart.sh script sets the version to the `hadoop1` version of Flink. Since the `microsoft-hadoop-azure` has been written for Hadoop 2.2 (mapreduce-API) version, we need to use the appropriate Flink version.
+3. Set the the version of Flink to `{{site.FLINK_VERSION_HADOOP2_STABLE}}` in the `pom.xml` file. The quickstart.sh script sets the version to the `hadoop1` version of Flink. Since the `microsoft-hadoop-azure` has been written for Hadoop 2.2 (mapreduce-API) version, we need to use the appropriate Flink version.
- Replace all occurences of `<version>{{site.FLINK_VERSION_STABLE}}</version>` with `<version>{{site.FLINK_VERSION_HADOOP_2_STABLE}}</version>`.
+ Replace all occurences of `<version>{{site.FLINK_VERSION_SHORT}}</version>` with `<version>{{site.FLINK_VERSION_HADOOP2_STABLE}}</version>`.
4. Add the following dependencies (in the `<dependencies>` section) to your `pom.xml` file:
~~~xml
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-hadoop-compatibility</artifactId>
- <version>{{site.FLINK_VERSION_HADOOP_2_STABLE}}</version>
+ <version>{{site.FLINK_VERSION_HADOOP2_STABLE}}</version>
</dependency>
<dependency>
<groupId>com.microsoft.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/hadoop_compatibility.md
----------------------------------------------------------------------
diff --git a/docs/hadoop_compatibility.md b/docs/hadoop_compatibility.md
index ed8eef4..9b43022 100644
--- a/docs/hadoop_compatibility.md
+++ b/docs/hadoop_compatibility.md
@@ -46,7 +46,7 @@ Add the following dependency to your `pom.xml` to use the Hadoop Compatibility L
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-hadoop-compatibility</artifactId>
- <version>{{site.FLINK_VERSION_STABLE}}</version>
+ <version>{{site.FLINK_VERSION_SHORT}}</version>
</dependency>
~~~
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index 275419e..517f9f3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -32,10 +32,10 @@ a thorough introduction of the Flink API please refer to the
## Download
You can download Flink from the [downloads]({{ site.FLINK_DOWNLOAD_URL }}) page
-of the [project website]({{ site.FLINK_WEBSITE_URL }}). This documentation is for version {{ site.FLINK_VERSION_STABLE }}. Be careful
+of the [project website]({{ site.FLINK_WEBSITE_URL }}). This documentation is for version {{ site.FLINK_VERSION_SHORT }}. Be careful
when picking a version, there are different versions depending on the Hadoop and/or
HDFS version that you want to use with Flink. Please refer to [building](building.html) if you
want to build Flink yourself from the source.
-In Version {{ site.FLINK_VERSION_STABLE}} the Scala API uses Scala {{ site.FLINK_SCALA_VERSION_SHORT }}. Please make
+In Version {{ site.FLINK_VERSION_SHORT}} the Scala API uses Scala {{ site.FLINK_SCALA_VERSION_SHORT }}. Please make
sure to use a compatible version.
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/java_api_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/java_api_quickstart.md b/docs/java_api_quickstart.md
index 355c6cc..f84d656 100644
--- a/docs/java_api_quickstart.md
+++ b/docs/java_api_quickstart.md
@@ -49,7 +49,7 @@ Use one of the following commands to __create a project__:
$ mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-java \
- -DarchetypeVersion={{site.FLINK_VERSION_STABLE}}
+ -DarchetypeVersion={{site.FLINK_VERSION_SHORT}}
{% endhighlight %}
This allows you to <strong>name your newly created project</strong>. It will interactively ask you for the groupId, artifactId, and package name.
</div>
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/local_execution.md
----------------------------------------------------------------------
diff --git a/docs/local_execution.md b/docs/local_execution.md
index d6e3a91..bac1745 100644
--- a/docs/local_execution.md
+++ b/docs/local_execution.md
@@ -45,7 +45,7 @@ If you are developing your program in a Maven project, you have to add the `flin
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>{{site.FLINK_VERSION_STABLE}}</version>
+ <version>{{site.FLINK_VERSION_SHORT}}</version>
</dependency>
~~~
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/programming_guide.md
----------------------------------------------------------------------
diff --git a/docs/programming_guide.md b/docs/programming_guide.md
index e7ac064..e4d0eb3 100644
--- a/docs/programming_guide.md
+++ b/docs/programming_guide.md
@@ -130,7 +130,7 @@ manually create the project, you can use the archetype and create a project by c
mvn archetype:generate /
-DarchetypeGroupId=org.apache.flink/
-DarchetypeArtifactId=flink-quickstart-java /
- -DarchetypeVersion={{site.FLINK_VERSION_STABLE }}
+ -DarchetypeVersion={{site.FLINK_VERSION_SHORT }}
{% endhighlight %}
</div>
<div data-lang="scala" markdown="1">
@@ -138,7 +138,7 @@ mvn archetype:generate /
mvn archetype:generate /
-DarchetypeGroupId=org.apache.flink/
-DarchetypeArtifactId=flink-quickstart-scala /
- -DarchetypeVersion={{site.FLINK_VERSION_STABLE }}
+ -DarchetypeVersion={{site.FLINK_VERSION_SHORT }}
{% endhighlight %}
</div>
</div>
@@ -152,12 +152,12 @@ If you want to add Flink to an existing Maven project, add the following entry t
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
- <version>{{site.FLINK_VERSION_STABLE }}</version>
+ <version>{{site.FLINK_VERSION_SHORT }}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>{{site.FLINK_VERSION_STABLE }}</version>
+ <version>{{site.FLINK_VERSION_SHORT }}</version>
</dependency>
{% endhighlight %}
</div>
@@ -166,12 +166,12 @@ If you want to add Flink to an existing Maven project, add the following entry t
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala</artifactId>
- <version>{{site.FLINK_VERSION_STABLE }}</version>
+ <version>{{site.FLINK_VERSION_SHORT }}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>{{site.FLINK_VERSION_STABLE }}</version>
+ <version>{{site.FLINK_VERSION_SHORT }}</version>
</dependency>
{% endhighlight %}
</div>
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/scala_api_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/scala_api_quickstart.md b/docs/scala_api_quickstart.md
index 8e20471..db315e5 100644
--- a/docs/scala_api_quickstart.md
+++ b/docs/scala_api_quickstart.md
@@ -49,7 +49,7 @@ $ curl https://raw.githubusercontent.com/apache/incubator-flink/master/flink-qui
$ mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-scala \
- -DarchetypeVersion={{site.FLINK_VERSION_STABLE}}
+ -DarchetypeVersion={{site.FLINK_VERSION_SHORT}}
{% endhighlight %}
This allows you to <strong>name your newly created project</strong>. It will interactively ask you for the groupId, artifactId, and package name.
</div>
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/setup_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/setup_quickstart.md b/docs/setup_quickstart.md
index e9d2b8b..d987813 100644
--- a/docs/setup_quickstart.md
+++ b/docs/setup_quickstart.md
@@ -38,10 +38,10 @@ Download the ready to run binary package. Choose the Flink distribution that __m
<p>
<div class="tab-content text-center">
<div class="tab-pane active" id="bin-hadoop1">
- <a class="btn btn-info btn-lg" onclick="_gaq.push(['_trackEvent','Action','download-quickstart-setup-1',this.href]);" href="{{site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE}}"><i class="icon-download"> </i> Download Flink for Hadoop 1.2</a>
+ <a class="btn btn-info btn-lg" onclick="_gaq.push(['_trackEvent','Action','download-quickstart-setup-1',this.href]);" href="{{site.FLINK_DOWNLOAD_URL_HADOOP1_STABLE}}"><i class="icon-download"> </i> Download Flink for Hadoop 1.2</a>
</div>
<div class="tab-pane" id="bin-hadoop2">
- <a class="btn btn-info btn-lg" onclick="_gaq.push(['_trackEvent','Action','download-quickstart-setup-2',this.href]);" href="{{site.FLINK_DOWNLOAD_URL_HADOOP_2_STABLE}}"><i class="icon-download"> </i> Download Flink for Hadoop 2</a>
+ <a class="btn btn-info btn-lg" onclick="_gaq.push(['_trackEvent','Action','download-quickstart-setup-2',this.href]);" href="{{site.FLINK_DOWNLOAD_URL_HADOOP2_STABLE}}"><i class="icon-download"> </i> Download Flink for Hadoop 2</a>
</div>
</div>
</p>
@@ -57,7 +57,7 @@ Download the ready to run binary package. Choose the Flink distribution that __m
~~~bash
$ cd ~/Downloads # Go to download directory
$ tar xzf flink-*.tgz # Unpack the downloaded archive
-$ cd flink-{{site.FLINK_VERSION_STABLE}}
+$ cd flink-{{site.FLINK_VERSION_SHORT}}
$ bin/start-local.sh # Start Flink
~~~
@@ -78,7 +78,7 @@ Run the __Word Count example__ to see Flink at work.
* __Start the example program__:
~~~bash
- $ bin/flink run ./examples/flink-java-examples-{{site.FLINK_VERSION_STABLE}}-WordCount.jar file://`pwd`/hamlet.txt file://`pwd`/wordcount-result.txt
+ $ bin/flink run ./examples/flink-java-examples-{{site.FLINK_VERSION_SHORT}}-WordCount.jar file://`pwd`/hamlet.txt file://`pwd`/wordcount-result.txt
~~~
* You will find a file called __wordcount-result.txt__ in your current directory.
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/spargel_guide.md
----------------------------------------------------------------------
diff --git a/docs/spargel_guide.md b/docs/spargel_guide.md
index 0520ba5..da362b1 100644
--- a/docs/spargel_guide.md
+++ b/docs/spargel_guide.md
@@ -43,7 +43,7 @@ Add the following dependency to your `pom.xml` to use the Spargel.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-spargel</artifactId>
- <version>{{site.FLINK_VERSION_STABLE}}</version>
+ <version>{{site.FLINK_VERSION_SHORT}}</version>
</dependency>
~~~
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/streaming_guide.md
----------------------------------------------------------------------
diff --git a/docs/streaming_guide.md b/docs/streaming_guide.md
index 1b0a1e9..d2d54c3 100644
--- a/docs/streaming_guide.md
+++ b/docs/streaming_guide.md
@@ -42,7 +42,7 @@ Add the following dependency to your `pom.xml` to use the Flink Streaming.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-core</artifactId>
- <version>{{site.FLINK_VERSION_STABLE}}</version>
+ <version>{{site.FLINK_VERSION_SHORT}}</version>
</dependency>
~~~
http://git-wip-us.apache.org/repos/asf/flink/blob/839fd030/docs/yarn_setup.md
----------------------------------------------------------------------
diff --git a/docs/yarn_setup.md b/docs/yarn_setup.md
index 5f51340..3374500 100644
--- a/docs/yarn_setup.md
+++ b/docs/yarn_setup.md
@@ -29,8 +29,8 @@ Start YARN session with 4 Task Managers (each with 4 GB of Heapspace):
~~~bash
wget {{ site.FLINK_WGET_URL_YARN_STABLE }}
-tar xvzf flink-{{ site.FLINK_VERSION_STABLE }}-bin-hadoop2-yarn.tgz
-cd flink-yarn-{{ site.FLINK_VERSION_STABLE }}/
+tar xvzf flink-{{ site.FLINK_VERSION_SHORT }}-bin-hadoop2-yarn.tgz
+cd flink-yarn-{{ site.FLINK_VERSION_SHORT }}/
./bin/yarn-session.sh -n 4 -jm 1024 -tm 4096
~~~
@@ -60,11 +60,11 @@ Download the YARN tgz package on the [download page]({{site.baseurl}}/downloads.
Extract the package using:
~~~bash
-tar xvzf flink-{{ site.FLINK_VERSION_STABLE }}-bin-hadoop2-yarn.tgz
-cd flink-yarn-{{site.FLINK_VERSION_STABLE }}/
+tar xvzf flink-{{ site.FLINK_VERSION_SHORT }}-bin-hadoop2-yarn.tgz
+cd flink-yarn-{{site.FLINK_VERSION_SHORT }}/
~~~
-If you want to build the YARN .tgz file from sources, follow the [build instructions](building.html). Make sure to use the `-Dhadoop.profile=2` profile. You can find the result of the build in `flink-dist/target/flink-{{ site.FLINK_VERSION_STABLE }}-bin/flink-yarn-{{ site.FLINK_VERSION_STABLE }}/` (*Note: The version might be different for you* ).
+If you want to build the YARN .tgz file from sources, follow the [build instructions](building.html). You can find the result of the build in `flink-dist/target/flink-{{ site.FLINK_VERSION_SHORT }}-bin/flink-yarn-{{ site.FLINK_VERSION_SHORT }}/` (*Note: The version might be different for you* ).
#### Start a Session
@@ -157,14 +157,14 @@ Use the *run* action to submit a job to YARN. The client is able to determine th
~~~bash
wget -O apache-license-v2.txt http://www.apache.org/licenses/LICENSE-2.0.txt
-./bin/flink run -j ./examples/flink-java-examples-{{site.FLINK_VERSION_STABLE }}-WordCount.jar \
+./bin/flink run -j ./examples/flink-java-examples-{{site.FLINK_VERSION_SHORT }}-WordCount.jar \
-a 1 file://`pwd`/apache-license-v2.txt file://`pwd`/wordcount-result.txt
~~~
If there is the following error, make sure that all TaskManagers started:
~~~bash
-Exception in thread "main" org.apache.flinkcompiler.CompilerException:
+Exception in thread "main" org.apache.flink.compiler.CompilerException:
Available instances could not be determined from job manager: Connection timed out.
~~~
[15/17] flink git commit: [FLINK-1229][FLINK-1206] [web frontend]
Synchronize webclient arguments with command line and add default
parallelism.
Posted by se...@apache.org.
[FLINK-1229][FLINK-1206] [web frontend] Synchronize webclient arguments with command line and add default parallelism.
This closes #291
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d3072ba5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d3072ba5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d3072ba5
Branch: refs/heads/master
Commit: d3072ba57877a95001d6c210ec0f156b478619fb
Parents: 9cd96df
Author: mingliang <qm...@gmail.com>
Authored: Wed Jan 7 19:49:32 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:58:21 2015 -0800
----------------------------------------------------------------------
.../flink/client/web/JobSubmissionServlet.java | 23 +++++++++++++++-----
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d3072ba5/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
index 84cb011..7eddb61 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
@@ -146,10 +146,21 @@ public class JobSubmissionServlet extends HttpServlet {
}
String assemblerClass = null;
- if (params.size() >= 2 && params.get(0).equals("assembler")) {
- assemblerClass = params.get(1);
- params.remove(0);
- params.remove(0);
+ int parallelism = -1;
+ while(params.size() >= 2) {
+ if (params.get(0).equals("-c")) {
+ assemblerClass = params.get(1);
+ params.remove(0);
+ params.remove(0);
+ }
+ else if (params.get(0).equals("-p")) {
+ parallelism = Integer.parseInt(params.get(1));
+ params.remove(0);
+ params.remove(0);
+ }
+ else {
+ break;
+ }
}
// create the plan
@@ -167,7 +178,7 @@ public class JobSubmissionServlet extends HttpServlet {
client = new Client(nepheleConfig, program.getUserCodeClassLoader());
- optPlan = client.getOptimizedPlan(program, -1);
+ optPlan = client.getOptimizedPlan(program, parallelism);
if (optPlan == null) {
throw new Exception("The optimized plan could not be produced.");
@@ -272,7 +283,7 @@ public class JobSubmissionServlet extends HttpServlet {
// don't show any plan. directly submit the job and redirect to the
// nephele runtime monitor
try {
- client.run(program, -1, false);
+ client.run(program, parallelism, false);
} catch (Exception ex) {
LOG.error("Error submitting job to the job-manager.", ex);
// HACK: Is necessary because Message contains whole stack trace
[13/17] flink git commit: [build tools] Release script update
Posted by se...@apache.org.
[build tools] Release script update
Default hadoop version is now hadoop2
Generate specific pom avoids version collisions with dependencies
Updated poms for new release scripts
Conflicts:
flink-addons/flink-avro/pom.xml
flink-addons/flink-hadoop-compatibility/pom.xml
flink-addons/flink-hbase/pom.xml
flink-addons/flink-jdbc/pom.xml
flink-addons/flink-spargel/pom.xml
flink-addons/flink-tachyon/pom.xml
flink-quickstart/flink-quickstart-java/pom.xml
flink-quickstart/flink-quickstart-scala/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d14f3834
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d14f3834
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d14f3834
Branch: refs/heads/master
Commit: d14f3834373345fd058dee800cff7665d956d25e
Parents: 3836c96
Author: mbalassi <mb...@apache.org>
Authored: Thu Dec 18 19:00:33 2014 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:58:20 2015 -0800
----------------------------------------------------------------------
flink-addons/flink-avro/pom.xml | 2 +-
flink-addons/flink-hadoop-compatibility/pom.xml | 2 +-
flink-addons/flink-hbase/pom.xml | 2 +-
flink-addons/flink-jdbc/pom.xml | 2 +-
flink-addons/flink-spargel/pom.xml | 2 +-
flink-addons/flink-tachyon/pom.xml | 2 +-
flink-quickstart/flink-quickstart-java/pom.xml | 28 ++++++++++----------
flink-quickstart/flink-quickstart-scala/pom.xml | 26 +++++++++---------
tools/create_release_files.sh | 22 +++++++--------
tools/generate_specific_pom.sh | 20 ++++++++++----
10 files changed, 59 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-addons/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml
index 5feb966..8115f9d 100644
--- a/flink-addons/flink-avro/pom.xml
+++ b/flink-addons/flink-avro/pom.xml
@@ -24,8 +24,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-addons</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-addons/flink-hadoop-compatibility/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hadoop-compatibility/pom.xml b/flink-addons/flink-hadoop-compatibility/pom.xml
index 1587fcc..59f541c 100644
--- a/flink-addons/flink-hadoop-compatibility/pom.xml
+++ b/flink-addons/flink-hadoop-compatibility/pom.xml
@@ -23,8 +23,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-addons</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-addons/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hbase/pom.xml b/flink-addons/flink-hbase/pom.xml
index c1d55a6..6807b0c 100644
--- a/flink-addons/flink-hbase/pom.xml
+++ b/flink-addons/flink-hbase/pom.xml
@@ -23,8 +23,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-addons</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-addons/flink-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/pom.xml b/flink-addons/flink-jdbc/pom.xml
index 2939b20..ec172a9 100644
--- a/flink-addons/flink-jdbc/pom.xml
+++ b/flink-addons/flink-jdbc/pom.xml
@@ -24,8 +24,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-addons</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-addons/flink-spargel/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-spargel/pom.xml b/flink-addons/flink-spargel/pom.xml
index 4aa48a6..863e66e 100644
--- a/flink-addons/flink-spargel/pom.xml
+++ b/flink-addons/flink-spargel/pom.xml
@@ -23,8 +23,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-addons</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-addons/flink-tachyon/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/pom.xml b/flink-addons/flink-tachyon/pom.xml
index 887fa4b..82eaa1d 100644
--- a/flink-addons/flink-tachyon/pom.xml
+++ b/flink-addons/flink-tachyon/pom.xml
@@ -21,8 +21,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-addons</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-quickstart/flink-quickstart-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/pom.xml b/flink-quickstart/flink-quickstart-java/pom.xml
index 452a352..df87f34 100644
--- a/flink-quickstart/flink-quickstart-java/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/pom.xml
@@ -17,21 +17,21 @@ specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <parent>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-quickstart</artifactId>
- <version>0.9-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-quickstart</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
- <artifactId>flink-quickstart-java</artifactId>
- <packaging>maven-archetype</packaging>
+ <artifactId>flink-quickstart-java</artifactId>
+ <packaging>maven-archetype</packaging>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/flink-quickstart/flink-quickstart-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/pom.xml b/flink-quickstart/flink-quickstart-scala/pom.xml
index b84c517..b4dd1b0 100644
--- a/flink-quickstart/flink-quickstart-scala/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/pom.xml
@@ -17,21 +17,21 @@ specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <parent>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-quickstart</artifactId>
- <version>0.9-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-quickstart</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
- <artifactId>flink-quickstart-scala</artifactId>
- <packaging>maven-archetype</packaging>
+ <artifactId>flink-quickstart-scala</artifactId>
+ <packaging>maven-archetype</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index 8e6d1ad..7f6461e 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -40,22 +40,22 @@ GIT_BRANCH=${GIT_BRANCH:-branch-1.0}
OLD_VERSION=${OLD_VERSION:-0.6-incubating-SNAPSHOT}
RELEASE_VERSION=${NEW_VERSION}
RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-rc1}
-NEW_VERSION_HADOOP2=${NEW_VERSION_HADOOP2:-"$RELEASE_VERSION-hadoop2"} # this is wrong, i.e. we need 0.7-hadoop2-incubating
+NEW_VERSION_HADOOP1=${NEW_VERSION_HADOOP1:-"$RELEASE_VERSION-hadoop1"}
USER_NAME=${USER_NAME:-pwendell}
MVN=${MVN:-mvn}
GPG=${GPG:-gpg}
SHASUM=${SHASUM:-sha512sum}
MD5SUM=${MD5SUM:-md5sum}
-sonatype_user=${sonatype_user:-rmetzger}
+sonatype_user=${sonatype_user:-rmetzger} #legacy variable name referring to maven
sonatype_pw=${sonatype_pw:-XXX}
-#echo $NEW_VERSION_HADOOP2
+#echo $NEW_VERSION_HADOOP1
#sleep 5
#set -e
# create source package
-git clone https://github.com/apache/incubator-flink.git flink
+git clone https://github.com/apache/flink.git flink
cd flink
git checkout -b "$RELEASE_BRANCH-$RELEASE_CANDIDATE" origin/$RELEASE_BRANCH
rm .gitignore
@@ -70,7 +70,7 @@ find . -name 'pom.xml' -type f -exec sed -i 's#<version>'$OLD_VERSION'</version>
git commit --author="Robert Metzger <rm...@apache.org>" -am "Commit for release $RELEASE_VERSION"
# sry for hardcoding my name, but this makes releasing even faster
-git remote add asf_push https://rmetzger@git-wip-us.apache.org/repos/asf/incubator-flink.git
+git remote add asf_push https://$USER_NAME@git-wip-us.apache.org/repos/asf/flink.git
RELEASE_HASH=`git rev-parse HEAD`
echo "Echo created release hash $RELEASE_HASH"
@@ -123,16 +123,16 @@ make_binary_release() {
fi
}
-make_binary_release "hadoop1" ""
-make_binary_release "hadoop200alpha" "-P!include-yarn -Dhadoop.profile=2 -Dhadoop.version=2.0.0-alpha"
-make_binary_release "hadoop2" "-Dhadoop.profile=2"
+make_binary_release "hadoop1" "-Dhadoop.profile=1"
+make_binary_release "hadoop200alpha" "-P!include-yarn -Dhadoop.version=2.0.0-alpha"
+make_binary_release "hadoop2" ""
# make_binary_release "mapr4" "-Dhadoop.profile=2 -Pvendor-repos -Dhadoop.version=2.3.0-mapr-4.0.0-FCS"
# Copy data
echo "Copying release tarballs"
folder=flink-$RELEASE_VERSION-$RELEASE_CANDIDATE
-ssh $USER_NAME@people.apache.org mkdir /home/$USER_NAME/public_html/$folder
+ssh $USER_NAME@people.apache.org mkdir -p /home/$USER_NAME/public_html/$folder
scp flink-* $USER_NAME@people.apache.org:/home/$USER_NAME/public_html/$folder/
echo "copy done"
@@ -140,9 +140,9 @@ echo "Deploying to repository.apache.org"
cd flink
cp ../../deploysettings.xml .
-echo "For your reference, the command:\n\t $MVN clean deploy -Prelease --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE ./tools/generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP2 pom.xml"
+echo "For your reference, the command:\n\t $MVN clean deploy -Prelease --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE ./tools/generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP1 pom.xml"
$MVN clean deploy -Prelease,docs-and-source --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
-./tools/generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP2 pom.xml
+./tools/generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP1 pom.xml
sleep 4
$MVN clean deploy -Dgpg.executable=$GPG -Prelease,docs-and-source --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
http://git-wip-us.apache.org/repos/asf/flink/blob/d14f3834/tools/generate_specific_pom.sh
----------------------------------------------------------------------
diff --git a/tools/generate_specific_pom.sh b/tools/generate_specific_pom.sh
index e180ff8..7c84a42 100755
--- a/tools/generate_specific_pom.sh
+++ b/tools/generate_specific_pom.sh
@@ -81,7 +81,8 @@ echo "Using $nupom as name for the generated pom file."
poms=`find $flink_home -name pom.xml`
for p in $poms; do
# write into tmp file because in-place replacement is not possible (if nupom="pom.xml")
- tmp_nuname="`dirname $p`/__generate_specific_pom_tmp"
+ tmp_nuname1="`dirname $p`/__generate_specific_pom_tmp1"
+ tmp_nuname2="`dirname $p`/__generate_specific_pom_tmp2"
nuname="`dirname $p`/${nupom}"
# Now we do search and replace of explicit strings. The best way of
# seeing what the below does is by doing a diff between the original
@@ -92,12 +93,21 @@ for p in $poms; do
# enable/disable hadoop 1 and hadoop 2 profiles as appropriate
# removing a comment string too. We output the new pom beside the
# original.
- sed -e "s/${old_version}/${new_version}/" \
- -e "s/\(<module>[^<]*\)/\1\/${nupom}/" \
+
+ # To avoid accidentally replace version numbers in our dependencies
+ # sharing the version number with the current release use the following.
+
+ perl -0777 -pe "s:<groupId>org.apache.flink</groupId>\n(\t*<artifactId>([a-z]+-)+[a-z]+</artifactId>\n\t*)<version>${old_version}</version>:<groupId>org.apache.flink</groupId>\n\1<version>${new_version}</version>:" $p > "$tmp_nuname1"
+
+ # Alternatively when no version collisions are present this is enough:
+ # sed -e "s/${old_version}/${new_version}/" $p > "$tmp_nuname1"
+
+ sed -e "s/\(<module>[^<]*\)/\1\/${nupom}/" \
-e "s/\(relativePath>\.\.\)/\1\/${nupom}/" \
-e "s/<!--hadoop1-->.*name>.*/${hadoop1}/" \
-e "s/<!--hadoop2-->.*name>.*/${hadoop2}/" \
- $p > "$tmp_nuname"
- mv $tmp_nuname $nuname
+ $tmp_nuname1 > "$tmp_nuname2"
+ rm $tmp_nuname1
+ mv $tmp_nuname2 $nuname
done
[06/17] flink git commit: [FLINK-1384] [webfrontend] Remove unused JS
libraries
Posted by se...@apache.org.
[FLINK-1384] [webfrontend] Remove unused JS libraries
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f38e2039
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f38e2039
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f38e2039
Branch: refs/heads/master
Commit: f38e2039969f613c18edda2528e4e7b5018d46ad
Parents: c954c4d
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Jan 10 18:18:48 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:30 2015 -0800
----------------------------------------------------------------------
.../js/flot/chart-data-flot.js | 237 ------
.../web-docs-infoserver/js/flot/excanvas.min.js | 1 -
.../js/flot/jquery.flot.pie.js | 750 -------------------
3 files changed, 988 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f38e2039/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/chart-data-flot.js
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/chart-data-flot.js b/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/chart-data-flot.js
deleted file mode 100755
index 330e9e2..0000000
--- a/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/chart-data-flot.js
+++ /dev/null
@@ -1,237 +0,0 @@
-//Flot Line Chart with Tooltips
-$(document).ready(function(){
- console.log("document ready");
- var offset = 0;
- plot();
- function plot(){
- var sin = [], cos = [];
- for (var i = 0; i < 12; i += 0.2) {
- sin.push([i, Math.sin(i + offset)]);
- cos.push([i, Math.cos(i + offset)]);
- }
-
- var options = {
- series: {
- lines: { show: true },
- points: { show: true }
- },
- grid: {
- hoverable: true //IMPORTANT! this is needed for tooltip to work
- },
- yaxis: { min: -1.2, max: 1.2 },
- tooltip: true,
- tooltipOpts: {
- content: "'%s' of %x.1 is %y.4",
- shifts: {
- x: -60,
- y: 25
- }
- }
- };
-
- var plotObj = $.plot( $("#flot-chart-line"),
- [ { data: sin, label: "sin(x)"}, { data: cos, label: "cos(x)" } ],
- options );
- }
-});
-
-//Flot Pie Chart with Tooltips
-$(function () {
-
- var data = [
- { label: "Series 0", data: 1 },
- { label: "Series 1", data: 3 },
- { label: "Series 2", data: 9 },
- { label: "Series 3", data: 20 }
- ];
-
- var plotObj = $.plot($("#flot-chart-pie"), data, {
- series: {
- pie: {
- show: true
- }
- },
- grid: {
- hoverable: true
- },
- tooltip: true,
- tooltipOpts: {
- content: "%p.0%, %s", // show percentages, rounding to 2 decimal places
- shifts: {
- x: 20,
- y: 0
- },
- defaultTheme: false
- }
- });
-
-});
-
-//Flot Line Charts - Multiple Axes - With Data
-$(function () {
- var oilprices = [[1167692400000,61.05], [1167778800000,58.32], [1167865200000,57.35], [1167951600000,56.31], [1168210800000,55.55], [1168297200000,55.64], [1168383600000,54.02], [1168470000000,51.88], [1168556400000,52.99], [1168815600000,52.99], [1168902000000,51.21], [1168988400000,52.24], [1169074800000,50.48], [1169161200000,51.99], [1169420400000,51.13], [1169506800000,55.04], [1169593200000,55.37], [1169679600000,54.23], [1169766000000,55.42], [1170025200000,54.01], [1170111600000,56.97], [1170198000000,58.14], [1170284400000,58.14], [1170370800000,59.02], [1170630000000,58.74], [1170716400000,58.88], [1170802800000,57.71], [1170889200000,59.71], [1170975600000,59.89], [1171234800000,57.81], [1171321200000,59.06], [1171407600000,58.00], [1171494000000,57.99], [1171580400000,59.39], [1171839600000,59.39], [1171926000000,58.07], [1172012400000,60.07], [1172098800000,61.14], [1172444400000,61.39], [1172530800000,61.46], [1172617200000,61.79], [1172703600000,62.00], [117279000
0000,60.07], [1173135600000,60.69], [1173222000000,61.82], [1173308400000,60.05], [1173654000000,58.91], [1173740400000,57.93], [1173826800000,58.16], [1173913200000,57.55], [1173999600000,57.11], [1174258800000,56.59], [1174345200000,59.61], [1174518000000,61.69], [1174604400000,62.28], [1174860000000,62.91], [1174946400000,62.93], [1175032800000,64.03], [1175119200000,66.03], [1175205600000,65.87], [1175464800000,64.64], [1175637600000,64.38], [1175724000000,64.28], [1175810400000,64.28], [1176069600000,61.51], [1176156000000,61.89], [1176242400000,62.01], [1176328800000,63.85], [1176415200000,63.63], [1176674400000,63.61], [1176760800000,63.10], [1176847200000,63.13], [1176933600000,61.83], [1177020000000,63.38], [1177279200000,64.58], [1177452000000,65.84], [1177538400000,65.06], [1177624800000,66.46], [1177884000000,64.40], [1178056800000,63.68], [1178143200000,63.19], [1178229600000,61.93], [1178488800000,61.47], [1178575200000,61.55], [1178748000000,61.81], [1178834400000,62.
37], [1179093600000,62.46], [1179180000000,63.17], [1179266400000,62.55], [1179352800000,64.94], [1179698400000,66.27], [1179784800000,65.50], [1179871200000,65.77], [1179957600000,64.18], [1180044000000,65.20], [1180389600000,63.15], [1180476000000,63.49], [1180562400000,65.08], [1180908000000,66.30], [1180994400000,65.96], [1181167200000,66.93], [1181253600000,65.98], [1181599200000,65.35], [1181685600000,66.26], [1181858400000,68.00], [1182117600000,69.09], [1182204000000,69.10], [1182290400000,68.19], [1182376800000,68.19], [1182463200000,69.14], [1182722400000,68.19], [1182808800000,67.77], [1182895200000,68.97], [1182981600000,69.57], [1183068000000,70.68], [1183327200000,71.09], [1183413600000,70.92], [1183586400000,71.81], [1183672800000,72.81], [1183932000000,72.19], [1184018400000,72.56], [1184191200000,72.50], [1184277600000,74.15], [1184623200000,75.05], [1184796000000,75.92], [1184882400000,75.57], [1185141600000,74.89], [1185228000000,73.56], [1185314400000,75.57], [11
85400800000,74.95], [1185487200000,76.83], [1185832800000,78.21], [1185919200000,76.53], [1186005600000,76.86], [1186092000000,76.00], [1186437600000,71.59], [1186696800000,71.47], [1186956000000,71.62], [1187042400000,71.00], [1187301600000,71.98], [1187560800000,71.12], [1187647200000,69.47], [1187733600000,69.26], [1187820000000,69.83], [1187906400000,71.09], [1188165600000,71.73], [1188338400000,73.36], [1188511200000,74.04], [1188856800000,76.30], [1189116000000,77.49], [1189461600000,78.23], [1189548000000,79.91], [1189634400000,80.09], [1189720800000,79.10], [1189980000000,80.57], [1190066400000,81.93], [1190239200000,83.32], [1190325600000,81.62], [1190584800000,80.95], [1190671200000,79.53], [1190757600000,80.30], [1190844000000,82.88], [1190930400000,81.66], [1191189600000,80.24], [1191276000000,80.05], [1191362400000,79.94], [1191448800000,81.44], [1191535200000,81.22], [1191794400000,79.02], [1191880800000,80.26], [1191967200000,80.30], [1192053600000,83.08], [1192140000
000,83.69], [1192399200000,86.13], [1192485600000,87.61], [1192572000000,87.40], [1192658400000,89.47], [1192744800000,88.60], [1193004000000,87.56], [1193090400000,87.56], [1193176800000,87.10], [1193263200000,91.86], [1193612400000,93.53], [1193698800000,94.53], [1193871600000,95.93], [1194217200000,93.98], [1194303600000,96.37], [1194476400000,95.46], [1194562800000,96.32], [1195081200000,93.43], [1195167600000,95.10], [1195426800000,94.64], [1195513200000,95.10], [1196031600000,97.70], [1196118000000,94.42], [1196204400000,90.62], [1196290800000,91.01], [1196377200000,88.71], [1196636400000,88.32], [1196809200000,90.23], [1196982000000,88.28], [1197241200000,87.86], [1197327600000,90.02], [1197414000000,92.25], [1197586800000,90.63], [1197846000000,90.63], [1197932400000,90.49], [1198018800000,91.24], [1198105200000,91.06], [1198191600000,90.49], [1198710000000,96.62], [1198796400000,96.00], [1199142000000,99.62], [1199314800000,99.18], [1199401200000,95.09], [1199660400000,96.3
3], [1199833200000,95.67], [1200351600000,91.90], [1200438000000,90.84], [1200524400000,90.13], [1200610800000,90.57], [1200956400000,89.21], [1201042800000,86.99], [1201129200000,89.85], [1201474800000,90.99], [1201561200000,91.64], [1201647600000,92.33], [1201734000000,91.75], [1202079600000,90.02], [1202166000000,88.41], [1202252400000,87.14], [1202338800000,88.11], [1202425200000,91.77], [1202770800000,92.78], [1202857200000,93.27], [1202943600000,95.46], [1203030000000,95.46], [1203289200000,101.74], [1203462000000,98.81], [1203894000000,100.88], [1204066800000,99.64], [1204153200000,102.59], [1204239600000,101.84], [1204498800000,99.52], [1204585200000,99.52], [1204671600000,104.52], [1204758000000,105.47], [1204844400000,105.15], [1205103600000,108.75], [1205276400000,109.92], [1205362800000,110.33], [1205449200000,110.21], [1205708400000,105.68], [1205967600000,101.84], [1206313200000,100.86], [1206399600000,101.22], [1206486000000,105.90], [1206572400000,107.58], [120665880
0000,105.62], [1206914400000,101.58], [1207000800000,100.98], [1207173600000,103.83], [1207260000000,106.23], [1207605600000,108.50], [1207778400000,110.11], [1207864800000,110.14], [1208210400000,113.79], [1208296800000,114.93], [1208383200000,114.86], [1208728800000,117.48], [1208815200000,118.30], [1208988000000,116.06], [1209074400000,118.52], [1209333600000,118.75], [1209420000000,113.46], [1209592800000,112.52], [1210024800000,121.84], [1210111200000,123.53], [1210197600000,123.69], [1210543200000,124.23], [1210629600000,125.80], [1210716000000,126.29], [1211148000000,127.05], [1211320800000,129.07], [1211493600000,132.19], [1211839200000,128.85], [1212357600000,127.76], [1212703200000,138.54], [1212962400000,136.80], [1213135200000,136.38], [1213308000000,134.86], [1213653600000,134.01], [1213740000000,136.68], [1213912800000,135.65], [1214172000000,134.62], [1214258400000,134.62], [1214344800000,134.62], [1214431200000,139.64], [1214517600000,140.21], [1214776800000,140.00],
[1214863200000,140.97], [1214949600000,143.57], [1215036000000,145.29], [1215381600000,141.37], [1215468000000,136.04], [1215727200000,146.40], [1215986400000,145.18], [1216072800000,138.74], [1216159200000,134.60], [1216245600000,129.29], [1216332000000,130.65], [1216677600000,127.95], [1216850400000,127.95], [1217282400000,122.19], [1217455200000,124.08], [1217541600000,125.10], [1217800800000,121.41], [1217887200000,119.17], [1217973600000,118.58], [1218060000000,120.02], [1218405600000,114.45], [1218492000000,113.01], [1218578400000,116.00], [1218751200000,113.77], [1219010400000,112.87], [1219096800000,114.53], [1219269600000,114.98], [1219356000000,114.98], [1219701600000,116.27], [1219788000000,118.15], [1219874400000,115.59], [1219960800000,115.46], [1220306400000,109.71], [1220392800000,109.35], [1220565600000,106.23], [1220824800000,106.34]];
- var exchangerates = [[1167606000000,0.7580], [1167692400000,0.7580], [1167778800000,0.75470], [1167865200000,0.75490], [1167951600000,0.76130], [1168038000000,0.76550], [1168124400000,0.76930], [1168210800000,0.76940], [1168297200000,0.76880], [1168383600000,0.76780], [1168470000000,0.77080], [1168556400000,0.77270], [1168642800000,0.77490], [1168729200000,0.77410], [1168815600000,0.77410], [1168902000000,0.77320], [1168988400000,0.77270], [1169074800000,0.77370], [1169161200000,0.77240], [1169247600000,0.77120], [1169334000000,0.7720], [1169420400000,0.77210], [1169506800000,0.77170], [1169593200000,0.77040], [1169679600000,0.7690], [1169766000000,0.77110], [1169852400000,0.7740], [1169938800000,0.77450], [1170025200000,0.77450], [1170111600000,0.7740], [1170198000000,0.77160], [1170284400000,0.77130], [1170370800000,0.76780], [1170457200000,0.76880], [1170543600000,0.77180], [1170630000000,0.77180], [1170716400000,0.77280], [1170802800000,0.77290], [1170889200000,0.76980], [11
70975600000,0.76850], [1171062000000,0.76810], [1171148400000,0.7690], [1171234800000,0.7690], [1171321200000,0.76980], [1171407600000,0.76990], [1171494000000,0.76510], [1171580400000,0.76130], [1171666800000,0.76160], [1171753200000,0.76140], [1171839600000,0.76140], [1171926000000,0.76070], [1172012400000,0.76020], [1172098800000,0.76110], [1172185200000,0.76220], [1172271600000,0.76150], [1172358000000,0.75980], [1172444400000,0.75980], [1172530800000,0.75920], [1172617200000,0.75730], [1172703600000,0.75660], [1172790000000,0.75670], [1172876400000,0.75910], [1172962800000,0.75820], [1173049200000,0.75850], [1173135600000,0.76130], [1173222000000,0.76310], [1173308400000,0.76150], [1173394800000,0.760], [1173481200000,0.76130], [1173567600000,0.76270], [1173654000000,0.76270], [1173740400000,0.76080], [1173826800000,0.75830], [1173913200000,0.75750], [1173999600000,0.75620], [1174086000000,0.7520], [1174172400000,0.75120], [1174258800000,0.75120], [1174345200000,0.75170], [1174
431600000,0.7520], [1174518000000,0.75110], [1174604400000,0.7480], [1174690800000,0.75090], [1174777200000,0.75310], [1174860000000,0.75310], [1174946400000,0.75270], [1175032800000,0.74980], [1175119200000,0.74930], [1175205600000,0.75040], [1175292000000,0.750], [1175378400000,0.74910], [1175464800000,0.74910], [1175551200000,0.74850], [1175637600000,0.74840], [1175724000000,0.74920], [1175810400000,0.74710], [1175896800000,0.74590], [1175983200000,0.74770], [1176069600000,0.74770], [1176156000000,0.74830], [1176242400000,0.74580], [1176328800000,0.74480], [1176415200000,0.7430], [1176501600000,0.73990], [1176588000000,0.73950], [1176674400000,0.73950], [1176760800000,0.73780], [1176847200000,0.73820], [1176933600000,0.73620], [1177020000000,0.73550], [1177106400000,0.73480], [1177192800000,0.73610], [1177279200000,0.73610], [1177365600000,0.73650], [1177452000000,0.73620], [1177538400000,0.73310], [1177624800000,0.73390], [1177711200000,0.73440], [1177797600000,0.73270], [117788
4000000,0.73270], [1177970400000,0.73360], [1178056800000,0.73330], [1178143200000,0.73590], [1178229600000,0.73590], [1178316000000,0.73720], [1178402400000,0.7360], [1178488800000,0.7360], [1178575200000,0.7350], [1178661600000,0.73650], [1178748000000,0.73840], [1178834400000,0.73950], [1178920800000,0.74130], [1179007200000,0.73970], [1179093600000,0.73960], [1179180000000,0.73850], [1179266400000,0.73780], [1179352800000,0.73660], [1179439200000,0.740], [1179525600000,0.74110], [1179612000000,0.74060], [1179698400000,0.74050], [1179784800000,0.74140], [1179871200000,0.74310], [1179957600000,0.74310], [1180044000000,0.74380], [1180130400000,0.74430], [1180216800000,0.74430], [1180303200000,0.74430], [1180389600000,0.74340], [1180476000000,0.74290], [1180562400000,0.74420], [1180648800000,0.7440], [1180735200000,0.74390], [1180821600000,0.74370], [1180908000000,0.74370], [1180994400000,0.74290], [1181080800000,0.74030], [1181167200000,0.73990], [1181253600000,0.74180], [118134000
0000,0.74680], [1181426400000,0.7480], [1181512800000,0.7480], [1181599200000,0.7490], [1181685600000,0.74940], [1181772000000,0.75220], [1181858400000,0.75150], [1181944800000,0.75020], [1182031200000,0.74720], [1182117600000,0.74720], [1182204000000,0.74620], [1182290400000,0.74550], [1182376800000,0.74490], [1182463200000,0.74670], [1182549600000,0.74580], [1182636000000,0.74270], [1182722400000,0.74270], [1182808800000,0.7430], [1182895200000,0.74290], [1182981600000,0.7440], [1183068000000,0.7430], [1183154400000,0.74220], [1183240800000,0.73880], [1183327200000,0.73880], [1183413600000,0.73690], [1183500000000,0.73450], [1183586400000,0.73450], [1183672800000,0.73450], [1183759200000,0.73520], [1183845600000,0.73410], [1183932000000,0.73410], [1184018400000,0.7340], [1184104800000,0.73240], [1184191200000,0.72720], [1184277600000,0.72640], [1184364000000,0.72550], [1184450400000,0.72580], [1184536800000,0.72580], [1184623200000,0.72560], [1184709600000,0.72570], [1184796000000
,0.72470], [1184882400000,0.72430], [1184968800000,0.72440], [1185055200000,0.72350], [1185141600000,0.72350], [1185228000000,0.72350], [1185314400000,0.72350], [1185400800000,0.72620], [1185487200000,0.72880], [1185573600000,0.73010], [1185660000000,0.73370], [1185746400000,0.73370], [1185832800000,0.73240], [1185919200000,0.72970], [1186005600000,0.73170], [1186092000000,0.73150], [1186178400000,0.72880], [1186264800000,0.72630], [1186351200000,0.72630], [1186437600000,0.72420], [1186524000000,0.72530], [1186610400000,0.72640], [1186696800000,0.7270], [1186783200000,0.73120], [1186869600000,0.73050], [1186956000000,0.73050], [1187042400000,0.73180], [1187128800000,0.73580], [1187215200000,0.74090], [1187301600000,0.74540], [1187388000000,0.74370], [1187474400000,0.74240], [1187560800000,0.74240], [1187647200000,0.74150], [1187733600000,0.74190], [1187820000000,0.74140], [1187906400000,0.73770], [1187992800000,0.73550], [1188079200000,0.73150], [1188165600000,0.73150], [11882520000
00,0.7320], [1188338400000,0.73320], [1188424800000,0.73460], [1188511200000,0.73280], [1188597600000,0.73230], [1188684000000,0.7340], [1188770400000,0.7340], [1188856800000,0.73360], [1188943200000,0.73510], [1189029600000,0.73460], [1189116000000,0.73210], [1189202400000,0.72940], [1189288800000,0.72660], [1189375200000,0.72660], [1189461600000,0.72540], [1189548000000,0.72420], [1189634400000,0.72130], [1189720800000,0.71970], [1189807200000,0.72090], [1189893600000,0.7210], [1189980000000,0.7210], [1190066400000,0.7210], [1190152800000,0.72090], [1190239200000,0.71590], [1190325600000,0.71330], [1190412000000,0.71050], [1190498400000,0.70990], [1190584800000,0.70990], [1190671200000,0.70930], [1190757600000,0.70930], [1190844000000,0.70760], [1190930400000,0.7070], [1191016800000,0.70490], [1191103200000,0.70120], [1191189600000,0.70110], [1191276000000,0.70190], [1191362400000,0.70460], [1191448800000,0.70630], [1191535200000,0.70890], [1191621600000,0.70770], [1191708000000,0
.70770], [1191794400000,0.70770], [1191880800000,0.70910], [1191967200000,0.71180], [1192053600000,0.70790], [1192140000000,0.70530], [1192226400000,0.7050], [1192312800000,0.70550], [1192399200000,0.70550], [1192485600000,0.70450], [1192572000000,0.70510], [1192658400000,0.70510], [1192744800000,0.70170], [1192831200000,0.70], [1192917600000,0.69950], [1193004000000,0.69940], [1193090400000,0.70140], [1193176800000,0.70360], [1193263200000,0.70210], [1193349600000,0.70020], [1193436000000,0.69670], [1193522400000,0.6950], [1193612400000,0.6950], [1193698800000,0.69390], [1193785200000,0.6940], [1193871600000,0.69220], [1193958000000,0.69190], [1194044400000,0.69140], [1194130800000,0.68940], [1194217200000,0.68910], [1194303600000,0.69040], [1194390000000,0.6890], [1194476400000,0.68340], [1194562800000,0.68230], [1194649200000,0.68070], [1194735600000,0.68150], [1194822000000,0.68150], [1194908400000,0.68470], [1194994800000,0.68590], [1195081200000,0.68220], [1195167600000,0.6827
0], [1195254000000,0.68370], [1195340400000,0.68230], [1195426800000,0.68220], [1195513200000,0.68220], [1195599600000,0.67920], [1195686000000,0.67460], [1195772400000,0.67350], [1195858800000,0.67310], [1195945200000,0.67420], [1196031600000,0.67440], [1196118000000,0.67390], [1196204400000,0.67310], [1196290800000,0.67610], [1196377200000,0.67610], [1196463600000,0.67850], [1196550000000,0.68180], [1196636400000,0.68360], [1196722800000,0.68230], [1196809200000,0.68050], [1196895600000,0.67930], [1196982000000,0.68490], [1197068400000,0.68330], [1197154800000,0.68250], [1197241200000,0.68250], [1197327600000,0.68160], [1197414000000,0.67990], [1197500400000,0.68130], [1197586800000,0.68090], [1197673200000,0.68680], [1197759600000,0.69330], [1197846000000,0.69330], [1197932400000,0.69450], [1198018800000,0.69440], [1198105200000,0.69460], [1198191600000,0.69640], [1198278000000,0.69650], [1198364400000,0.69560], [1198450800000,0.69560], [1198537200000,0.6950], [1198623600000,0.69
480], [1198710000000,0.69280], [1198796400000,0.68870], [1198882800000,0.68240], [1198969200000,0.67940], [1199055600000,0.67940], [1199142000000,0.68030], [1199228400000,0.68550], [1199314800000,0.68240], [1199401200000,0.67910], [1199487600000,0.67830], [1199574000000,0.67850], [1199660400000,0.67850], [1199746800000,0.67970], [1199833200000,0.680], [1199919600000,0.68030], [1200006000000,0.68050], [1200092400000,0.6760], [1200178800000,0.6770], [1200265200000,0.6770], [1200351600000,0.67360], [1200438000000,0.67260], [1200524400000,0.67640], [1200610800000,0.68210], [1200697200000,0.68310], [1200783600000,0.68420], [1200870000000,0.68420], [1200956400000,0.68870], [1201042800000,0.69030], [1201129200000,0.68480], [1201215600000,0.68240], [1201302000000,0.67880], [1201388400000,0.68140], [1201474800000,0.68140], [1201561200000,0.67970], [1201647600000,0.67690], [1201734000000,0.67650], [1201820400000,0.67330], [1201906800000,0.67290], [1201993200000,0.67580], [1202079600000,0.6758
0], [1202166000000,0.6750], [1202252400000,0.6780], [1202338800000,0.68330], [1202425200000,0.68560], [1202511600000,0.69030], [1202598000000,0.68960], [1202684400000,0.68960], [1202770800000,0.68820], [1202857200000,0.68790], [1202943600000,0.68620], [1203030000000,0.68520], [1203116400000,0.68230], [1203202800000,0.68130], [1203289200000,0.68130], [1203375600000,0.68220], [1203462000000,0.68020], [1203548400000,0.68020], [1203634800000,0.67840], [1203721200000,0.67480], [1203807600000,0.67470], [1203894000000,0.67470], [1203980400000,0.67480], [1204066800000,0.67330], [1204153200000,0.6650], [1204239600000,0.66110], [1204326000000,0.65830], [1204412400000,0.6590], [1204498800000,0.6590], [1204585200000,0.65810], [1204671600000,0.65780], [1204758000000,0.65740], [1204844400000,0.65320], [1204930800000,0.65020], [1205017200000,0.65140], [1205103600000,0.65140], [1205190000000,0.65070], [1205276400000,0.6510], [1205362800000,0.64890], [1205449200000,0.64240], [1205535600000,0.64060],
[1205622000000,0.63820], [1205708400000,0.63820], [1205794800000,0.63410], [1205881200000,0.63440], [1205967600000,0.63780], [1206054000000,0.64390], [1206140400000,0.64780], [1206226800000,0.64810], [1206313200000,0.64810], [1206399600000,0.64940], [1206486000000,0.64380], [1206572400000,0.63770], [1206658800000,0.63290], [1206745200000,0.63360], [1206831600000,0.63330], [1206914400000,0.63330], [1207000800000,0.6330], [1207087200000,0.63710], [1207173600000,0.64030], [1207260000000,0.63960], [1207346400000,0.63640], [1207432800000,0.63560], [1207519200000,0.63560], [1207605600000,0.63680], [1207692000000,0.63570], [1207778400000,0.63540], [1207864800000,0.6320], [1207951200000,0.63320], [1208037600000,0.63280], [1208124000000,0.63310], [1208210400000,0.63420], [1208296800000,0.63210], [1208383200000,0.63020], [1208469600000,0.62780], [1208556000000,0.63080], [1208642400000,0.63240], [1208728800000,0.63240], [1208815200000,0.63070], [1208901600000,0.62770], [1208988000000,0.62690]
, [1209074400000,0.63350], [1209160800000,0.63920], [1209247200000,0.640], [1209333600000,0.64010], [1209420000000,0.63960], [1209506400000,0.64070], [1209592800000,0.64230], [1209679200000,0.64290], [1209765600000,0.64720], [1209852000000,0.64850], [1209938400000,0.64860], [1210024800000,0.64670], [1210111200000,0.64440], [1210197600000,0.64670], [1210284000000,0.65090], [1210370400000,0.64780], [1210456800000,0.64610], [1210543200000,0.64610], [1210629600000,0.64680], [1210716000000,0.64490], [1210802400000,0.6470], [1210888800000,0.64610], [1210975200000,0.64520], [1211061600000,0.64220], [1211148000000,0.64220], [1211234400000,0.64250], [1211320800000,0.64140], [1211407200000,0.63660], [1211493600000,0.63460], [1211580000000,0.6350], [1211666400000,0.63460], [1211752800000,0.63460], [1211839200000,0.63430], [1211925600000,0.63460], [1212012000000,0.63790], [1212098400000,0.64160], [1212184800000,0.64420], [1212271200000,0.64310], [1212357600000,0.64310], [1212444000000,0.64350],
[1212530400000,0.6440], [1212616800000,0.64730], [1212703200000,0.64690], [1212789600000,0.63860], [1212876000000,0.63560], [1212962400000,0.6340], [1213048800000,0.63460], [1213135200000,0.6430], [1213221600000,0.64520], [1213308000000,0.64670], [1213394400000,0.65060], [1213480800000,0.65040], [1213567200000,0.65030], [1213653600000,0.64810], [1213740000000,0.64510], [1213826400000,0.6450], [1213912800000,0.64410], [1213999200000,0.64140], [1214085600000,0.64090], [1214172000000,0.64090], [1214258400000,0.64280], [1214344800000,0.64310], [1214431200000,0.64180], [1214517600000,0.63710], [1214604000000,0.63490], [1214690400000,0.63330], [1214776800000,0.63340], [1214863200000,0.63380], [1214949600000,0.63420], [1215036000000,0.6320], [1215122400000,0.63180], [1215208800000,0.6370], [1215295200000,0.63680], [1215381600000,0.63680], [1215468000000,0.63830], [1215554400000,0.63710], [1215640800000,0.63710], [1215727200000,0.63550], [1215813600000,0.6320], [1215900000000,0.62770], [12
15986400000,0.62760], [1216072800000,0.62910], [1216159200000,0.62740], [1216245600000,0.62930], [1216332000000,0.63110], [1216418400000,0.6310], [1216504800000,0.63120], [1216591200000,0.63120], [1216677600000,0.63040], [1216764000000,0.62940], [1216850400000,0.63480], [1216936800000,0.63780], [1217023200000,0.63680], [1217109600000,0.63680], [1217196000000,0.63680], [1217282400000,0.6360], [1217368800000,0.6370], [1217455200000,0.64180], [1217541600000,0.64110], [1217628000000,0.64350], [1217714400000,0.64270], [1217800800000,0.64270], [1217887200000,0.64190], [1217973600000,0.64460], [1218060000000,0.64680], [1218146400000,0.64870], [1218232800000,0.65940], [1218319200000,0.66660], [1218405600000,0.66660], [1218492000000,0.66780], [1218578400000,0.67120], [1218664800000,0.67050], [1218751200000,0.67180], [1218837600000,0.67840], [1218924000000,0.68110], [1219010400000,0.68110], [1219096800000,0.67940], [1219183200000,0.68040], [1219269600000,0.67810], [1219356000000,0.67560], [12
19442400000,0.67350], [1219528800000,0.67630], [1219615200000,0.67620], [1219701600000,0.67770], [1219788000000,0.68150], [1219874400000,0.68020], [1219960800000,0.6780], [1220047200000,0.67960], [1220133600000,0.68170], [1220220000000,0.68170], [1220306400000,0.68320], [1220392800000,0.68770], [1220479200000,0.69120], [1220565600000,0.69140], [1220652000000,0.70090], [1220738400000,0.70120], [1220824800000,0.7010], [1220911200000,0.70050]];
-
- function euroFormatter(v, axis) {
- return v.toFixed(axis.tickDecimals) +"€";
- }
-
- function doPlot(position) {
- $.plot($("#flot-chart-multiple-axes"),
- [ { data: oilprices, label: "Oil price ($)" },
- { data: exchangerates, label: "USD/EUR exchange rate", yaxis: 2 }],
- {
- xaxes: [ { mode: 'time' } ],
- yaxes: [ { min: 0 },
- {
- // align if we are to the right
- alignTicksWithAxis: position == "right" ? 1 : null,
- position: position,
- tickFormatter: euroFormatter
- } ],
- legend: { position: 'sw' },
- grid: {
- hoverable: true //IMPORTANT! this is needed for tooltip to work
- },
- tooltip: true,
- tooltipOpts: {
- content: "%s for %x was %y",
- xDateFormat: "%y-%0m-%0d",
-
- onHover: function(flotItem, $tooltipEl) {
- // console.log(flotItem, $tooltipEl);
- }
- }
-
- });
- }
-
- doPlot("right");
-
- $("button").click(function () {
- doPlot($(this).text());
- });
-});
-
-//Flot Chart Dynamic Chart
-
-$(function() {
-
- var container = $("#flot-chart-moving-line");
-
- // Determine how many data points to keep based on the placeholder's initial size;
- // this gives us a nice high-res plot while avoiding more than one point per pixel.
-
- var maximum = container.outerWidth() / 2 || 300;
-
- //
-
- var data = [];
-
- function getRandomData() {
-
- if (data.length) {
- data = data.slice(1);
- }
-
- while (data.length < maximum) {
- var previous = data.length ? data[data.length - 1] : 50;
- var y = previous + Math.random() * 10 - 5;
- data.push(y < 0 ? 0 : y > 100 ? 100 : y);
- }
-
- // zip the generated y values with the x values
-
- var res = [];
- for (var i = 0; i < data.length; ++i) {
- res.push([i, data[i]])
- }
-
- return res;
- }
-
- //
-
- series = [{
- data: getRandomData(),
- lines: {
- fill: true
- }
- }];
-
- //
-
- var plot = $.plot(container, series, {
- grid: {
- borderWidth: 1,
- minBorderMargin: 20,
- labelMargin: 10,
- backgroundColor: {
- colors: ["#fff", "#e4f4f4"]
- },
- margin: {
- top: 8,
- bottom: 20,
- left: 20
- },
- markings: function(axes) {
- var markings = [];
- var xaxis = axes.xaxis;
- for (var x = Math.floor(xaxis.min); x < xaxis.max; x += xaxis.tickSize * 2) {
- markings.push({ xaxis: { from: x, to: x + xaxis.tickSize }, color: "rgba(232, 232, 255, 0.2)" });
- }
- return markings;
- }
- },
- xaxis: {
- tickFormatter: function() {
- return "";
- }
- },
- yaxis: {
- min: 0,
- max: 110
- },
- legend: {
- show: true
- }
- });
-
- // Update the random dataset at 25FPS for a smoothly-animating chart
-
- setInterval(function updateRandom() {
- series[0].data = getRandomData();
- plot.setData(series);
- plot.draw();
- }, 40);
-
-});
-
-//Flot Chart Bar Graph
-
-$(function () {
-
- var barOptions = {
- series: {
- bars: { show: true, barWidth: 43200000 }
- },
- xaxis: { mode: "time", timeformat: "%m/%d", minTickSize: [1, "day"] },
- grid: { hoverable: true },
- legend: { show: false },
- tooltip: true,
- tooltipOpts: {
- content: "x: %x, y: %y"
- }
- };
- var barData = { label: "bar", data: [
- [1354521600000, 1000],
- [1355040000000, 2000],
- [1355223600000, 3000],
- [1355306400000, 4000],
- [1355487300000, 5000],
- [1355571900000, 6000]
- ]};
- $.plot($("#flot-chart-bar"), [barData], barOptions);
-
-});
-
http://git-wip-us.apache.org/repos/asf/flink/blob/f38e2039/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/excanvas.min.js
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/excanvas.min.js b/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/excanvas.min.js
deleted file mode 100755
index 12c74f7..0000000
--- a/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/excanvas.min.js
+++ /dev/null
@@ -1 +0,0 @@
-if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatec
hange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z<j.length;Z++){this.initElement(j[Z])}},initElement:function(i){if(!i.getContext){i.getContext=T;r(i.ownerDocument);i.innerHTML="";i.attachEvent("onpropertychange",S);i.attachEvent("onresize",w);var Z=i.attributes;if(Z.width&&Z.width.specified){i.style.width=Z.width.nodeValue+"px"}else{i.width=i.clientWidth}if(Z.height&&Z.height.specified){i.style.height=Z.height.nodeValue+"px"}else{i.height=i.clientHeight}}return i}};function S(i){var Z=i.srcElement;switch(i.propertyName){case"width":Z.getContext().clearRect();Z.style.width=Z.attributes.width.nodeValue+"px";Z.firstChild.style.width=Z.clientWidth+"px";break;case"height":Z.getContext().clearRect();Z.style.height=Z.attributes.height.nodeValue+"px";Z.firstChild.style.height=Z.clientHeight+"px";break}}function w(i){var Z=i.srcElement;if(Z.firstChild){Z.firstChild.style.width=Z.clientWidth+"px";Z.firstChild.style.height=Z.clientHeight+"px
"}}E.init();var I=[];for(var AC=0;AC<16;AC++){for(var AB=0;AB<16;AB++){I[AC*16+AB]=AC.toString(16)+AB.toString(16)}}function V(){return[[1,0,0],[0,1,0],[0,0,1]]}function d(m,j){var i=V();for(var Z=0;Z<3;Z++){for(var AF=0;AF<3;AF++){var p=0;for(var AE=0;AE<3;AE++){p+=m[Z][AE]*j[AE][AF]}i[Z][AF]=p}}return i}function Q(i,Z){Z.fillStyle=i.fillStyle;Z.lineCap=i.lineCap;Z.lineJoin=i.lineJoin;Z.lineWidth=i.lineWidth;Z.miterLimit=i.miterLimit;Z.shadowBlur=i.shadowBlur;Z.shadowColor=i.shadowColor;Z.shadowOffsetX=i.shadowOffsetX;Z.shadowOffsetY=i.shadowOffsetY;Z.strokeStyle=i.strokeStyle;Z.globalAlpha=i.globalAlpha;Z.font=i.font;Z.textAlign=i.textAlign;Z.textBaseline=i.textBaseline;Z.arcScaleX_=i.arcScaleX_;Z.arcScaleY_=i.arcScaleY_;Z.lineScale_=i.lineScale_}var B={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",
chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffo
n:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#
B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"};function g(i){var m=i.indexOf("(",3);var Z=i.indexOf(")",m+1);var j=i.substring(m+1,Z).split(",");if(j.length==4&&i.substr(3,1)=="a"){alpha=Number(j[3])}else{j[3]=1}return j}function C(Z){return parseFloat(Z)/100}function N(i,j,Z){return Math.min(Z,Math.max(j,i))}function c(AF){var j,i,Z;h=parseFloat(AF[0])/360%360;if(h<0){h++}s=N(C(AF[1]),0,1);l=N(C(AF[2]),0,1);if(s==0){j=i=Z=l}else{var m=l<0.5?l*(1+s):l+s-l*s;var AE=2*l-m;j=A(AE,m,h+1/3);i=A(AE,m,h);Z=A(AE,m,h-1/3)}return"#"+I[Math.floor(j*255)]+I[Math.floor(i*255)]+I[Math.floor(Z*255)]}function
A(i,Z,j){if(j<0){j++}if(j>1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(
j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.pro
totype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE
.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y
1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" <g_vml_:group",' coordsize="',D*Z,",",D*AE,'"',' coordorigin="0,0"',' style="width:',Z,"p
x;height:",AE,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]||this.m_[1][1]!=1||this.m_[1][0]){var p=[];p.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",K(AW.x/D),",","Dy=",K(AW.y/D),"");var AS=AW;var AR=this.getCoords_(AH+AJ,AF);var AP=this.getCoords_(AH,AF+AV);var AL=this.getCoords_(AH+AJ,AF+AV);AS.x=z.max(AS.x,AR.x,AP.x,AL.x);AS.y=z.max(AS.y,AR.y,AP.y,AL.y);AU.push("padding:0 ",K(AS.x/D),"px ",K(AS.y/D),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",p.join(""),", sizingmethod='clip');")}else{AU.push("top:",K(AW.y/D),"px;left:",K(AW.x/D),"px;")}AU.push(' ">','<g_vml_:image src="',AO.src,'"',' style="width:',D*AJ,"px;"," height:",D*AV,'px"',' cropleft="',AM/AG,'"',' croptop="',AK/AT,'"',' cropright="',(AG-AM-AQ)/AG,'"',' cropbottom="',(AT-AK-AX)/AT,'"'," />","</g_vml_:group>");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:
null,y:null};var AL={x:null,y:null};for(var AH=0;AH<this.currentPath_.length;AH+=AE){var AK=[];var AF=false;AK.push("<g_vml_:shape",' filled="',!!AM,'"',' style="position:absolute;width:',m,"px;height:",AN,'px;"',' coordorigin="0,0"',' coordsize="',D*m,",",D*AN,'"',' stroked="',!AM,'"',' path="');var AO=false;for(var AI=AH;AI<Math.min(AH+AE,this.currentPath_.length);AI++){if(AI%AE==0&&AI>0){AK.push(" m ",K(this.currentPath_[AI-1].x),",",K(this.currentPath_[AI-1].y))}var Z=this.currentPath_[AI];var AJ;switch(Z.type){case"moveTo":AJ=Z;AK.push(" m ",K(Z.x),",",K(Z.y));break;case"lineTo":AK.push(" l ",K(Z.x),",",K(Z.y));break;case"close":AK.push(" x ");Z=null;break;case"bezierCurveTo":AK.push(" c ",K(Z.cp1x),",",K(Z.cp1y),",",K(Z.cp2x),",",K(Z.cp2y),",",K(Z.x),",",K(Z.y));break;case"at":case"wa":AK.push(" ",Z.type," ",K(Z.x-this.arcScaleX_*Z.radius),",",K(Z.y-this.arcScaleY_*Z.radius)," ",K(Z.x+this.arcScaleX_*Z.radius),",",K(Z.y+this.arcScaleY_*Z.radius)," ",K(Z.xStart),",",K(Z.yStart)
," ",K(Z.xEnd),",",K(Z.yEnd));break}if(Z){if(AG.x==null||Z.x<AG.x){AG.x=Z.x}if(AL.x==null||Z.x>AL.x){AL.x=Z.x}if(AG.y==null||Z.y<AG.y){AG.y=Z.y}if(AL.y==null||Z.y>AL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("</g_vml_:shape>");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("<g_vml_:stroke",' opacity="',p,'"',' joinstyle="',j.lineJoin,'"',' miterlimit="',j.miterLimit,'"',' endcap="',t(j.lineCap),'"',' weight="',Z,'px"',' color="',m,'" />')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.a
tan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae<AN;Ae++){var AM=AS[Ae];Ab.push(AM.offset*AK+AU+" "+AM.color)}AG.push('<g_vml_:fill type="',AH.type_,'"',' method="none" focus="100%"',' color="',AR,'"',' color2="',AQ,'"',' colors="',Ab.join(","),'"',' opacity="',AV,'"',' g_o_:opacity2="',AW,'"',' angle="',AL,'"',' focusposition="',Ac.x,",",Ac.y,'" />')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("<g_vml_:fill",' position="',AF/Z*AY*AY,",",AZ/m*AX*AX,'"',' type="tile"',' src="',AH.src_,'" />')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('<g_vml_:f
ill color="',AT,'" opacity="',Ad,'" />')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1
]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('<g_vml_:line from="',-i,' 0" to="',AP,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' fill
ed="',!AG,'" stroked="',!!AG,'" style="position:absolute;width:1px;height:1px;">');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('<g_vml_:skew on="t" matrix="',AL,'" ',' offset="',AJ,'" origin="',i,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',AD(AK),'" style="v-text-align:',p,";font:",AD(j),'" /></g_vml_:line>');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMea
sureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.D
OMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink/blob/f38e2039/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js b/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js
deleted file mode 100755
index 70941dd..0000000
--- a/flink-runtime/src/main/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
-Flot plugin for rendering pie charts. The plugin assumes the data is
-coming is as a single data value for each series, and each of those
-values is a positive value or zero (negative numbers don't make
-any sense and will cause strange effects). The data values do
-NOT need to be passed in as percentage values because it
-internally calculates the total and percentages.
-
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-* Changes:
- 2009-10-22: lineJoin set to round
- 2009-10-23: IE full circle fix, donut
- 2009-11-11: Added basic hover from btburnett3 - does not work in IE, and center is off in Chrome and Opera
- 2009-11-17: Added IE hover capability submitted by Anthony Aragues
- 2009-11-18: Added bug fix submitted by Xavi Ivars (issues with arrays when other JS libraries are included as well)
-
-
-Available options are:
-series: {
- pie: {
- show: true/false
- radius: 0-1 for percentage of fullsize, or a specified pixel length, or 'auto'
- innerRadius: 0-1 for percentage of fullsize or a specified pixel length, for creating a donut effect
- startAngle: 0-2 factor of PI used for starting angle (in radians) i.e 3/2 starts at the top, 0 and 2 have the same result
- tilt: 0-1 for percentage to tilt the pie, where 1 is no tilt, and 0 is completely flat (nothing will show)
- offset: {
- top: integer value to move the pie up or down
- left: integer value to move the pie left or right, or 'auto'
- },
- stroke: {
- color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#FFF')
- width: integer pixel width of the stroke
- },
- label: {
- show: true/false, or 'auto'
- formatter: a user-defined function that modifies the text/style of the label text
- radius: 0-1 for percentage of fullsize, or a specified pixel length
- background: {
- color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#000')
- opacity: 0-1
- },
- threshold: 0-1 for the percentage value at which to hide labels (if they're too small)
- },
- combine: {
- threshold: 0-1 for the percentage value at which to combine slices (if they're too small)
- color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#CCC'), if null, the plugin will automatically use the color of the first slice to be combined
- label: any text value of what the combined slice should be labeled
- }
- highlight: {
- opacity: 0-1
- }
- }
-}
-
-More detail and specific examples can be found in the included HTML file.
-
-*/
-
-(function ($)
-{
- function init(plot) // this is the "body" of the plugin
- {
- var canvas = null;
- var target = null;
- var maxRadius = null;
- var centerLeft = null;
- var centerTop = null;
- var total = 0;
- var redraw = true;
- var redrawAttempts = 10;
- var shrink = 0.95;
- var legendWidth = 0;
- var processed = false;
- var raw = false;
-
- // interactive variables
- var highlights = [];
-
- // add hook to determine if pie plugin in enabled, and then perform necessary operations
- plot.hooks.processOptions.push(checkPieEnabled);
- plot.hooks.bindEvents.push(bindEvents);
-
- // check to see if the pie plugin is enabled
- function checkPieEnabled(plot, options)
- {
- if (options.series.pie.show)
- {
- //disable grid
- options.grid.show = false;
-
- // set labels.show
- if (options.series.pie.label.show=='auto')
- if (options.legend.show)
- options.series.pie.label.show = false;
- else
- options.series.pie.label.show = true;
-
- // set radius
- if (options.series.pie.radius=='auto')
- if (options.series.pie.label.show)
- options.series.pie.radius = 3/4;
- else
- options.series.pie.radius = 1;
-
- // ensure sane tilt
- if (options.series.pie.tilt>1)
- options.series.pie.tilt=1;
- if (options.series.pie.tilt<0)
- options.series.pie.tilt=0;
-
- // add processData hook to do transformations on the data
- plot.hooks.processDatapoints.push(processDatapoints);
- plot.hooks.drawOverlay.push(drawOverlay);
-
- // add draw hook
- plot.hooks.draw.push(draw);
- }
- }
-
- // bind hoverable events
- function bindEvents(plot, eventHolder)
- {
- var options = plot.getOptions();
-
- if (options.series.pie.show && options.grid.hoverable)
- eventHolder.unbind('mousemove').mousemove(onMouseMove);
-
- if (options.series.pie.show && options.grid.clickable)
- eventHolder.unbind('click').click(onClick);
- }
-
-
- // debugging function that prints out an object
- function alertObject(obj)
- {
- var msg = '';
- function traverse(obj, depth)
- {
- if (!depth)
- depth = 0;
- for (var i = 0; i < obj.length; ++i)
- {
- for (var j=0; j<depth; j++)
- msg += '\t';
-
- if( typeof obj[i] == "object")
- { // its an object
- msg += ''+i+':\n';
- traverse(obj[i], depth+1);
- }
- else
- { // its a value
- msg += ''+i+': '+obj[i]+'\n';
- }
- }
- }
- traverse(obj);
- alert(msg);
- }
-
- function calcTotal(data)
- {
- for (var i = 0; i < data.length; ++i)
- {
- var item = parseFloat(data[i].data[0][1]);
- if (item)
- total += item;
- }
- }
-
- function processDatapoints(plot, series, data, datapoints)
- {
- if (!processed)
- {
- processed = true;
-
- canvas = plot.getCanvas();
- target = $(canvas).parent();
- options = plot.getOptions();
-
- plot.setData(combine(plot.getData()));
- }
- }
-
- function setupPie()
- {
- legendWidth = target.children().filter('.legend').children().width();
-
- // calculate maximum radius and center point
- maxRadius = Math.min(canvas.width,(canvas.height/options.series.pie.tilt))/2;
- centerTop = (canvas.height/2)+options.series.pie.offset.top;
- centerLeft = (canvas.width/2);
-
- if (options.series.pie.offset.left=='auto')
- if (options.legend.position.match('w'))
- centerLeft += legendWidth/2;
- else
- centerLeft -= legendWidth/2;
- else
- centerLeft += options.series.pie.offset.left;
-
- if (centerLeft<maxRadius)
- centerLeft = maxRadius;
- else if (centerLeft>canvas.width-maxRadius)
- centerLeft = canvas.width-maxRadius;
- }
-
- function fixData(data)
- {
- for (var i = 0; i < data.length; ++i)
- {
- if (typeof(data[i].data)=='number')
- data[i].data = [[1,data[i].data]];
- else if (typeof(data[i].data)=='undefined' || typeof(data[i].data[0])=='undefined')
- {
- if (typeof(data[i].data)!='undefined' && typeof(data[i].data.label)!='undefined')
- data[i].label = data[i].data.label; // fix weirdness coming from flot
- data[i].data = [[1,0]];
-
- }
- }
- return data;
- }
-
- function combine(data)
- {
- data = fixData(data);
- calcTotal(data);
- var combined = 0;
- var numCombined = 0;
- var color = options.series.pie.combine.color;
-
- var newdata = [];
- for (var i = 0; i < data.length; ++i)
- {
- // make sure its a number
- data[i].data[0][1] = parseFloat(data[i].data[0][1]);
- if (!data[i].data[0][1])
- data[i].data[0][1] = 0;
-
- if (data[i].data[0][1]/total<=options.series.pie.combine.threshold)
- {
- combined += data[i].data[0][1];
- numCombined++;
- if (!color)
- color = data[i].color;
- }
- else
- {
- newdata.push({
- data: [[1,data[i].data[0][1]]],
- color: data[i].color,
- label: data[i].label,
- angle: (data[i].data[0][1]*(Math.PI*2))/total,
- percent: (data[i].data[0][1]/total*100)
- });
- }
- }
- if (numCombined>0)
- newdata.push({
- data: [[1,combined]],
- color: color,
- label: options.series.pie.combine.label,
- angle: (combined*(Math.PI*2))/total,
- percent: (combined/total*100)
- });
- return newdata;
- }
-
- function draw(plot, newCtx)
- {
- if (!target) return; // if no series were passed
- ctx = newCtx;
-
- setupPie();
- var slices = plot.getData();
-
- var attempts = 0;
- while (redraw && attempts<redrawAttempts)
- {
- redraw = false;
- if (attempts>0)
- maxRadius *= shrink;
- attempts += 1;
- clear();
- if (options.series.pie.tilt<=0.8)
- drawShadow();
- drawPie();
- }
- if (attempts >= redrawAttempts) {
- clear();
- target.prepend('<div class="error">Could not draw pie with labels contained inside canvas</div>');
- }
-
- if ( plot.setSeries && plot.insertLegend )
- {
- plot.setSeries(slices);
- plot.insertLegend();
- }
-
- // we're actually done at this point, just defining internal functions at this point
-
- function clear()
- {
- ctx.clearRect(0,0,canvas.width,canvas.height);
- target.children().filter('.pieLabel, .pieLabelBackground').remove();
- }
-
- function drawShadow()
- {
- var shadowLeft = 5;
- var shadowTop = 15;
- var edge = 10;
- var alpha = 0.02;
-
- // set radius
- if (options.series.pie.radius>1)
- var radius = options.series.pie.radius;
- else
- var radius = maxRadius * options.series.pie.radius;
-
- if (radius>=(canvas.width/2)-shadowLeft || radius*options.series.pie.tilt>=(canvas.height/2)-shadowTop || radius<=edge)
- return; // shadow would be outside canvas, so don't draw it
-
- ctx.save();
- ctx.translate(shadowLeft,shadowTop);
- ctx.globalAlpha = alpha;
- ctx.fillStyle = '#000';
-
- // center and rotate to starting position
- ctx.translate(centerLeft,centerTop);
- ctx.scale(1, options.series.pie.tilt);
-
- //radius -= edge;
- for (var i=1; i<=edge; i++)
- {
- ctx.beginPath();
- ctx.arc(0,0,radius,0,Math.PI*2,false);
- ctx.fill();
- radius -= i;
- }
-
- ctx.restore();
- }
-
- function drawPie()
- {
- startAngle = Math.PI*options.series.pie.startAngle;
-
- // set radius
- if (options.series.pie.radius>1)
- var radius = options.series.pie.radius;
- else
- var radius = maxRadius * options.series.pie.radius;
-
- // center and rotate to starting position
- ctx.save();
- ctx.translate(centerLeft,centerTop);
- ctx.scale(1, options.series.pie.tilt);
- //ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
-
- // draw slices
- ctx.save();
- var currentAngle = startAngle;
- for (var i = 0; i < slices.length; ++i)
- {
- slices[i].startAngle = currentAngle;
- drawSlice(slices[i].angle, slices[i].color, true);
- }
- ctx.restore();
-
- // draw slice outlines
- ctx.save();
- ctx.lineWidth = options.series.pie.stroke.width;
- currentAngle = startAngle;
- for (var i = 0; i < slices.length; ++i)
- drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
- ctx.restore();
-
- // draw donut hole
- drawDonutHole(ctx);
-
- // draw labels
- if (options.series.pie.label.show)
- drawLabels();
-
- // restore to original state
- ctx.restore();
-
- function drawSlice(angle, color, fill)
- {
- if (angle<=0)
- return;
-
- if (fill)
- ctx.fillStyle = color;
- else
- {
- ctx.strokeStyle = color;
- ctx.lineJoin = 'round';
- }
-
- ctx.beginPath();
- if (Math.abs(angle - Math.PI*2) > 0.000000001)
- ctx.moveTo(0,0); // Center of the pie
- else if ($.browser.msie)
- angle -= 0.0001;
- //ctx.arc(0,0,radius,0,angle,false); // This doesn't work properly in Opera
- ctx.arc(0,0,radius,currentAngle,currentAngle+angle,false);
- ctx.closePath();
- //ctx.rotate(angle); // This doesn't work properly in Opera
- currentAngle += angle;
-
- if (fill)
- ctx.fill();
- else
- ctx.stroke();
- }
-
- function drawLabels()
- {
- var currentAngle = startAngle;
-
- // set radius
- if (options.series.pie.label.radius>1)
- var radius = options.series.pie.label.radius;
- else
- var radius = maxRadius * options.series.pie.label.radius;
-
- for (var i = 0; i < slices.length; ++i)
- {
- if (slices[i].percent >= options.series.pie.label.threshold*100)
- drawLabel(slices[i], currentAngle, i);
- currentAngle += slices[i].angle;
- }
-
- function drawLabel(slice, startAngle, index)
- {
- if (slice.data[0][1]==0)
- return;
-
- // format label text
- var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;
- if (lf)
- text = lf(slice.label, slice);
- else
- text = slice.label;
- if (plf)
- text = plf(text, slice);
-
- var halfAngle = ((startAngle+slice.angle) + startAngle)/2;
- var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
- var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;
-
- var html = '<span class="pieLabel" id="pieLabel'+index+'" style="position:absolute;top:' + y + 'px;left:' + x + 'px;">' + text + "</span>";
- target.append(html);
- var label = target.children('#pieLabel'+index);
- var labelTop = (y - label.height()/2);
- var labelLeft = (x - label.width()/2);
- label.css('top', labelTop);
- label.css('left', labelLeft);
-
- // check to make sure that the label is not outside the canvas
- if (0-labelTop>0 || 0-labelLeft>0 || canvas.height-(labelTop+label.height())<0 || canvas.width-(labelLeft+label.width())<0)
- redraw = true;
-
- if (options.series.pie.label.background.opacity != 0) {
- // put in the transparent background separately to avoid blended labels and label boxes
- var c = options.series.pie.label.background.color;
- if (c == null) {
- c = slice.color;
- }
- var pos = 'top:'+labelTop+'px;left:'+labelLeft+'px;';
- $('<div class="pieLabelBackground" style="position:absolute;width:' + label.width() + 'px;height:' + label.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').insertBefore(label).css('opacity', options.series.pie.label.background.opacity);
- }
- } // end individual label function
- } // end drawLabels function
- } // end drawPie function
- } // end draw function
-
- // Placed here because it needs to be accessed from multiple locations
- function drawDonutHole(layer)
- {
- // draw donut hole
- if(options.series.pie.innerRadius > 0)
- {
- // subtract the center
- layer.save();
- innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
- layer.globalCompositeOperation = 'destination-out'; // this does not work with excanvas, but it will fall back to using the stroke color
- layer.beginPath();
- layer.fillStyle = options.series.pie.stroke.color;
- layer.arc(0,0,innerRadius,0,Math.PI*2,false);
- layer.fill();
- layer.closePath();
- layer.restore();
-
- // add inner stroke
- layer.save();
- layer.beginPath();
- layer.strokeStyle = options.series.pie.stroke.color;
- layer.arc(0,0,innerRadius,0,Math.PI*2,false);
- layer.stroke();
- layer.closePath();
- layer.restore();
- // TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
- }
- }
-
- //-- Additional Interactive related functions --
-
- function isPointInPoly(poly, pt)
- {
- for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
- ((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))
- && (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])
- && (c = !c);
- return c;
- }
-
- function findNearbySlice(mouseX, mouseY)
- {
- var slices = plot.getData(),
- options = plot.getOptions(),
- radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
- for (var i = 0; i < slices.length; ++i)
- {
- var s = slices[i];
-
- if(s.pie.show)
- {
- ctx.save();
- ctx.beginPath();
- ctx.moveTo(0,0); // Center of the pie
- //ctx.scale(1, options.series.pie.tilt); // this actually seems to break everything when here.
- ctx.arc(0,0,radius,s.startAngle,s.startAngle+s.angle,false);
- ctx.closePath();
- x = mouseX-centerLeft;
- y = mouseY-centerTop;
- if(ctx.isPointInPath)
- {
- if (ctx.isPointInPath(mouseX-centerLeft, mouseY-centerTop))
- {
- //alert('found slice!');
- ctx.restore();
- return {datapoint: [s.percent, s.data], dataIndex: 0, series: s, seriesIndex: i};
- }
- }
- else
- {
- // excanvas for IE doesn;t support isPointInPath, this is a workaround.
- p1X = (radius * Math.cos(s.startAngle));
- p1Y = (radius * Math.sin(s.startAngle));
- p2X = (radius * Math.cos(s.startAngle+(s.angle/4)));
- p2Y = (radius * Math.sin(s.startAngle+(s.angle/4)));
- p3X = (radius * Math.cos(s.startAngle+(s.angle/2)));
- p3Y = (radius * Math.sin(s.startAngle+(s.angle/2)));
- p4X = (radius * Math.cos(s.startAngle+(s.angle/1.5)));
- p4Y = (radius * Math.sin(s.startAngle+(s.angle/1.5)));
- p5X = (radius * Math.cos(s.startAngle+s.angle));
- p5Y = (radius * Math.sin(s.startAngle+s.angle));
- arrPoly = [[0,0],[p1X,p1Y],[p2X,p2Y],[p3X,p3Y],[p4X,p4Y],[p5X,p5Y]];
- arrPoint = [x,y];
- // TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
- if(isPointInPoly(arrPoly, arrPoint))
- {
- ctx.restore();
- return {datapoint: [s.percent, s.data], dataIndex: 0, series: s, seriesIndex: i};
- }
- }
- ctx.restore();
- }
- }
-
- return null;
- }
-
- function onMouseMove(e)
- {
- triggerClickHoverEvent('plothover', e);
- }
-
- function onClick(e)
- {
- triggerClickHoverEvent('plotclick', e);
- }
-
- // trigger click or hover event (they send the same parameters so we share their code)
- function triggerClickHoverEvent(eventname, e)
- {
- var offset = plot.offset(),
- canvasX = parseInt(e.pageX - offset.left),
- canvasY = parseInt(e.pageY - offset.top),
- item = findNearbySlice(canvasX, canvasY);
-
- if (options.grid.autoHighlight)
- {
- // clear auto-highlights
- for (var i = 0; i < highlights.length; ++i)
- {
- var h = highlights[i];
- if (h.auto == eventname && !(item && h.series == item.series))
- unhighlight(h.series);
- }
- }
-
- // highlight the slice
- if (item)
- highlight(item.series, eventname);
-
- // trigger any hover bind events
- var pos = { pageX: e.pageX, pageY: e.pageY };
- target.trigger(eventname, [ pos, item ]);
- }
-
- function highlight(s, auto)
- {
- if (typeof s == "number")
- s = series[s];
-
- var i = indexOfHighlight(s);
- if (i == -1)
- {
- highlights.push({ series: s, auto: auto });
- plot.triggerRedrawOverlay();
- }
- else if (!auto)
- highlights[i].auto = false;
- }
-
- function unhighlight(s)
- {
- if (s == null)
- {
- highlights = [];
- plot.triggerRedrawOverlay();
- }
-
- if (typeof s == "number")
- s = series[s];
-
- var i = indexOfHighlight(s);
- if (i != -1)
- {
- highlights.splice(i, 1);
- plot.triggerRedrawOverlay();
- }
- }
-
- function indexOfHighlight(s)
- {
- for (var i = 0; i < highlights.length; ++i)
- {
- var h = highlights[i];
- if (h.series == s)
- return i;
- }
- return -1;
- }
-
- function drawOverlay(plot, octx)
- {
- //alert(options.series.pie.radius);
- var options = plot.getOptions();
- //alert(options.series.pie.radius);
-
- var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
- octx.save();
- octx.translate(centerLeft, centerTop);
- octx.scale(1, options.series.pie.tilt);
-
- for (i = 0; i < highlights.length; ++i)
- drawHighlight(highlights[i].series);
-
- drawDonutHole(octx);
-
- octx.restore();
-
- function drawHighlight(series)
- {
- if (series.angle < 0) return;
-
- //octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
- octx.fillStyle = "rgba(255, 255, 255, "+options.series.pie.highlight.opacity+")"; // this is temporary until we have access to parseColor
-
- octx.beginPath();
- if (Math.abs(series.angle - Math.PI*2) > 0.000000001)
- octx.moveTo(0,0); // Center of the pie
- octx.arc(0,0,radius,series.startAngle,series.startAngle+series.angle,false);
- octx.closePath();
- octx.fill();
- }
-
- }
-
- } // end init (plugin body)
-
- // define pie specific options and their default values
- var options = {
- series: {
- pie: {
- show: false,
- radius: 'auto', // actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
- innerRadius:0, /* for donut */
- startAngle: 3/2,
- tilt: 1,
- offset: {
- top: 0,
- left: 'auto'
- },
- stroke: {
- color: '#FFF',
- width: 1
- },
- label: {
- show: 'auto',
- formatter: function(label, slice){
- return '<div style="font-size:x-small;text-align:center;padding:2px;color:'+slice.color+';">'+label+'<br/>'+Math.round(slice.percent)+'%</div>';
- }, // formatter function
- radius: 1, // radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
- background: {
- color: null,
- opacity: 0
- },
- threshold: 0 // percentage at which to hide the label (i.e. the slice is too narrow)
- },
- combine: {
- threshold: -1, // percentage at which to combine little slices into one larger slice
- color: null, // color to give the new slice (auto-generated if null)
- label: 'Other' // label to give the new slice
- },
- highlight: {
- //color: '#FFF', // will add this functionality once parseColor is available
- opacity: 0.5
- }
- }
- }
- };
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: "pie",
- version: "1.0"
- });
-})(jQuery);
[07/17] flink git commit: [docs] Add FAQ entry about scala implicits
error when missing imports
Posted by se...@apache.org.
[docs] Add FAQ entry about scala implicits error when missing imports
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c954c4d5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c954c4d5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c954c4d5
Branch: refs/heads/master
Commit: c954c4d5fab928762a14f1ce93a619dcfbfa12f0
Parents: e7daefd
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Jan 10 17:23:57 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:30 2015 -0800
----------------------------------------------------------------------
docs/faq.md | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c954c4d5/docs/faq.md
----------------------------------------------------------------------
diff --git a/docs/faq.md b/docs/faq.md
index daa3d5b..13a8a2d 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -102,6 +102,11 @@ the source of the error. Solutions are to
- make the enclosing class serializable
- use a Java 8 lambda function.
+### In Scala API, I get an error about implicit values and evidence parameters
+
+It means that the implicit value for the type information could not be provided.
+Make sure that you have an `import org.apache.flink.api.scala._` statement in your code.
+
### I get an error message saying that not enough buffers are available. How do I fix this?
If you run Flink in a massively parallel setting (100+ parallel threads),
[08/17] flink git commit: [tachyon] Minor fix in codestyle and
warnings
Posted by se...@apache.org.
[tachyon] Minor fix in codestyle and warnings
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cd6da119
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cd6da119
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cd6da119
Branch: refs/heads/master
Commit: cd6da11955ce77db9e09105a7c3622afa5dc280d
Parents: 543453d
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Jan 10 18:37:09 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:30 2015 -0800
----------------------------------------------------------------------
.../src/test/java/org/apache/flink/tachyon/HDFSTest.java | 3 +--
.../org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/cd6da119/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/HDFSTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/HDFSTest.java b/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/HDFSTest.java
index 9b4abd4..8d29ea7 100644
--- a/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/HDFSTest.java
+++ b/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/HDFSTest.java
@@ -15,11 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.flink.tachyon;
+package org.apache.flink.tachyon;
import org.apache.commons.io.IOUtils;
-import org.apache.flink.core.fs.FSDataInputStream;
import org.apache.flink.core.fs.FileSystem;
import org.apache.flink.core.fs.Path;
import org.apache.flink.examples.java.wordcount.WordCount;
http://git-wip-us.apache.org/repos/asf/flink/blob/cd6da119/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java b/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
index f425a49..e1235b6 100644
--- a/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
+++ b/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
@@ -25,7 +25,6 @@ import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.examples.java.wordcount.WordCount;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.junit.After;
import org.junit.Assert;
@@ -114,7 +113,7 @@ public class TachyonFileSystemWrapperTest {
Configuration conf = new Configuration();
conf.addResource(HADOOP_CONFIG_PATH);
Assert.assertEquals("tachyon.hadoop.TFS", conf.get("fs.tachyon.impl", null));
- FileSystem hfs = tPath.getFileSystem(conf);
+ tPath.getFileSystem(conf);
} catch(Exception e) {
e.printStackTrace();
Assert.fail("Test failed with exception: "+e.getMessage());
[11/17] flink git commit: Fix for quickstart versions
Posted by se...@apache.org.
Fix for quickstart versions
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3836c961
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3836c961
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3836c961
Branch: refs/heads/master
Commit: 3836c9613947610a18dc4c97168a9e883b022513
Parents: 6f765db
Author: mbalassi <mb...@apache.org>
Authored: Wed Jan 14 11:41:13 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:28:16 2015 -0800
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3836c961/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index adc6ab5..86444c2 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -57,12 +57,12 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-core</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-connectors</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/3836c961/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index 49036e8..7ce030d 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -57,7 +57,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
[03/17] flink git commit: [docs] Clean up documentation figures -
Remove old unused figure image files - Add a file clarifying that figures are
licensed under ASL 2.0
Posted by se...@apache.org.
[docs] Clean up documentation figures
- Remove old unused figure image files
- Add a file clarifying that figures are licensed under ASL 2.0
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e7daefd7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e7daefd7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e7daefd7
Branch: refs/heads/master
Commit: e7daefd73ac6c7f7b025fbb35be284ba618e3adc
Parents: ce5ce6a
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Jan 10 17:22:57 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:22:29 2015 -0800
----------------------------------------------------------------------
docs/img/cogroup.svg | 875 -----------------------------------
docs/img/cross.svg | 912 -------------------------------------
docs/img/datatypes.svg | 162 -------
docs/img/join.svg | 634 --------------------------
docs/img/license.txt | 17 +
docs/img/map.svg | 314 -------------
docs/img/operator.svg | 260 -----------
docs/img/plan_visualizer1.png | Bin 68108 -> 0 bytes
docs/img/plan_visualizer2.png | Bin 149860 -> 0 bytes
docs/img/recorddm.svg | 282 ------------
docs/img/reduce.svg | 444 ------------------
11 files changed, 17 insertions(+), 3883 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/cogroup.svg
----------------------------------------------------------------------
diff --git a/docs/img/cogroup.svg b/docs/img/cogroup.svg
deleted file mode 100644
index 87bf765..0000000
--- a/docs/img/cogroup.svg
+++ /dev/null
@@ -1,875 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="195"
- id="svg35289"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="cogroup.svg">
- <defs
- id="defs35291">
- <marker
- inkscape:stockid="Arrow1Lstart"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow1Lstart"
- style="overflow:visible">
- <path
- id="path3855"
- d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
- transform="scale(0.8) translate(12.5,0)" />
- </marker>
- <marker
- inkscape:stockid="EmptyTriangleInM"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="EmptyTriangleInM"
- style="overflow:visible">
- <path
- id="path4009"
- d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
- style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt"
- transform="scale(-0.4) translate(-4.5,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lstart"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow2Lstart"
- style="overflow:visible">
- <path
- id="path3873"
- style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
- transform="scale(1.1) translate(1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow1Mstart"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow1Mstart"
- style="overflow:visible">
- <path
- id="path3861"
- d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
- transform="scale(0.4) translate(10,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow1Sstart"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow1Sstart"
- style="overflow:visible">
- <path
- id="path3867"
- d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
- transform="scale(0.2) translate(6,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35250"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35252"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35254"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35256"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35258"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35260"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-0"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-7"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35403"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35405"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35407"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35409"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35411"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35413"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-9"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-75"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35572"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35574"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35576"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35578"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35580"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35582"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35584"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35586"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35588"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35590"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-3"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-77"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35951"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35953"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35955"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35957"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35959"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35961"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35963"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35965"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35967"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35969"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-93"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-0"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker36515"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path36517"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker36519"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path36521"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker36523"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path36525"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker36527"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path36529"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker36531"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path36533"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-36"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-73"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.49497475"
- inkscape:cx="-657.23669"
- inkscape:cy="-312.51371"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="1161"
- inkscape:window-x="1400"
- inkscape:window-y="18"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata35294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-484.80217,-248.14373)">
- <g
- id="g34970"
- transform="translate(1902.9756,-921.79345)">
- <rect
- y="1225.0306"
- x="-1230.1406"
- height="136.06552"
- width="57.281994"
- id="rect2994-5-9-9-1"
- style="opacity:0.95999995;fill:#f3f3f3;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25" />
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40773951,0,0,0.41277147,-1308.0944,1915.8924)"
- id="g3792-4-1-79-5">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-93-9"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-2-4"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-8-9-5-4-4"
- transform="matrix(0.40773951,0,0,0.41277147,-1308.0944,1950.654)">
- <rect
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-46-8-3-2"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-9-7-7-0"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-1-0"
- transform="matrix(0.40773951,0,0,0.41277147,-1308.0944,2020.1768)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-2-0"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-2-0"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-8-4-7-0-0-8"
- transform="matrix(0.40773951,0,0,0.41277147,-1308.0944,1985.4152)">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-4-75-4-2-1"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-7-4-2-1-7"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <rect
- y="1173.7782"
- x="-1152.9976"
- height="32.716614"
- width="232.52985"
- id="rect2994-5-9-4-7-4"
- style="opacity:0.95999995;fill:#f3f3f3;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-2-4"
- d="m -1181.1127,1241.642 148.6025,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc"
- id="path4066-2-0-5-7-0"
- d="m -1181.1127,1276.4035 19.9637,14.4355 c 5.7719,-7.3309 13.2528,-0.6632 8.304,6.0044 l 19.8863,14.3795 219.2601,-0.059"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc"
- id="path4066-2-0-7-0-9"
- d="m -1181.1127,1311.1647 48.4175,-34.3028 100.4399,-0.4584"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-3-3-5"
- d="m -1181.1127,1345.9263 28.844,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-4-1"
- d="m -1068.1581,1200.5444 -0.4619,128.2519"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-5-6-0"
- d="m -948.6859,1200.4497 0.052,24.4359"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40773951,0,0,0.41277147,-1055.2752,1864.387)"
- id="g3792-4-1-1-7-1">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-9-5-9"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65632725;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-6-1-9"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.53030467;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-2-7-0"
- transform="matrix(0.40271073,0,0,0.40768065,-1173.5759,1856.0714)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.70198441;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-5-4-9"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.70198441;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-4-1-3"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <rect
- y="1297.5363"
- x="-909.70618"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-4-6"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <g
- id="g34054-2"
- transform="translate(261.32072,614.33529)">
- <g
- transform="matrix(0.40688131,0,0,0.41130412,-1252.1926,1369.3045)"
- id="g3792-8-5-02-5-8"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-7-9-9-0"
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-4-4-7-2"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.40688131,0,0,0.41130412,-1199.1018,1369.3045)"
- id="g3792-0-2-0-2-3-3-5-0"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none" />
- </g>
- <g
- transform="translate(-1.0606602,2.4748737)"
- id="g34960">
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0"
- id="rect2994-3-0-0-6-7"
- width="103.5"
- height="28.5"
- x="-1146.2062"
- y="1329.1628" />
- <g
- transform="translate(24.82072,575.33529)"
- id="g34070-5">
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-1-17-4-6-1"
- transform="matrix(0.40475762,0,0,0.40915735,-1251.7436,1436.4245)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-8-4-1-8-1"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-5-3-2-1-5"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-2-3-7-5-1"
- transform="matrix(0.40475762,0,0,0.40915735,-1198.4405,1436.4245)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-5-3-9-5-91"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-4-7-60-6-0"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- </g>
- </g>
- <g
- transform="translate(-400.5,92.5)"
- id="g34945">
- <rect
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.4999996, 4.4999996;stroke-dashoffset:0"
- id="rect2994-3-0-0-1-4"
- width="103.5"
- height="62.617905"
- x="-628.79382"
- y="1135.4185" />
- <g
- transform="translate(426.32072,486.33529)"
- id="g34078-4">
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1138.1239,1338.3958)"
- id="g3792-1-9-8-4-1">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-7-3-3-6-10"
- width="50"
- height="50"
- x="211.71547"
- y="-1660.405" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-8-6-83-2-5"
- width="50"
- height="50"
- x="261.71548"
- y="-1660.405" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1082.0231,1337.5985)"
- id="g3792-4-1-1-4-3-15" />
- </g>
- <g
- transform="translate(426.32073,519.81003)"
- id="g34078-4-5">
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1138.1239,1338.3958)"
- id="g3792-1-9-8-4-1-2">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-7-3-3-6-10-4"
- width="50"
- height="50"
- x="211.71547"
- y="-1660.405" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-8-6-83-2-5-6"
- width="50"
- height="50"
- x="261.71548"
- y="-1660.405" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1082.0231,1337.5985)"
- id="g3792-4-1-1-4-3-15-4">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-9-1-0-6-1"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-6-0-2-3-9"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- </g>
- </g>
- </g>
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc"
- id="path4066-2-0-9-4-1-2"
- d="m 669.67823,271.03445 22.75265,-0.035 -0.12654,35.13393"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <text
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- x="601.92139"
- y="275.3765"
- id="text39591"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan39593"
- x="601.92139"
- y="275.3765">Key Field</tspan></text>
- </g>
-</svg>
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/cross.svg
----------------------------------------------------------------------
diff --git a/docs/img/cross.svg b/docs/img/cross.svg
deleted file mode 100644
index 9a85093..0000000
--- a/docs/img/cross.svg
+++ /dev/null
@@ -1,912 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="195"
- id="svg35289"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="match.svg">
- <defs
- id="defs35291">
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35250"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35252"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35254"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35256"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35258"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35260"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-0"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-7"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35403"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35405"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35407"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35409"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35411"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35413"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-9"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-75"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35572"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35574"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35576"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35578"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35580"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35582"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35584"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35586"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35588"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35590"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow2Lend-3"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path4456-77"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35951"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35953"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35955"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35957"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35959"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35961"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35963"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35965"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="marker35967"
- style="overflow:visible">
- <path
- inkscape:connector-curvature="0"
- id="path35969"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="318.74501"
- inkscape:cy="39.054602"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1916"
- inkscape:window-height="570"
- inkscape:window-x="1400"
- inkscape:window-y="609"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata35294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-484.80217,-248.14373)">
- <g
- id="g35082"
- transform="translate(1984.0346,-344.20004)">
- <rect
- y="753.82758"
- x="-1055.1145"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-8"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="683.20093"
- x="-1171.0269"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-4"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="719.13367"
- x="-1171.0267"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-9"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="753.82758"
- x="-1171.0269"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-6"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="649.7262"
- x="-1055.1145"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-5"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="683.20093"
- x="-1055.1145"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-1"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="719.13367"
- x="-1055.1145"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0-3"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <rect
- y="595.75568"
- x="-1175.5856"
- height="31.868748"
- width="227.71063"
- id="rect2994-5-9-4-9"
- style="opacity:0.95999995;fill:#f3f3f3;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25" />
- <rect
- y="647.87219"
- x="-1250.59"
- height="136.05968"
- width="57.377071"
- id="rect2994-5-9-7"
- style="opacity:0.95999995;fill:#f3f3f3;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:25" />
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40795244,0,0,0.41238689,-1328.5519,1337.5985)"
- id="g3792-4-1-0">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-5"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-13"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-8-9-5-2"
- transform="matrix(0.40688131,0,0,0.41130412,-1328.2718,1370.405)">
- <rect
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-46-8-99"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-9-7-9"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-6"
- transform="matrix(0.40475762,0,0,0.40915735,-1327.7167,1436.4245)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-0"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-6"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-8-4-7-0-4"
- transform="matrix(0.40581951,0,0,0.41023078,-1327.9943,1403.4839)">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-1-4-75-4-3"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-0-7-4-2-05"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none"
- transform="matrix(0.40946483,0,0,0.41232107,-1082.4563,1285.2048)"
- id="g3792-4-1-1-41">
- <rect
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65060806;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-0-0-9-45"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65060806;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-5-7-6-8"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <g
- style="opacity:0.95999995;stroke-width:1.53030467;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3792-0-2-0-2-5"
- transform="matrix(0.40135661,0,0,0.4041563,-1197.5462,1271.8679)">
- <rect
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.72435784;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-4-2-4-5-1"
- width="50"
- height="50"
- x="211.42857"
- y="-1658.4716" />
- <rect
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.72435784;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2992-8-4-4-8-4-9"
- width="50"
- height="50"
- x="261.42859"
- y="-1658.4716" />
- </g>
- <rect
- y="649.7262"
- x="-1171.0269"
- height="28.5"
- width="103.5"
- id="rect2994-3-0-0"
- style="opacity:0.95999995;fill:#dddddd;fill-opacity:1;stroke:#000000;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.49999962, 4.49999962;stroke-dashoffset:0" />
- <g
- id="g34046">
- <g
- id="g3792-1-9-6"
- transform="matrix(0.40795244,0,0,0.41238689,-1252.5361,1338.3958)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1660.405"
- x="211.71547"
- height="50"
- width="50"
- id="rect2992-7-3-7"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1660.405"
- x="261.71548"
- height="50"
- width="50"
- id="rect2992-8-8-6-9"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.40795244,0,0,0.41238689,-1199.4354,1337.5985)"
- id="g3792-0-2-0-2-3-9"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-2-4-5-3-61"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-4-8-4-7-8"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34054">
- <g
- transform="matrix(0.40688131,0,0,0.41130412,-1252.1926,1369.3045)"
- id="g3792-8-5-02-5"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-7-9-9"
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-4-4-7"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.40688131,0,0,0.41130412,-1199.1018,1369.3045)"
- id="g3792-0-2-0-2-3-3-5"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-2-4-5-3-2-9"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-4-8-4-7-6-6"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34062">
- <g
- id="g3792-1-9-9-9"
- transform="matrix(0.40581951,0,0,0.41023078,-1252.0845,1404.2772)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1660.405"
- x="211.71547"
- height="50"
- width="50"
- id="rect2992-7-3-2-2"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1660.405"
- x="261.71548"
- height="50"
- width="50"
- id="rect2992-8-8-6-8-9"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.40581951,0,0,0.41023078,-1198.7711,1403.4839)"
- id="g3792-0-2-0-2-3-2-6"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-2-4-5-3-6-1"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-4-8-4-7-5-7"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34070">
- <g
- transform="matrix(0.40475762,0,0,0.40915735,-1251.7436,1436.4245)"
- id="g3792-0-1-17-4-6"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-8-4-1-8"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-5-3-2-1"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- transform="matrix(0.40475762,0,0,0.40915735,-1198.4405,1436.4245)"
- id="g3792-0-2-0-2-3-7-5"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-2-4-5-3-9-5"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-4-8-4-7-60-6"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34078">
- <g
- id="g3792-1-9-8-4"
- transform="matrix(0.40795244,0,0,0.41238689,-1138.1239,1338.3958)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1660.405"
- x="211.71547"
- height="50"
- width="50"
- id="rect2992-7-3-3-6"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1660.405"
- x="261.71548"
- height="50"
- width="50"
- id="rect2992-8-8-6-83-2"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3792-4-1-1-4-3"
- transform="matrix(0.40795244,0,0,0.41238689,-1082.0231,1337.5985)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-0-0-9-1-0"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-5-7-6-0-2"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.65707684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34086">
- <g
- transform="matrix(0.40688131,0,0,0.41130412,-1137.7804,1369.3045)"
- id="g3792-8-5-02-8-6"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-1-7-9-0-7"
- style="fill:#f3de4a;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-0-4-4-4-1"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3792-4-1-1-8-59"
- transform="matrix(0.40688131,0,0,0.41130412,-1081.6895,1369.3045)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-0-0-9-7-8"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-5-7-6-08-2"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.66670442;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34094">
- <g
- id="g3792-1-9-9-7-0"
- transform="matrix(0.40581951,0,0,0.41023078,-1137.6723,1404.2772)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1660.405"
- x="211.71547"
- height="50"
- width="50"
- id="rect2992-7-3-2-9-78"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1660.405"
- x="261.71548"
- height="50"
- width="50"
- id="rect2992-8-8-6-8-0-6"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3792-4-1-1-2-38"
- transform="matrix(0.40581951,0,0,0.41023078,-1081.3588,1403.4839)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-0-0-9-4-6"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-5-7-6-7-1"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.67629814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <g
- id="g34102">
- <g
- transform="matrix(0.40475762,0,0,0.40915735,-1137.3314,1436.4245)"
- id="g3792-0-1-17-4-8-1"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-4-8-4-1-9-8"
- style="fill:#f3b33f;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-4-5-3-2-0-6"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3792-4-1-1-3-6"
- transform="matrix(0.40475762,0,0,0.40915735,-1081.0281,1436.4245)"
- style="opacity:0.95999995;stroke-width:1.50000167;stroke-miterlimit:4;stroke-dasharray:none">
- <rect
- y="-1658.4716"
- x="211.42857"
- height="50"
- width="50"
- id="rect2992-0-0-9-9-6"
- style="fill:#4ecdc4;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- y="-1658.4716"
- x="261.42859"
- height="50"
- width="50"
- id="rect2992-8-5-7-6-2-1"
- style="fill:#e0e4cc;fill-opacity:1;stroke:#000000;stroke-width:3.68594265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- </g>
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-34"
- d="m -1201.5038,663.97626 25.9157,-0.11419"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-5-0"
- d="m -1201.5574,698.55143 25.9693,0"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-7-9"
- d="m -1201.6105,733.38363 26.0224,-0.14274"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-3-6"
- d="m -1201.6636,768.07765 26.0755,-0.1474"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-8"
- d="m -1092.6535,621.72237 -0.1005,25.32033"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- id="path4066-2-0-9-5-2"
- d="m -975.21023,621.80923 0,23.97522"
- style="opacity:0.95999995;fill:none;stroke:#000000;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow2Lend)" />
- </g>
- </g>
-</svg>
http://git-wip-us.apache.org/repos/asf/flink/blob/e7daefd7/docs/img/datatypes.svg
----------------------------------------------------------------------
diff --git a/docs/img/datatypes.svg b/docs/img/datatypes.svg
deleted file mode 100644
index 32e3319..0000000
--- a/docs/img/datatypes.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="800"
- height="85.809998"
- id="svg5014"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="datatypes.svg">
- <defs
- id="defs5016" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.7"
- inkscape:cx="-61.192684"
- inkscape:cy="64.192611"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:snap-global="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:window-width="1916"
- inkscape:window-height="747"
- inkscape:window-x="1400"
- inkscape:window-y="18"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata5019">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-110.75,-300.24867)">
- <g
- id="g5646"
- transform="translate(223.38524,-2.9974298)">
- <rect
- y="307.24353"
- x="113.73705"
- height="28.124744"
- width="28.797562"
- id="rect2985-5-8"
- style="fill:#666666;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <rect
- y="345.68823"
- x="113.73705"
- height="28.124744"
- width="28.797562"
- id="rect2985-5-4"
- style="fill:#f3b33f;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <text
- transform="scale(1.0155339,0.98470371)"
- sodipodi:linespacing="125%"
- id="text4753"
- y="331.45355"
- x="147.99387"
- style="font-size:17.57638931px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:14.64699078px"
- id="tspan4757"
- y="331.45355"
- x="147.99387"
- sodipodi:role="line"><tspan
- id="tspan5642"
- style="font-size:16px">Value</tspan>:</tspan></text>
- <text
- transform="scale(1.0155339,0.98470371)"
- inkscape:transform-center-y="24.124547"
- inkscape:transform-center-x="73.131734"
- sodipodi:linespacing="125%"
- id="text4827"
- y="369.04004"
- x="147.99387"
- style="font-size:17.57638931px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
- xml:space="preserve"><tspan
- style="font-size:14.64699078px"
- y="369.04004"
- x="147.99387"
- id="tspan4829"
- sodipodi:role="line"><tspan
- id="tspan5644"
- style="font-size:16px">Key</tspan>:</tspan></text>
- <text
- transform="scale(1.0155339,0.98470371)"
- sodipodi:linespacing="125%"
- id="text5588"
- y="331.45355"
- x="195.89445"
- style="font-size:17.57638931px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Courier New;-inkscape-font-specification:Courier New"
- xml:space="preserve"><tspan
- style="font-size:16px"
- y="331.45355"
- x="195.89445"
- id="tspan5590"
- sodipodi:role="line">Serialize(), Deserialize()</tspan></text>
- <text
- transform="scale(1.0155339,0.98470371)"
- sodipodi:linespacing="125%"
- id="text5588-5"
- y="369.04004"
- x="195.89445"
- style="font-size:17.57638931px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Courier New;-inkscape-font-specification:Courier New"
- xml:space="preserve"><tspan
- style="font-size:16px"
- y="369.04004"
- x="195.89445"
- id="tspan5590-2"
- sodipodi:role="line">Serialize(), Deserialize(), </tspan><tspan
- id="tspan5613"
- style="font-size:16px"
- y="389.04004"
- x="195.89445"
- sodipodi:role="line">Hash(), Compare(Key)</tspan></text>
- </g>
- </g>
-</svg>
[14/17] flink git commit: [maven] Fix project name and inception year
Posted by se...@apache.org.
[maven] Fix project name and inception year
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a22f9948
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a22f9948
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a22f9948
Branch: refs/heads/master
Commit: a22f99480e9fdb1368f255fb545f94540932ab8b
Parents: e818729
Author: Stephan Ewen <se...@apache.org>
Authored: Sun Jan 18 09:30:33 2015 -0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:58:21 2015 -0800
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/a22f9948/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0ad423c..bcff76f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,10 @@ under the License.
<artifactId>flink-parent</artifactId>
<version>0.9-SNAPSHOT</version>
- <name>Apache Flink</name>
+ <name>flink</name>
<packaging>pom</packaging>
<url>http://flink.apache.org</url>
- <inceptionYear>2015</inceptionYear>
+ <inceptionYear>2014</inceptionYear>
<licenses>
<license>
[16/17] flink git commit: [FLINK-1382][java] Adds the new basic types
Void and Date to the TypeInfoParser
Posted by se...@apache.org.
[FLINK-1382][java] Adds the new basic types Void and Date to the TypeInfoParser
This closes #299
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9cd96df7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9cd96df7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9cd96df7
Branch: refs/heads/master
Commit: 9cd96df752ed03b8e649d82d6df71ab1f400ee70
Parents: a22f994
Author: twalthr <in...@twalthr.com>
Authored: Mon Jan 12 12:34:46 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:58:21 2015 -0800
----------------------------------------------------------------------
.../api/java/typeutils/TypeInfoParser.java | 21 ++++++++++++++++++--
.../api/java/typeutils/TypeInfoParserTest.java | 5 +++++
2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/9cd96df7/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java
index e9d5dac..98373da 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java
@@ -40,8 +40,9 @@ public class TypeInfoParser {
private static final Pattern writablePattern = Pattern.compile("^((" + WRITABLE_PACKAGE.replaceAll("\\.", "\\\\.") + "\\.)?Writable)<([^\\s,>]*)(,|>|$)");
private static final Pattern enumPattern = Pattern.compile("^((java\\.lang\\.)?Enum)<([^\\s,>]*)(,|>|$)");
private static final Pattern basicTypePattern = Pattern
- .compile("^((java\\.lang\\.)?(String|Integer|Byte|Short|Character|Double|Float|Long|Boolean))(,|>|$)");
- private static final Pattern basicType2Pattern = Pattern.compile("^(int|byte|short|char|double|float|long|boolean)(,|>|$)");
+ .compile("^((java\\.lang\\.)?(String|Integer|Byte|Short|Character|Double|Float|Long|Boolean|Void))(,|>|$)");
+ private static final Pattern basicTypeDatePattern = Pattern.compile("^((java\\.util\\.)?Date)(,|>|$)");
+ private static final Pattern basicType2Pattern = Pattern.compile("^(int|byte|short|char|double|float|long|boolean|void)(,|>|$)");
private static final Pattern valueTypePattern = Pattern.compile("^((" + VALUE_PACKAGE.replaceAll("\\.", "\\\\.")
+ "\\.)?(String|Int|Byte|Short|Char|Double|Float|Long|Boolean|List|Map|Null))Value(,|>|$)");
private static final Pattern basicArrayTypePattern = Pattern
@@ -105,6 +106,7 @@ public class TypeInfoParser {
final Matcher enumMatcher = enumPattern.matcher(infoString);
final Matcher basicTypeMatcher = basicTypePattern.matcher(infoString);
+ final Matcher basicTypeDateMatcher = basicTypeDatePattern.matcher(infoString);
final Matcher basicType2Matcher = basicType2Pattern.matcher(infoString);
final Matcher valueTypeMatcher = valueTypePattern.matcher(infoString);
@@ -194,6 +196,19 @@ public class TypeInfoParser {
}
returnType = BasicTypeInfo.getInfoFor(clazz);
}
+ // special basic type "Date"
+ else if (basicTypeDateMatcher.find()) {
+ String className = basicTypeDateMatcher.group(1);
+ sb.delete(0, className.length());
+ Class<?> clazz;
+ // check if fully qualified
+ if (className.startsWith("java.util")) {
+ clazz = Class.forName(className);
+ } else {
+ clazz = Class.forName("java.util." + className);
+ }
+ returnType = BasicTypeInfo.getInfoFor(clazz);
+ }
// basic type of primitives
else if (basicType2Matcher.find()) {
String className = basicType2Matcher.group(1);
@@ -216,6 +231,8 @@ public class TypeInfoParser {
clazz = Long.class;
} else if (className.equals("boolean")) {
clazz = Boolean.class;
+ } else if (className.equals("void")) {
+ clazz = Void.class;
}
returnType = BasicTypeInfo.getInfoFor(clazz);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/9cd96df7/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
index 9153d8d..e539ada 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
@@ -62,6 +62,8 @@ public class TypeInfoParserTest {
Assert.assertEquals(BasicTypeInfo.CHAR_TYPE_INFO, TypeInfoParser.parse("Character"));
Assert.assertEquals(BasicTypeInfo.STRING_TYPE_INFO, TypeInfoParser.parse("String"));
Assert.assertEquals(BasicTypeInfo.BOOLEAN_TYPE_INFO, TypeInfoParser.parse("Boolean"));
+ Assert.assertEquals(BasicTypeInfo.VOID_TYPE_INFO, TypeInfoParser.parse("Void"));
+ Assert.assertEquals(BasicTypeInfo.DATE_TYPE_INFO, TypeInfoParser.parse("Date"));
Assert.assertEquals(BasicTypeInfo.INT_TYPE_INFO, TypeInfoParser.parse("java.lang.Integer"));
Assert.assertEquals(BasicTypeInfo.DOUBLE_TYPE_INFO, TypeInfoParser.parse("java.lang.Double"));
@@ -72,6 +74,8 @@ public class TypeInfoParserTest {
Assert.assertEquals(BasicTypeInfo.CHAR_TYPE_INFO, TypeInfoParser.parse("java.lang.Character"));
Assert.assertEquals(BasicTypeInfo.STRING_TYPE_INFO, TypeInfoParser.parse("java.lang.String"));
Assert.assertEquals(BasicTypeInfo.BOOLEAN_TYPE_INFO, TypeInfoParser.parse("java.lang.Boolean"));
+ Assert.assertEquals(BasicTypeInfo.VOID_TYPE_INFO, TypeInfoParser.parse("java.lang.Void"));
+ Assert.assertEquals(BasicTypeInfo.DATE_TYPE_INFO, TypeInfoParser.parse("java.util.Date"));
Assert.assertEquals(BasicTypeInfo.INT_TYPE_INFO, TypeInfoParser.parse("int"));
Assert.assertEquals(BasicTypeInfo.DOUBLE_TYPE_INFO, TypeInfoParser.parse("double"));
@@ -81,6 +85,7 @@ public class TypeInfoParserTest {
Assert.assertEquals(BasicTypeInfo.LONG_TYPE_INFO, TypeInfoParser.parse("long"));
Assert.assertEquals(BasicTypeInfo.CHAR_TYPE_INFO, TypeInfoParser.parse("char"));
Assert.assertEquals(BasicTypeInfo.BOOLEAN_TYPE_INFO, TypeInfoParser.parse("boolean"));
+ Assert.assertEquals(BasicTypeInfo.VOID_TYPE_INFO, TypeInfoParser.parse("void"));
}
@Test