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. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="hive-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="hive-wf"> <start to="hive-node"/> <action name="hive-node"> - <hive xmlns="uri:oozie:hive-action:0.2"> - <job-tracker>${jobTracker}</job-tracker> + <hive xmlns="uri:oozie:hive-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/hive"/> 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. --> -<workflow-app xmlns="uri:oozie:workflow:0.5" name="hive-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="hive-wf"> <credentials> <credential name='hcatauth' type='hcat'> <property> @@ -32,8 +32,8 @@ <start to="hive-node"/> <action name="hive-node" cred="hcatauth"> - <hive xmlns="uri:oozie:hive-action:0.3"> - <job-tracker>${jobTracker}</job-tracker> + <hive xmlns="uri:oozie:hive-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/hive"/> 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:10000/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:10000/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. --> -<workflow-app xmlns="uri:oozie:workflow:0.5" name="hive2-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="hive2-wf"> <start to="hive2-node"/> <action name="hive2-node"> - <hive2 xmlns="uri:oozie:hive2-action:0.1"> - <job-tracker>${jobTracker}</job-tracker> + <hive2 xmlns="uri:oozie:hive2-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/hive2"/> 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. --> -<workflow-app xmlns="uri:oozie:workflow:0.5" name="hive2-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="hive2-wf"> <credentials> <credential name="hs2-creds" type="hive2"> <property> @@ -32,8 +32,8 @@ <start to="hive2-node"/> <action name="hive2-node" cred="hs2-creds"> - <hive2 xmlns="uri:oozie:hive2-action:0.1"> - <job-tracker>${jobTracker}</job-tracker> + <hive2 xmlns="uri:oozie:hive2-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/hive2"/> 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/java-main/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/java-main/workflow.xml b/examples/src/main/apps/java-main/workflow.xml index 98e01ca..113e525 100644 --- a/examples/src/main/apps/java-main/workflow.xml +++ b/examples/src/main/apps/java-main/workflow.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="java-main-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="java-main-wf"> <start to="java-node"/> <action name="java-node"> <java> - <job-tracker>${jobTracker}</job-tracker> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <configuration> <property> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/map-reduce/job-with-config-class.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/map-reduce/job-with-config-class.properties b/examples/src/main/apps/map-reduce/job-with-config-class.properties index 0b14cb7..5c71469 100644 --- a/examples/src/main/apps/map-reduce/job-with-config-class.properties +++ b/examples/src/main/apps/map-reduce/job-with-config-class.properties @@ -17,7 +17,7 @@ # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8021 queueName=default examplesRoot=examples http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/map-reduce/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/map-reduce/job.properties b/examples/src/main/apps/map-reduce/job.properties index 7115229..d75ed23 100644 --- a/examples/src/main/apps/map-reduce/job.properties +++ b/examples/src/main/apps/map-reduce/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/map-reduce/workflow-with-config-class.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/map-reduce/workflow-with-config-class.xml b/examples/src/main/apps/map-reduce/workflow-with-config-class.xml index 0deab66..76c09e6 100644 --- a/examples/src/main/apps/map-reduce/workflow-with-config-class.xml +++ b/examples/src/main/apps/map-reduce/workflow-with-config-class.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.5" name="map-reduce-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="map-reduce-wf"> <start to="mr-node"/> <action name="mr-node"> <map-reduce> - <job-tracker>${jobTracker}</job-tracker> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/${outputDir}"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/map-reduce/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/map-reduce/workflow.xml b/examples/src/main/apps/map-reduce/workflow.xml index 7fe7fdb..c9050cb 100644 --- a/examples/src/main/apps/map-reduce/workflow.xml +++ b/examples/src/main/apps/map-reduce/workflow.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="map-reduce-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="map-reduce-wf"> <start to="mr-node"/> <action name="mr-node"> <map-reduce> - <job-tracker>${jobTracker}</job-tracker> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/${outputDir}"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/no-op/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/no-op/job.properties b/examples/src/main/apps/no-op/job.properties index a839dbb..8b08f02 100644 --- a/examples/src/main/apps/no-op/job.properties +++ b/examples/src/main/apps/no-op/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/no-op/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/no-op/workflow.xml b/examples/src/main/apps/no-op/workflow.xml index a5277d0..ad61dfc 100644 --- a/examples/src/main/apps/no-op/workflow.xml +++ b/examples/src/main/apps/no-op/workflow.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="no-op-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="no-op-wf"> <start to="end"/> <end name="end"/> </workflow-app> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/pig/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/pig/job.properties b/examples/src/main/apps/pig/job.properties index 53e94ea..63f81dd 100644 --- a/examples/src/main/apps/pig/job.properties +++ b/examples/src/main/apps/pig/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/pig/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/pig/workflow.xml b/examples/src/main/apps/pig/workflow.xml index 8da2b66..3221efe 100644 --- a/examples/src/main/apps/pig/workflow.xml +++ b/examples/src/main/apps/pig/workflow.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="pig-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="pig-wf"> <start to="pig-node"/> <action name="pig-node"> <pig> - <job-tracker>${jobTracker}</job-tracker> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/pig"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/pyspark/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/pyspark/job.properties b/examples/src/main/apps/pyspark/job.properties index 72e09b9..b3c70ad 100644 --- a/examples/src/main/apps/pyspark/job.properties +++ b/examples/src/main/apps/pyspark/job.properties @@ -17,7 +17,7 @@ # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8032 queueName=default examplesRoot=examples oozie.use.system.libpath=true http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/pyspark/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/pyspark/workflow.xml b/examples/src/main/apps/pyspark/workflow.xml index 4768a6c..3eddec9 100644 --- a/examples/src/main/apps/pyspark/workflow.xml +++ b/examples/src/main/apps/pyspark/workflow.xml @@ -16,13 +16,13 @@ limitations under the License. --> -<workflow-app xmlns='uri:oozie:workflow:0.5' name='SparkPythonPi'> +<workflow-app xmlns='uri:oozie:workflow:1.0' name='SparkPythonPi'> <start to='spark-node' /> <action name='spark-node'> <spark xmlns="uri:oozie:spark-action:0.1"> - <job-tracker>${jobTracker}</job-tracker> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <master>${master}</master> <name>Python-Spark-Pi</name> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/shell/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/shell/job.properties b/examples/src/main/apps/shell/job.properties index bbc7654..df0338e 100644 --- a/examples/src/main/apps/shell/job.properties +++ b/examples/src/main/apps/shell/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/shell/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/shell/workflow.xml b/examples/src/main/apps/shell/workflow.xml index 46566bd..d2b73c0 100644 --- a/examples/src/main/apps/shell/workflow.xml +++ b/examples/src/main/apps/shell/workflow.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.4" name="shell-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="shell-wf"> <start to="shell-node"/> <action name="shell-node"> - <shell xmlns="uri:oozie:shell-action:0.2"> - <job-tracker>${jobTracker}</job-tracker> + <shell xmlns="uri:oozie:shell-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <configuration> <property> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/sla/coordinator.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sla/coordinator.xml b/examples/src/main/apps/sla/coordinator.xml index 10e9ea3..2bd2623 100644 --- a/examples/src/main/apps/sla/coordinator.xml +++ b/examples/src/main/apps/sla/coordinator.xml @@ -48,8 +48,8 @@ <app-path>${nameNode}/user/${coord:user()}/${examplesRoot}/apps/sla/workflow.xml</app-path> <configuration> <property> - <name>jobTracker</name> - <value>${jobTracker}</value> + <name>resourceManager</name> + <value>${resourceManager}</value> </property> <property> <name>nameNode</name> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/sla/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sla/job.properties b/examples/src/main/apps/sla/job.properties index 698ec6d..c7cb1bd 100644 --- a/examples/src/main/apps/sla/job.properties +++ b/examples/src/main/apps/sla/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/sla/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sla/workflow.xml b/examples/src/main/apps/sla/workflow.xml index 484091a..3bfa6a0 100644 --- a/examples/src/main/apps/sla/workflow.xml +++ b/examples/src/main/apps/sla/workflow.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.5" xmlns:sla="uri:oozie:sla:0.2" name="one-op-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" xmlns:sla="uri:oozie:sla:0.2" name="one-op-wf"> <start to="action1"/> <action name="action1"> <fs/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/spark/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/spark/job.properties b/examples/src/main/apps/spark/job.properties index a509db0..698711a 100644 --- a/examples/src/main/apps/spark/job.properties +++ b/examples/src/main/apps/spark/job.properties @@ -17,9 +17,9 @@ # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8032 master=local[*] queueName=default examplesRoot=examples oozie.use.system.libpath=true -oozie.wf.application.path=${nameNode}/user/${user.name}/${examplesRoot}/apps/spark \ No newline at end of file +oozie.wf.application.path=${nameNode}/user/${user.name}/${examplesRoot}/apps/spark http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/spark/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/spark/workflow.xml b/examples/src/main/apps/spark/workflow.xml index 1b1a3e8..2ae576b 100644 --- a/examples/src/main/apps/spark/workflow.xml +++ b/examples/src/main/apps/spark/workflow.xml @@ -15,12 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns='uri:oozie:workflow:0.5' name='SparkFileCopy'> +<workflow-app xmlns='uri:oozie:workflow:1.0' name='SparkFileCopy'> <start to='spark-node' /> <action name='spark-node'> - <spark xmlns="uri:oozie:spark-action:0.1"> - <job-tracker>${jobTracker}</job-tracker> + <spark xmlns="uri:oozie:spark-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/spark"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/sqoop-freeform/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sqoop-freeform/job.properties b/examples/src/main/apps/sqoop-freeform/job.properties index 306421a..bfc5da4 100644 --- a/examples/src/main/apps/sqoop-freeform/job.properties +++ b/examples/src/main/apps/sqoop-freeform/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/sqoop-freeform/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sqoop-freeform/workflow.xml b/examples/src/main/apps/sqoop-freeform/workflow.xml index 1097da3..88441f6 100644 --- a/examples/src/main/apps/sqoop-freeform/workflow.xml +++ b/examples/src/main/apps/sqoop-freeform/workflow.xml @@ -16,12 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="sqoop-freeform-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="sqoop-freeform-wf"> <start to="sqoop-freeform-node"/> <action name="sqoop-freeform-node"> - <sqoop xmlns="uri:oozie:sqoop-action:0.2"> - <job-tracker>${jobTracker}</job-tracker> + <sqoop xmlns="uri:oozie:sqoop-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/sqoop-freeform"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/sqoop/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sqoop/job.properties b/examples/src/main/apps/sqoop/job.properties index afc4de8..7d5d36b 100644 --- a/examples/src/main/apps/sqoop/job.properties +++ b/examples/src/main/apps/sqoop/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/sqoop/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/sqoop/workflow.xml b/examples/src/main/apps/sqoop/workflow.xml index 0ae05a1..e4d76e1 100644 --- a/examples/src/main/apps/sqoop/workflow.xml +++ b/examples/src/main/apps/sqoop/workflow.xml @@ -16,12 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="sqoop-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="sqoop-wf"> <start to="sqoop-node"/> <action name="sqoop-node"> - <sqoop xmlns="uri:oozie:sqoop-action:0.2"> - <job-tracker>${jobTracker}</job-tracker> + <sqoop xmlns="uri:oozie:sqoop-action:1.0"> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/sqoop"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/ssh/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/ssh/job.properties b/examples/src/main/apps/ssh/job.properties index 540db02..2dd670f 100644 --- a/examples/src/main/apps/ssh/job.properties +++ b/examples/src/main/apps/ssh/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/ssh/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/ssh/workflow.xml b/examples/src/main/apps/ssh/workflow.xml index 4b53a8b..086241e 100644 --- a/examples/src/main/apps/ssh/workflow.xml +++ b/examples/src/main/apps/ssh/workflow.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="ssh-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="ssh-wf"> <start to="ssh"/> <action name="ssh"> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/streaming/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/streaming/job.properties b/examples/src/main/apps/streaming/job.properties index 83ea2c3..981e64d 100644 --- a/examples/src/main/apps/streaming/job.properties +++ b/examples/src/main/apps/streaming/job.properties @@ -17,7 +17,7 @@ # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8032 queueName=default examplesRoot=examples streamingMapper=/bin/cat http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/streaming/job.windows.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/streaming/job.windows.properties b/examples/src/main/apps/streaming/job.windows.properties index b216d3e..2fd92c2 100644 --- a/examples/src/main/apps/streaming/job.windows.properties +++ b/examples/src/main/apps/streaming/job.windows.properties @@ -17,7 +17,7 @@ # nameNode=hdfs://localhost:8020 -jobTracker=localhost:8021 +resourceManager=localhost:8021 queueName=default examplesRoot=examples streamingMapper=powershell -command "$input | Write-Host" http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/streaming/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/streaming/workflow.xml b/examples/src/main/apps/streaming/workflow.xml index feae1d2..6a5257f 100644 --- a/examples/src/main/apps/streaming/workflow.xml +++ b/examples/src/main/apps/streaming/workflow.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="streaming-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="streaming-wf"> <start to="streaming-node"/> <action name="streaming-node"> <map-reduce> - <job-tracker>${jobTracker}</job-tracker> + <resource-manager>${resourceManager}</resource-manager> <name-node>${nameNode}</name-node> <prepare> <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/streaming"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/main/apps/subwf/job.properties ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/subwf/job.properties b/examples/src/main/apps/subwf/job.properties index 3c9af19..26d83c7 100644 --- a/examples/src/main/apps/subwf/job.properties +++ b/examples/src/main/apps/subwf/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/subwf/workflow.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/subwf/workflow.xml b/examples/src/main/apps/subwf/workflow.xml index 9873a50..94fe986 100644 --- a/examples/src/main/apps/subwf/workflow.xml +++ b/examples/src/main/apps/subwf/workflow.xml @@ -15,15 +15,15 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.2" name="subwf-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="subwf-wf"> <start to="subworkflow-node"/> <action name="subworkflow-node"> <sub-workflow> <app-path>${nameNode}/user/${wf:user()}/${examplesRoot}/apps/map-reduce</app-path> <configuration> <property> - <name>jobTracker</name> - <value>${jobTracker}</value> + <name>resourceManager</name> + <value>${resourceManager}</value> </property> <property> <name>nameNode</name> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/examples/src/test/resources/localoozieexample-wf.xml ---------------------------------------------------------------------- diff --git a/examples/src/test/resources/localoozieexample-wf.xml b/examples/src/test/resources/localoozieexample-wf.xml index c1eba55..5ec7c87 100644 --- a/examples/src/test/resources/localoozieexample-wf.xml +++ b/examples/src/test/resources/localoozieexample-wf.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<workflow-app xmlns="uri:oozie:workflow:0.1" name="localoozieexample-wf"> +<workflow-app xmlns="uri:oozie:workflow:1.0" name="localoozieexample-wf"> <start to="d"/> <decision name="d"> <switch> http://git-wip-us.apache.org/repos/asf/oozie/blob/da8e5b51/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index aa8c79a..5e503fc 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2814 OYA: Update example workflows to newest schemas (asasvari via gezapeti) OOZIE-2585 Remove test case TestPartitionDependencyManagerEhcache.testMemoryUsageAndSpeedOverflowToDisk and testMemoryUsageAndSpeed (pbacsko via gezapeti) OOZIE-2957 Documentation states that starting a coordinator is possible (Jan Hentschel via gezapeti) OOZIE-3182 Oozie components fail with checkstyle errors (alishap via andras.piros)
