[2/2] oozie git commit: OOZIE-2814 OYA: Update example workflows to newest schemas (asasvari via gezapeti)
OOZIE-2814 OYA: Update example workflows to newest schemas (asasvari via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/da8e5b51 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/da8e5b51 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/da8e5b51 Branch: refs/heads/master Commit: da8e5b5184a0afba033ae5358b7ca6a03a38b618 Parents: 09df58f Author: Gezapeti Cseh Authored: Wed Mar 14 13:17:01 2018 +0100 Committer: Gezapeti Cseh Committed: Wed Mar 14 13:17:09 2018 +0100 -- client/src/main/resources/distcp-action-1.0.xsd | 39 +++ .../oozie/action/hadoop/JavaActionExecutor.java | 14 +- .../workflow/lite/LiteWorkflowAppParser.java| 66 +++- core/src/main/resources/oozie-default.xml | 13 +- .../action/hadoop/TestJavaActionExecutor.java | 83 - .../lite/TestLiteWorkflowAppParser.java | 321 --- .../apps/aggregator/coordinator-with-offset.xml | 4 +- .../src/main/apps/aggregator/coordinator.xml| 4 +- .../apps/aggregator/job-with-offset.properties | 2 +- .../src/main/apps/aggregator/job.properties | 2 +- examples/src/main/apps/aggregator/workflow.xml | 4 +- examples/src/main/apps/bundle/job.properties| 2 +- .../main/apps/coord-input-logic/job.properties | 2 +- .../main/apps/coord-input-logic/workflow.xml| 4 +- .../src/main/apps/cron-schedule/coordinator.xml | 4 +- .../src/main/apps/cron-schedule/job.properties | 2 +- .../src/main/apps/cron-schedule/workflow.xml| 2 +- examples/src/main/apps/cron/coordinator.xml | 4 +- examples/src/main/apps/cron/job.properties | 2 +- examples/src/main/apps/cron/workflow.xml| 2 +- .../src/main/apps/custom-main/job.properties| 2 +- examples/src/main/apps/custom-main/workflow.xml | 6 +- .../main/apps/datelist-java-main/job.properties | 2 +- .../main/apps/datelist-java-main/workflow.xml | 4 +- examples/src/main/apps/demo/job.properties | 2 +- .../src/main/apps/demo/job.windows.properties | 2 +- examples/src/main/apps/demo/workflow.xml| 8 +- examples/src/main/apps/distcp/job.properties| 2 +- examples/src/main/apps/distcp/workflow.xml | 6 +- examples/src/main/apps/hadoop-el/job.properties | 2 +- examples/src/main/apps/hadoop-el/workflow.xml | 4 +- examples/src/main/apps/hcatalog/job.properties | 2 +- .../main/apps/hcatalog/job.properties.security | 2 +- examples/src/main/apps/hcatalog/workflow.xml| 4 +- .../main/apps/hcatalog/workflow.xml.security| 4 +- examples/src/main/apps/hive/job.properties | 2 +- examples/src/main/apps/hive/workflow.xml| 6 +- .../src/main/apps/hive/workflow.xml.security| 6 +- examples/src/main/apps/hive2/job.properties | 2 +- .../src/main/apps/hive2/job.properties.security | 2 +- examples/src/main/apps/hive2/workflow.xml | 6 +- .../src/main/apps/hive2/workflow.xml.security | 6 +- examples/src/main/apps/java-main/job.properties | 2 +- examples/src/main/apps/java-main/workflow.xml | 4 +- .../map-reduce/job-with-config-class.properties | 2 +- .../src/main/apps/map-reduce/job.properties | 2 +- .../map-reduce/workflow-with-config-class.xml | 4 +- examples/src/main/apps/map-reduce/workflow.xml | 4 +- examples/src/main/apps/no-op/job.properties | 2 +- examples/src/main/apps/no-op/workflow.xml | 2 +- examples/src/main/apps/pig/job.properties | 2 +- examples/src/main/apps/pig/workflow.xml | 4 +- examples/src/main/apps/pyspark/job.properties | 2 +- examples/src/main/apps/pyspark/workflow.xml | 4 +- examples/src/main/apps/shell/job.properties | 2 +- examples/src/main/apps/shell/workflow.xml | 6 +- examples/src/main/apps/sla/coordinator.xml | 4 +- examples/src/main/apps/sla/job.properties | 2 +- examples/src/main/apps/sla/workflow.xml | 2 +- examples/src/main/apps/spark/job.properties | 4 +- examples/src/main/apps/spark/workflow.xml | 6 +- .../src/main/apps/sqoop-freeform/job.properties | 2 +- .../src/main/apps/sqoop-freeform/workflow.xml | 6 +- examples/src/main/apps/sqoop/job.properties | 2 +- examples/src/main/apps/sqoop/workflow.xml | 6 +- examples/src/main/apps/ssh/job.properties | 2 +- examples/src/main/apps/ssh/workflow.xml | 2 +- examples/src/main/apps/streaming/job.properties | 2 +- .../main/apps/streaming/job.windows.properties | 2 +- examples/src/main/apps/streaming/workflow.xml | 4 +- examples/src/main/apps/subwf/job.properties | 2 +- examples/src/main/apps/subwf/workflow.xml | 6 +- .../src/test/resources/localoozieexample-wf.xml | 2 +- release-log.txt | 1 + 74 files changed, 422 insertions(+), 335 de
[1/2] oozie git commit: OOZIE-2814 OYA: Update example workflows to newest schemas (asasvari via gezapeti)
Repository: oozie Updated Branches: refs/heads/master 09df58f91 -> da8e5b518 http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/hive/workflow.xml -- diff --git a/examples/src/main/apps/hive/workflow.xml b/examples/src/main/apps/hive/workflow.xml index 449d62d..a875a3a 100644 --- a/examples/src/main/apps/hive/workflow.xml +++ b/examples/src/main/apps/hive/workflow.xml @@ -16,12 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - -${jobTracker} + +${resourceManager} ${nameNode} http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/hive/workflow.xml.security -- diff --git a/examples/src/main/apps/hive/workflow.xml.security b/examples/src/main/apps/hive/workflow.xml.security index 3532131..2e9efd8 100644 --- a/examples/src/main/apps/hive/workflow.xml.security +++ b/examples/src/main/apps/hive/workflow.xml.security @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -32,8 +32,8 @@ - -${jobTracker} + +${resourceManager} ${nameNode} http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/hive2/job.properties -- diff --git a/examples/src/main/apps/hive2/job.properties b/examples/src/main/apps/hive2/job.properties index 2640402..55e7544 100644 --- a/examples/src/main/apps/hive2/job.properties +++ b/examples/src/main/apps/hive2/job.properties @@ -16,7 +16,7 @@ # limitations under the License. # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8032 queueName=default jdbcURL=jdbc:hive2://localhost:1/default examplesRoot=examples http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/hive2/job.properties.security -- diff --git a/examples/src/main/apps/hive2/job.properties.security b/examples/src/main/apps/hive2/job.properties.security index ac980cd..4c95362 100644 --- a/examples/src/main/apps/hive2/job.properties.security +++ b/examples/src/main/apps/hive2/job.properties.security @@ -16,7 +16,7 @@ # limitations under the License. # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8021 queueName=default jdbcURL=jdbc:hive2://localhost:1/default jdbcPrincipal=hive/localh...@example.com http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/hive2/workflow.xml -- diff --git a/examples/src/main/apps/hive2/workflow.xml b/examples/src/main/apps/hive2/workflow.xml index 5f1ccc4..24cbad7 100644 --- a/examples/src/main/apps/hive2/workflow.xml +++ b/examples/src/main/apps/hive2/workflow.xml @@ -16,12 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - -${jobTracker} + +${resourceManager} ${nameNode} http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/hive2/workflow.xml.security -- diff --git a/examples/src/main/apps/hive2/workflow.xml.security b/examples/src/main/apps/hive2/workflow.xml.security index 6f7304d..afa19fc 100644 --- a/examples/src/main/apps/hive2/workflow.xml.security +++ b/examples/src/main/apps/hive2/workflow.xml.security @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -32,8 +32,8 @@ - -${jobTracker} + +${resourceManager} ${nameNode} http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/java-main/job.properties -- diff --git a/examples/src/main/apps/java-main/job.properties b/examples/src/main/apps/java-main/job.properties index 519c53e..2af71af 100644 --- a/examples/src/main/apps/java-main/job.properties +++ b/examples/src/main/apps/java-main/job.properties @@ -17,7 +17,7 @@ # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8032 queueName=default examplesRoot=examples http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/