You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by cr...@apache.org on 2015/01/28 18:26:37 UTC

[1/2] samza git commit: SAMZA-291; add gradle description for misc tasks

Repository: samza
Updated Branches:
  refs/heads/master fa2c04f58 -> 11df9ff4f


SAMZA-291; add gradle description for misc tasks


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

Branch: refs/heads/master
Commit: 2497226df4fa7a7691d5e46278d9854e7bd0dd5d
Parents: fa2c04f
Author: Manikumar Reddy <ma...@gmail.com>
Authored: Wed Jan 28 09:18:01 2015 -0800
Committer: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Committed: Wed Jan 28 09:18:01 2015 -0800

----------------------------------------------------------------------
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/2497226d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5e64b4a..4f9fb44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -275,6 +275,7 @@ project(":samza-shell") {
   // Usage: ./gradlew samza-shell:runJob \
   //    -PconfigPath=file:///path/to/job/config.properties
   task runJob(type:JavaExec) {
+    description 'To run a job (defined in a properties file)'
     main = 'org.apache.samza.job.JobRunner'
     classpath = configurations.gradleShell
     if (project.hasProperty('configPath')) args += ['--config-path', configPath]
@@ -284,6 +285,7 @@ project(":samza-shell") {
   // Usage: ./gradlew samza-shell:checkpointTool \
   //    -PconfigPath=file:///path/to/job/config.properties -PnewOffsets=file:///path/to/new/offsets.properties
   task checkpointTool(type:JavaExec) {
+    description 'Command-line tool to inspect and manipulate the job’s checkpoint'
     main = 'org.apache.samza.checkpoint.CheckpointTool'
     classpath = configurations.gradleShell
     if (project.hasProperty('configPath')) args += ['--config-path', configPath]
@@ -294,6 +296,7 @@ project(":samza-shell") {
   // Usage: ./gradlew samza-shell:kvPerformanceTest
   //    -PconfigPath=file:///path/to/job/config.properties
   task kvPerformanceTest(type:JavaExec) {
+    description 'Command-line tool to run key-value performance tests'
     main = 'org.apache.samza.test.performance.TestKeyValuePerformance'
     classpath = configurations.gradleShell
     if (project.hasProperty('configPath')) args += ['--config-path', configPath]
@@ -397,6 +400,7 @@ project(":samza-test_$scalaVersion") {
   }
 
   tasks.create(name: "releaseTestJobs", dependsOn: configurations.archives.artifacts, type: Tar) {
+    description 'Build an integration test tarball'
     compression = Compression.GZIP
     from(file("$projectDir/src/main/config")) { into "config/" }
     from(file("$projectDir/src/main/resources")) { into "lib/" }


[2/2] samza git commit: SAMZA-534; fix javadoc warnings in log4j module

Posted by cr...@apache.org.
SAMZA-534; fix javadoc warnings in log4j module


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

Branch: refs/heads/master
Commit: 11df9ff4f1d336eb07baae16fc338c1652070672
Parents: 2497226
Author: Manikumar Reddy <ma...@gmail.com>
Authored: Wed Jan 28 09:26:06 2015 -0800
Committer: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Committed: Wed Jan 28 09:26:06 2015 -0800

----------------------------------------------------------------------
 .../java/org/apache/samza/config/Log4jSystemConfig.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/11df9ff4/samza-log4j/src/main/java/org/apache/samza/config/Log4jSystemConfig.java
----------------------------------------------------------------------
diff --git a/samza-log4j/src/main/java/org/apache/samza/config/Log4jSystemConfig.java b/samza-log4j/src/main/java/org/apache/samza/config/Log4jSystemConfig.java
index 5f5195c..659e3b6 100644
--- a/samza-log4j/src/main/java/org/apache/samza/config/Log4jSystemConfig.java
+++ b/samza-log4j/src/main/java/org/apache/samza/config/Log4jSystemConfig.java
@@ -74,10 +74,10 @@ public class Log4jSystemConfig {
   }
 
   /**
-   * a helper method to get the value from the config. If the config does not
+   * A helper method to get the value from the config. If the config does not
    * contain the key, return null.
    *
-   * @param key
+   * @param key key name
    * @return value of the key in the config
    */
   protected String getValue(String key) {
@@ -89,7 +89,9 @@ public class Log4jSystemConfig {
   }
 
   /**
-   * get a list of system names
+   * Get a list of system names.
+   * 
+   * @return A list system names
    */
   protected ArrayList<String> getSystemNames() {
     Config subConf = config.subset(SYSTEM_PREFIX, true);
@@ -102,4 +104,4 @@ public class Log4jSystemConfig {
     }
     return systemNames;
   }
-}
\ No newline at end of file
+}