You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2013/09/10 19:48:04 UTC

svn commit: r1521561 - in /oozie/trunk: ./ examples/src/main/apps/demo/ examples/src/main/apps/streaming/

Author: rkanter
Date: Tue Sep 10 17:48:03 2013
New Revision: 1521561

URL: http://svn.apache.org/r1521561
Log:
OOZIE-1496 Oozie demo and streaming examples fails to run on Windows (eshevchuk via rkanter)

Added:
    oozie/trunk/examples/src/main/apps/demo/job.windows.properties
    oozie/trunk/examples/src/main/apps/streaming/job.windows.properties
Modified:
    oozie/trunk/examples/src/main/apps/demo/job.properties
    oozie/trunk/examples/src/main/apps/demo/workflow.xml
    oozie/trunk/examples/src/main/apps/streaming/job.properties
    oozie/trunk/examples/src/main/apps/streaming/workflow.xml
    oozie/trunk/release-log.txt

Modified: oozie/trunk/examples/src/main/apps/demo/job.properties
URL: http://svn.apache.org/viewvc/oozie/trunk/examples/src/main/apps/demo/job.properties?rev=1521561&r1=1521560&r2=1521561&view=diff
==============================================================================
--- oozie/trunk/examples/src/main/apps/demo/job.properties (original)
+++ oozie/trunk/examples/src/main/apps/demo/job.properties Tue Sep 10 17:48:03 2013
@@ -20,6 +20,8 @@ nameNode=hdfs://localhost:8020
 jobTracker=localhost:8021
 queueName=default
 examplesRoot=examples
+streamingMapper=/bin/cat
+streamingReducer=/usr/bin/wc
 
 oozie.use.system.libpath=true
 

Added: oozie/trunk/examples/src/main/apps/demo/job.windows.properties
URL: http://svn.apache.org/viewvc/oozie/trunk/examples/src/main/apps/demo/job.windows.properties?rev=1521561&view=auto
==============================================================================
--- oozie/trunk/examples/src/main/apps/demo/job.windows.properties (added)
+++ oozie/trunk/examples/src/main/apps/demo/job.windows.properties Tue Sep 10 17:48:03 2013
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+
+nameNode=hdfs://localhost:8020
+jobTracker=localhost:8021
+queueName=default
+examplesRoot=examples
+streamingMapper=powershell -command "$input | Write-Host"
+streamingReducer=powershell -command "$input | Measure-Object -Word -Line -Character"
+
+oozie.use.system.libpath=true
+
+oozie.wf.application.path=${nameNode}/user/${user.name}/${examplesRoot}/apps/demo

Modified: oozie/trunk/examples/src/main/apps/demo/workflow.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/examples/src/main/apps/demo/workflow.xml?rev=1521561&r1=1521560&r2=1521561&view=diff
==============================================================================
--- oozie/trunk/examples/src/main/apps/demo/workflow.xml (original)
+++ oozie/trunk/examples/src/main/apps/demo/workflow.xml Tue Sep 10 17:48:03 2013
@@ -65,8 +65,8 @@
                 <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/demo/streaming-node"/>
             </prepare>
             <streaming>
-                <mapper>/bin/cat</mapper>
-                <reducer>/usr/bin/wc</reducer>
+                <mapper>${streamingMapper}</mapper>
+                <reducer>${streamingReducer}</reducer>
             </streaming>
             <configuration>
                 <property>

Modified: oozie/trunk/examples/src/main/apps/streaming/job.properties
URL: http://svn.apache.org/viewvc/oozie/trunk/examples/src/main/apps/streaming/job.properties?rev=1521561&r1=1521560&r2=1521561&view=diff
==============================================================================
--- oozie/trunk/examples/src/main/apps/streaming/job.properties (original)
+++ oozie/trunk/examples/src/main/apps/streaming/job.properties Tue Sep 10 17:48:03 2013
@@ -20,6 +20,8 @@ nameNode=hdfs://localhost:8020
 jobTracker=localhost:8021
 queueName=default
 examplesRoot=examples
+streamingMapper=/bin/cat
+streamingReducer=/usr/bin/wc
 
 oozie.use.system.libpath=true
 

Added: oozie/trunk/examples/src/main/apps/streaming/job.windows.properties
URL: http://svn.apache.org/viewvc/oozie/trunk/examples/src/main/apps/streaming/job.windows.properties?rev=1521561&view=auto
==============================================================================
--- oozie/trunk/examples/src/main/apps/streaming/job.windows.properties (added)
+++ oozie/trunk/examples/src/main/apps/streaming/job.windows.properties Tue Sep 10 17:48:03 2013
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+
+nameNode=hdfs://localhost:8020
+jobTracker=localhost:8021
+queueName=default
+examplesRoot=examples
+streamingMapper=powershell -command "$input | Write-Host"
+streamingReducer=powershell -command "$input | Measure-Object -Word -Line -Character"
+
+oozie.use.system.libpath=true
+
+oozie.wf.application.path=${nameNode}/user/${user.name}/${examplesRoot}/apps/streaming

Modified: oozie/trunk/examples/src/main/apps/streaming/workflow.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/examples/src/main/apps/streaming/workflow.xml?rev=1521561&r1=1521560&r2=1521561&view=diff
==============================================================================
--- oozie/trunk/examples/src/main/apps/streaming/workflow.xml (original)
+++ oozie/trunk/examples/src/main/apps/streaming/workflow.xml Tue Sep 10 17:48:03 2013
@@ -25,8 +25,8 @@
                 <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/streaming"/>
             </prepare>
             <streaming>
-                <mapper>/bin/cat</mapper>
-                <reducer>/usr/bin/wc</reducer>
+                <mapper>${streamingMapper}</mapper>
+                <reducer>${streamingReducer}</reducer>
             </streaming>
             <configuration>
                 <property>

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1521561&r1=1521560&r2=1521561&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Sep 10 17:48:03 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1496 Oozie demo and streaming examples fails to run on Windows (eshevchuk via rkanter)
 OOZIE-1462 Compress lob columns before storing in database (virag)
 OOZIE-1499 Update only necessary columns and consolidate JPA Executors (ryota)
 OOZIE-1522 SignalX may try to insert transition for a forked node twice (virag)