You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2018/01/09 01:26:03 UTC

[22/33] samza-hello-samza git commit: SAMZA-1315: Rename startup script and fix configurations for wikipedia-zk application

SAMZA-1315: Rename startup script and fix configurations for wikipedia-zk application

Author: Bharath Kumarasubramanian <bk...@linkedin.com>

Reviewers: Jacob Maes <jm...@linkedin.com>

Closes #17 from bharathkk/latest


Project: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/commit/132a17f6
Tree: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/tree/132a17f6
Diff: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/diff/132a17f6

Branch: refs/heads/master
Commit: 132a17f667b4fecad1abe965a7c86ccffff38c8f
Parents: 35e017c
Author: Bharath Kumarasubramanian <bk...@linkedin.com>
Authored: Tue May 30 10:01:22 2017 -0700
Committer: Jacob Maes <jm...@linkedin.com>
Committed: Tue May 30 10:01:22 2017 -0700

----------------------------------------------------------------------
 bin/run-wikipedia-standalone-application.sh     | 30 --------------------
 bin/run-wikipedia-zk-application.sh             | 30 ++++++++++++++++++++
 src/main/assembly/src.xml                       |  2 +-
 ...ikipedia-application-local-runner.properties |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/132a17f6/bin/run-wikipedia-standalone-application.sh
----------------------------------------------------------------------
diff --git a/bin/run-wikipedia-standalone-application.sh b/bin/run-wikipedia-standalone-application.sh
deleted file mode 100755
index 6feea52..0000000
--- a/bin/run-wikipedia-standalone-application.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# 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.
-
-home_dir=`pwd`
-base_dir=$(dirname $0)/..
-cd $base_dir
-base_dir=`pwd`
-cd $home_dir
-
-export EXECUTION_PLAN_DIR="$base_dir/plan"
-mkdir -p $EXECUTION_PLAN_DIR
-
-[[ $JAVA_OPTS != *-Dlog4j.configuration* ]] && export JAVA_OPTS="$JAVA_OPTS -Dlog4j.configuration=file:$(dirname $0)/log4j-console.xml"
-
-exec $(dirname $0)/run-class.sh samza.examples.wikipedia.application.WikipediaZkLocalApplication --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-application-local-runner.properties

http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/132a17f6/bin/run-wikipedia-zk-application.sh
----------------------------------------------------------------------
diff --git a/bin/run-wikipedia-zk-application.sh b/bin/run-wikipedia-zk-application.sh
new file mode 100755
index 0000000..6feea52
--- /dev/null
+++ b/bin/run-wikipedia-zk-application.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# 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.
+
+home_dir=`pwd`
+base_dir=$(dirname $0)/..
+cd $base_dir
+base_dir=`pwd`
+cd $home_dir
+
+export EXECUTION_PLAN_DIR="$base_dir/plan"
+mkdir -p $EXECUTION_PLAN_DIR
+
+[[ $JAVA_OPTS != *-Dlog4j.configuration* ]] && export JAVA_OPTS="$JAVA_OPTS -Dlog4j.configuration=file:$(dirname $0)/log4j-console.xml"
+
+exec $(dirname $0)/run-class.sh samza.examples.wikipedia.application.WikipediaZkLocalApplication --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-application-local-runner.properties

http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/132a17f6/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index 7832af5..c04ace0 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -45,7 +45,7 @@
       <outputDirectory>lib</outputDirectory>
     </file>
     <file>
-      <source>${basedir}/bin/run-wikipedia-standalone-application.sh</source>
+      <source>${basedir}/bin/run-wikipedia-zk-application.sh</source>
       <outputDirectory>bin</outputDirectory>
     </file>
   </files>

http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/132a17f6/src/main/config/wikipedia-application-local-runner.properties
----------------------------------------------------------------------
diff --git a/src/main/config/wikipedia-application-local-runner.properties b/src/main/config/wikipedia-application-local-runner.properties
index 32b0290..1911e68 100644
--- a/src/main/config/wikipedia-application-local-runner.properties
+++ b/src/main/config/wikipedia-application-local-runner.properties
@@ -19,7 +19,7 @@
 job.name=wikipedia-application
 job.coordinator.factory=org.apache.samza.zk.ZkJobCoordinatorFactory
 job.default.system=kafka
-coordinator.zk.connect=localhost:2181
+job.coordinator.zk.connect=localhost:2181
 
 # Task/Application
 task.name.grouper.factory=org.apache.samza.container.grouper.task.GroupByContainerIdsFactory