Merge latest branch into master and set version to 1.5.0 (#80)
* Bump guava version
* Making script work on RHEL-7/Linux because of https://arfore.com/2015/10/05/rhel7-and-ncat-changes/
* SAMZA-2218: Add a Couchbase example to samza-hello-samza (#64)
* SAMZA-2223: Update Couchbase example to use NoOpTableReadFunction
* SAMZA-2433: Use log4j2 in samza-hello-samza (#70)
* SAMZA-2437: Sample for producing to Azure Blob Storage (#71)
* Update doc and javadoc from config factory to config loader (#79)
diff --git a/README.md b/README.md
index ea5113a..a865023 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@
Package [samza.examples.wikipedia.application](https://github.com/apache/samza-hello-samza/tree/master/src/main/java/samza/examples/wikipedia/application) contains a small Samza application which consumes the real-time feeds from Wikipedia, extracts the metadata of the events, and calculates statistics of all edits in a 10-second window. You can start the app on the grid using the run-app.sh script:
```
-./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-application.properties
+./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/wikipedia-application.properties
```
Once the job is started, we can tail the kafka topic by:
@@ -77,9 +77,9 @@
Package [samza.examples.wikipedia.task](https://github.com/apache/samza-hello-samza/tree/master/src/main/java/samza/examples/wikipedia/task) contains the low-level API Samza code for the Wikipedia example. To run it, use the following scripts:
```
-deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-feed.properties
-deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-parser.properties
-deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-stats.properties
+deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/wikipedia-feed.properties
+deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/wikipedia-parser.properties
+deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/wikipedia-stats.properties
```
Once the jobs are started, you can use the same _kafka-console-consumer.sh_ command as in the high-level API Wikipedia example to check out the output of the statistics.
diff --git a/bin/deploy.sh b/bin/deploy.sh
index 63a326c..84c3319 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -23,4 +23,4 @@
mvn clean package
mkdir -p $base_dir/deploy/samza
-tar -xvf $base_dir/target/hello-samza-1.4.0-dist.tar.gz -C $base_dir/deploy/samza
+tar -xvf $base_dir/target/hello-samza-1.5.0-dist.tar.gz -C $base_dir/deploy/samza
diff --git a/bin/run-event-hubs-zk-application.sh b/bin/run-event-hubs-zk-application.sh
index 8cd2463..c3cf803 100755
--- a/bin/run-event-hubs-zk-application.sh
+++ b/bin/run-event-hubs-zk-application.sh
@@ -27,4 +27,4 @@
[[ $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.azure.AzureZKLocalApplication --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/azure-application-local-runner.properties
+exec $(dirname $0)/run-class.sh samza.examples.azure.AzureZKLocalApplication --config job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory --config job.config.loader.properties.path=$PWD/deploy/samza/config/azure-application-local-runner.properties
diff --git a/bin/run-wikipedia-zk-application.sh b/bin/run-wikipedia-zk-application.sh
index 6feea52..6b78ae8 100755
--- a/bin/run-wikipedia-zk-application.sh
+++ b/bin/run-wikipedia-zk-application.sh
@@ -27,4 +27,4 @@
[[ $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
+exec $(dirname $0)/run-class.sh samza.examples.wikipedia.application.WikipediaZkLocalApplication --config job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory --config job.config.loader.properties.path=$PWD/deploy/samza/config/wikipedia-application-local-runner.properties
diff --git a/build.gradle b/build.gradle
index fa3a063..0735576 100644
--- a/build.gradle
+++ b/build.gradle
@@ -161,9 +161,9 @@
def startSamza() {
project.exec {
workingDir(project.projectDir)
- commandLine("deploy/samza/bin/run-job.sh",
- "--config-factory=org.apache.samza.config.factories.PropertiesConfigFactory",
- "--config-path=file://${project.projectDir}/deploy/samza/config/${configFile}")
+ commandLine("deploy/samza/bin/run-app.sh",
+ "--config-path=${project.projectDir}/deploy/samza/config/${configFile}")
+
}
}
}
diff --git a/gradle.properties b/gradle.properties
index f6a27cc..eac119f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
* under the License.
*/
-SAMZA_VERSION=1.4.0
+SAMZA_VERSION=1.5.0
KAFKA_VERSION=0.11.0.2
HADOOP_VERSION=2.7.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 085a1cd..fd7e590 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3584fa0..c91c2cc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 23 14:55:28 PDT 2015
+#Fri Mar 27 16:28:33 PDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/pom.xml b/pom.xml
index 0ec204f..39d4915 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.samza</groupId>
<artifactId>hello-samza</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
<packaging>jar</packaging>
<name>Samza Example</name>
<description>
@@ -294,7 +294,7 @@
<properties>
<!-- maven specific properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <samza.version>1.4.0</samza.version>
+ <samza.version>1.5.0</samza.version>
<hadoop.version>2.6.1</hadoop.version>
</properties>
diff --git a/src/main/config/azure-blob-application.properties b/src/main/config/azure-blob-application.properties
index a13535f..09fa8ec 100644
--- a/src/main/config/azure-blob-application.properties
+++ b/src/main/config/azure-blob-application.properties
@@ -30,10 +30,14 @@
# StreamApplication class
app.class=samza.examples.azure.AzureBlobApplication
-#Azure blob essential configs
+# Azure blob essential configs
systems.azure-blob-container.samza.factory=org.apache.samza.system.azureblob.AzureBlobSystemFactory
sensitive.systems.azure-blob-container.azureblob.account.name=your-azure-storage-account-name
sensitive.systems.azure-blob-container.azureblob.account.key=your-azure-storage-account-key
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/azure-blob-application.properties
+
#Azure blob config - to created a blob per 2 input kafka messages
systems.azure-blob-container.azureblob.maxMessagesPerBlob=2
diff --git a/src/main/config/couchbase-table-example.properties b/src/main/config/couchbase-table-example.properties
index 0bbfdea..902d082 100644
--- a/src/main/config/couchbase-table-example.properties
+++ b/src/main/config/couchbase-table-example.properties
@@ -23,3 +23,7 @@
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/couchbase-table-example.properties
diff --git a/src/main/config/filter-example.properties b/src/main/config/filter-example.properties
index b9681c3..02b0fa5 100644
--- a/src/main/config/filter-example.properties
+++ b/src/main/config/filter-example.properties
@@ -23,3 +23,7 @@
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/filter-example.properties
\ No newline at end of file
diff --git a/src/main/config/join-example.properties b/src/main/config/join-example.properties
index 3f8d60f..d18d06b 100644
--- a/src/main/config/join-example.properties
+++ b/src/main/config/join-example.properties
@@ -23,3 +23,7 @@
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/join-example.properties
\ No newline at end of file
diff --git a/src/main/config/kinesis-hello-samza.properties b/src/main/config/kinesis-hello-samza.properties
index 17203df..047d905 100644
--- a/src/main/config/kinesis-hello-samza.properties
+++ b/src/main/config/kinesis-hello-samza.properties
@@ -25,6 +25,10 @@
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
yarn.container.count=2
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/kinesis-hello-samza.properties
+
# Task
task.class=samza.examples.kinesis.KinesisHelloSamza
# Please replace the below input stream with the stream you plan to consume from.
diff --git a/src/main/config/remote-table-join-example.properties b/src/main/config/remote-table-join-example.properties
index 9680471..adff1f1 100644
--- a/src/main/config/remote-table-join-example.properties
+++ b/src/main/config/remote-table-join-example.properties
@@ -23,3 +23,7 @@
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/remote-table-join-example.properties
\ No newline at end of file
diff --git a/src/main/config/session-window-example.properties b/src/main/config/session-window-example.properties
index e8aac74..fb81e38 100644
--- a/src/main/config/session-window-example.properties
+++ b/src/main/config/session-window-example.properties
@@ -16,9 +16,14 @@
# under the License.
# Application / Job
+app.class=samza.examples.cookbook.SessionWindowExample
job.factory.class=org.apache.samza.job.yarn.YarnJobFactory
job.name=pageview-sessionizer
job.container.count=2
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/session-window-example.properties
\ No newline at end of file
diff --git a/src/main/config/stream-table-join-example.properties b/src/main/config/stream-table-join-example.properties
index c6d66b7..90c09e2 100644
--- a/src/main/config/stream-table-join-example.properties
+++ b/src/main/config/stream-table-join-example.properties
@@ -23,3 +23,7 @@
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/stream-table-join-example.properties
\ No newline at end of file
diff --git a/src/main/config/tumbling-window-example.properties b/src/main/config/tumbling-window-example.properties
index 07dbb22..c3a00a7 100644
--- a/src/main/config/tumbling-window-example.properties
+++ b/src/main/config/tumbling-window-example.properties
@@ -23,3 +23,7 @@
# YARN
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/tumbling-window-example.properties
\ No newline at end of file
diff --git a/src/main/config/wikipedia-application.properties b/src/main/config/wikipedia-application.properties
index dfda307..881355f 100644
--- a/src/main/config/wikipedia-application.properties
+++ b/src/main/config/wikipedia-application.properties
@@ -39,3 +39,6 @@
metrics.reporter.snapshot.stream=kafka.metrics
metrics.reporter.jmx.class=org.apache.samza.metrics.reporter.JmxReporterFactory
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/wikipedia-application.properties
diff --git a/src/main/config/wikipedia-feed.properties b/src/main/config/wikipedia-feed.properties
index 9fee678..7edb409 100644
--- a/src/main/config/wikipedia-feed.properties
+++ b/src/main/config/wikipedia-feed.properties
@@ -25,5 +25,9 @@
# TaskApplication class
app.class=samza.examples.wikipedia.task.application.WikipediaFeedTaskApplication
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/wikipedia-feed.properties
+
# Add configuration to disable checkpointing for this job once it is available in the Coordinator Stream model
# See https://issues.apache.org/jira/browse/SAMZA-465?focusedCommentId=14533346&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14533346 for more details
diff --git a/src/main/config/wikipedia-parser.properties b/src/main/config/wikipedia-parser.properties
index d9614c2..47d3cd4 100644
--- a/src/main/config/wikipedia-parser.properties
+++ b/src/main/config/wikipedia-parser.properties
@@ -23,4 +23,8 @@
yarn.package.path=file://${basedir}/target/${project.artifactId}-${pom.version}-dist.tar.gz
# TaskApplication class
-app.class=samza.examples.wikipedia.task.application.WikipediaParserTaskApplication
\ No newline at end of file
+app.class=samza.examples.wikipedia.task.application.WikipediaParserTaskApplication
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/wikipedia-parser.properties
\ No newline at end of file
diff --git a/src/main/config/wikipedia-stats.properties b/src/main/config/wikipedia-stats.properties
index 7da456b..34bad28 100644
--- a/src/main/config/wikipedia-stats.properties
+++ b/src/main/config/wikipedia-stats.properties
@@ -51,3 +51,7 @@
# Normally, we'd set this much higher, but we want things to look snappy in the demo.
stores.wikipedia-stats.write.batch.size=0
stores.wikipedia-stats.object.cache.size=0
+
+# Config Loader
+job.config.loader.factory=org.apache.samza.config.loaders.PropertiesConfigLoaderFactory
+job.config.loader.properties.path=./__package/config/wikipedia-stats.properties
\ No newline at end of file
diff --git a/src/main/java/samza/examples/azure/AzureBlobApplication.java b/src/main/java/samza/examples/azure/AzureBlobApplication.java
index 15de822..ae9e591 100644
--- a/src/main/java/samza/examples/azure/AzureBlobApplication.java
+++ b/src/main/java/samza/examples/azure/AzureBlobApplication.java
@@ -61,7 +61,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/azure-blob-application.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/azure-blob-application.properties
* </li>
* <li>
* Produce some messages to the "page-view-azure-blob-input" topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/CouchbaseTableExample.java b/src/main/java/samza/examples/cookbook/CouchbaseTableExample.java
index a6b2dee..fdc5bc6 100644
--- a/src/main/java/samza/examples/cookbook/CouchbaseTableExample.java
+++ b/src/main/java/samza/examples/cookbook/CouchbaseTableExample.java
@@ -83,7 +83,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/couchbase-table-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/couchbase-table-example.properties
* </li>
* <li>
* Consume messages from the output topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/FilterExample.java b/src/main/java/samza/examples/cookbook/FilterExample.java
index bd14300..218502a 100644
--- a/src/main/java/samza/examples/cookbook/FilterExample.java
+++ b/src/main/java/samza/examples/cookbook/FilterExample.java
@@ -51,7 +51,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/filter-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/filter-example.properties
* </li>
* <li>
* Produce some messages to the "pageview-filter-input" topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/JoinExample.java b/src/main/java/samza/examples/cookbook/JoinExample.java
index 14753eb..b995834 100644
--- a/src/main/java/samza/examples/cookbook/JoinExample.java
+++ b/src/main/java/samza/examples/cookbook/JoinExample.java
@@ -57,7 +57,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/join-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/join-example.properties
* </li>
* <li>
* Produce some messages to the "pageview-join-input" topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/RemoteTableJoinExample.java b/src/main/java/samza/examples/cookbook/RemoteTableJoinExample.java
index b21a48a..4f5c5f7 100644
--- a/src/main/java/samza/examples/cookbook/RemoteTableJoinExample.java
+++ b/src/main/java/samza/examples/cookbook/RemoteTableJoinExample.java
@@ -74,7 +74,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/remote-table-join-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/remote-table-join-example.properties
* </li>
* <li>
* Consume messages from the output topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/SessionWindowExample.java b/src/main/java/samza/examples/cookbook/SessionWindowExample.java
index 1db0808..096fd5e 100644
--- a/src/main/java/samza/examples/cookbook/SessionWindowExample.java
+++ b/src/main/java/samza/examples/cookbook/SessionWindowExample.java
@@ -57,7 +57,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/session-window-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/session-window-example.properties
* </li>
* <li>
* Produce some messages to the "pageview-session-input" topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/StreamTableJoinExample.java b/src/main/java/samza/examples/cookbook/StreamTableJoinExample.java
index 96196fa..fcacf08 100644
--- a/src/main/java/samza/examples/cookbook/StreamTableJoinExample.java
+++ b/src/main/java/samza/examples/cookbook/StreamTableJoinExample.java
@@ -60,7 +60,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/stream-table-join-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/stream-table-join-example.properties
* </li>
* <li>
* Consume messages from the "enriched-pageview-join-output" topic <br/>
diff --git a/src/main/java/samza/examples/cookbook/TumblingWindowExample.java b/src/main/java/samza/examples/cookbook/TumblingWindowExample.java
index 5ec6876..5d0f37b 100644
--- a/src/main/java/samza/examples/cookbook/TumblingWindowExample.java
+++ b/src/main/java/samza/examples/cookbook/TumblingWindowExample.java
@@ -59,7 +59,7 @@
* </li>
* <li>
* Run the application using the run-app.sh script <br/>
- * ./deploy/samza/bin/run-app.sh --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/tumbling-window-example.properties
+ * ./deploy/samza/bin/run-app.sh --config-path=$PWD/deploy/samza/config/tumbling-window-example.properties
* </li>
* <li>
* Produce some messages to the "pageview-tumbling-input" topic, waiting for some time between messages <br/>
diff --git a/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java b/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
index e3982b1..ae1384a 100644
--- a/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
+++ b/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
@@ -34,8 +34,8 @@
/**
* Executes the application using the local application runner.
* It takes two required command line arguments
- * config-factory: a fully {@link org.apache.samza.config.factories.PropertiesConfigFactory} class name
- * config-path: path to application properties
+ * --config job.config.loader.factory: a fully {@link org.apache.samza.config.loaders.PropertiesConfigLoaderFactory} class name
+ * --config job.config.loader.properties.path: path to application properties
*
* @param args command line arguments
*/
