Repository: mesos Updated Branches: refs/heads/master cabaf2a23 -> 2db51b134
Include protobuf classes in generated Javadoc. Updates the Java POM to include the generated Java protobuf classes. Review: https://reviews.apache.org/r/35961 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ce349695 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ce349695 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ce349695 Branch: refs/heads/master Commit: ce349695a422a22cbdb57683378f7be916af7637 Parents: cabaf2a Author: Connor Doyle <[email protected]> Authored: Mon Jun 29 17:59:54 2015 -0700 Committer: Adam B <[email protected]> Committed: Mon Jun 29 18:01:05 2015 -0700 ---------------------------------------------------------------------- src/java/generated/org/apache/mesos/MesosNativeLibrary.java.in | 4 ++++ src/java/mesos.pom.in | 2 +- src/java/src/org/apache/mesos/MesosExecutorDriver.java | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ce349695/src/java/generated/org/apache/mesos/MesosNativeLibrary.java.in ---------------------------------------------------------------------- diff --git a/src/java/generated/org/apache/mesos/MesosNativeLibrary.java.in b/src/java/generated/org/apache/mesos/MesosNativeLibrary.java.in index c54d903..34b8acb 100644 --- a/src/java/generated/org/apache/mesos/MesosNativeLibrary.java.in +++ b/src/java/generated/org/apache/mesos/MesosNativeLibrary.java.in @@ -23,6 +23,8 @@ public class MesosNativeLibrary { * Represent a 'libmesos' version with Major, Minor, and Patch versions. We * use a class here to make it easier to do version compatibility checking. * For example: + * <pre> + * {@code * static Version BugFixVersion = new Version(0, 22, 1); * public static void myFunction() { * if (version().compareTo(BugFixVersion) >= 0) { @@ -31,6 +33,8 @@ public class MesosNativeLibrary { * // Old behavior for backwards compatibility. * } * } + * } + * </pre> */ public static class Version implements Comparable<Version> { public Version(long major, long minor, long patch) { http://git-wip-us.apache.org/repos/asf/mesos/blob/ce349695/src/java/mesos.pom.in ---------------------------------------------------------------------- diff --git a/src/java/mesos.pom.in b/src/java/mesos.pom.in index 138da55..7615d61 100644 --- a/src/java/mesos.pom.in +++ b/src/java/mesos.pom.in @@ -131,7 +131,7 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <sourcepath>@abs_top_srcdir@/src/java/src</sourcepath> + <sourcepath>@abs_top_srcdir@/src/java/src:@abs_top_builddir@/src/java/generated</sourcepath> <subpackages>org.apache.mesos</subpackages> </configuration> <executions> http://git-wip-us.apache.org/repos/asf/mesos/blob/ce349695/src/java/src/org/apache/mesos/MesosExecutorDriver.java ---------------------------------------------------------------------- diff --git a/src/java/src/org/apache/mesos/MesosExecutorDriver.java b/src/java/src/org/apache/mesos/MesosExecutorDriver.java index 1b5ed60..6741b32 100644 --- a/src/java/src/org/apache/mesos/MesosExecutorDriver.java +++ b/src/java/src/org/apache/mesos/MesosExecutorDriver.java @@ -28,11 +28,12 @@ import org.apache.mesos.Protos.*; * <p> * The driver is responsible for invoking the Executor callbacks as it * communicates with the Mesos slave. + * </p> * <p> * Note that blocking on the MesosExecutorDriver (e.g., via {@link * #join}) doesn't affect the executor callbacks in anyway because * they are handled by a different thread. - * <p> + * </p> * <p> * Note that the driver uses GLOG to do its own logging. GLOG flags can * be set via environment variables, prefixing the flag name with @@ -40,9 +41,11 @@ import org.apache.mesos.Protos.*; * src/logging/flags.hpp. Mesos flags can also be set via environment * variables, prefixing the flag name with "MESOS_", e.g., * "MESOS_QUIET=1". + * </p> * <p> * See src/examples/java/TestExecutor.java for an example of using the * MesosExecutorDriver. + * </p> */ public class MesosExecutorDriver implements ExecutorDriver { static {
