You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/12/05 19:31:45 UTC
[1/3] mesos git commit: Fixed missing protobuf java package/classname
definition.
Repository: mesos
Updated Branches:
refs/heads/master b18a57681 -> 5abda76d6
Fixed missing protobuf java package/classname definition.
Review: https://reviews.apache.org/r/54014/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2786ef6e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2786ef6e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2786ef6e
Branch: refs/heads/master
Commit: 2786ef6e1b7c91ca68ef4c584d8b4316fe2d6a58
Parents: b18a576
Author: Vijay Srinivasaraghavan <vi...@yahoo.com>
Authored: Mon Dec 5 08:57:55 2016 -0800
Committer: Anand Mazumdar <an...@apache.org>
Committed: Mon Dec 5 11:18:41 2016 -0800
----------------------------------------------------------------------
include/mesos/v1/allocator/allocator.proto | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2786ef6e/include/mesos/v1/allocator/allocator.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/allocator/allocator.proto b/include/mesos/v1/allocator/allocator.proto
index 73d45b3..093f18f 100644
--- a/include/mesos/v1/allocator/allocator.proto
+++ b/include/mesos/v1/allocator/allocator.proto
@@ -18,6 +18,9 @@ import "mesos/v1/mesos.proto";
package mesos.v1.allocator;
+option java_package = "org.apache.mesos.v1.allocator";
+option java_outer_classname = "Protos";
+
/**
* Describes the status of an inverse offer.
[2/3] mesos git commit: Enabled java protos generation for v1
Master/Agent API.
Posted by an...@apache.org.
Enabled java protos generation for v1 Master/Agent API.
The corresponding master/agent protos are now included in the
generated Mesos JAR.
Review: https://reviews.apache.org/r/53825/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e1ae5cf8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e1ae5cf8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e1ae5cf8
Branch: refs/heads/master
Commit: e1ae5cf8030821e1527466e84a0dfe1864406926
Parents: 2786ef6
Author: Vijay Srinivasaraghavan <vi...@yahoo.com>
Authored: Mon Dec 5 08:58:00 2016 -0800
Committer: Anand Mazumdar <an...@apache.org>
Committed: Mon Dec 5 11:19:29 2016 -0800
----------------------------------------------------------------------
src/Makefile.am | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e1ae5cf8/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 9177ea6..87d28b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -336,7 +336,12 @@ PYTHON_PROTOS = \
V1_JAVA_PROTOS = \
java/generated/org/apache/mesos/v1/Protos.java \
+ java/generated/org/apache/mesos/v1/agent/Protos.java \
+ java/generated/org/apache/mesos/v1/allocator/Protos.java \
java/generated/org/apache/mesos/v1/executor/Protos.java \
+ java/generated/org/apache/mesos/v1/maintenance/Protos.java \
+ java/generated/org/apache/mesos/v1/master/Protos.java \
+ java/generated/org/apache/mesos/v1/quota/Protos.java \
java/generated/org/apache/mesos/v1/scheduler/Protos.java
V1_PYTHON_PROTOS = \
@@ -392,6 +397,26 @@ java/generated/org/apache/mesos/v1/executor/Protos.java: $(V1_EXECUTOR_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+java/generated/org/apache/mesos/v1/quota/Protos.java: $(V1_QUOTA_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
+java/generated/org/apache/mesos/v1/agent/Protos.java: $(V1_AGENT_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
+java/generated/org/apache/mesos/v1/allocator/Protos.java: $(V1_ALLOCATOR_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
+java/generated/org/apache/mesos/v1/maintenance/Protos.java: $(V1_MAINTENANCE_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
+java/generated/org/apache/mesos/v1/master/Protos.java: $(V1_MASTER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
java/generated/org/apache/mesos/v1/Protos.java: $(V1_MESOS_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
@@ -1616,8 +1641,13 @@ libjava_la_CPPFLAGS += -I$(srcdir)/java/jni -Ijava/jni
libjava_la_DEPENDENCIES = \
$(MESOS_PROTO) \
+ $(V1_AGENT_PROTO) \
+ $(V1_ALLOCATOR_PROTO) \
$(V1_EXECUTOR_PROTO) \
+ $(V1_MAINTENANCE_PROTO) \
+ $(V1_MASTER_PROTO) \
$(V1_MESOS_PROTO) \
+ $(V1_QUOTA_PROTO) \
$(V1_SCHEDULER_PROTO)
# We don't add libjava.la to libmesos_no_3rdparty.la so we don't
[3/3] mesos git commit: Enabled python proto generation for v1
Master/Agent API.
Posted by an...@apache.org.
Enabled python proto generation for v1 Master/Agent API.
The correspondng master/agent protos are now included in the
generated Mesos pypi package.
Review: https://reviews.apache.org/r/54015/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5abda76d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5abda76d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5abda76d
Branch: refs/heads/master
Commit: 5abda76d697dcc21e64f9037b03c3a15fc434286
Parents: e1ae5cf
Author: Vijay Srinivasaraghavan <vi...@yahoo.com>
Authored: Mon Dec 5 08:58:05 2016 -0800
Committer: Anand Mazumdar <an...@apache.org>
Committed: Mon Dec 5 11:20:18 2016 -0800
----------------------------------------------------------------------
src/Makefile.am | 41 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5abda76d/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 87d28b1..c7f78c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -344,11 +344,16 @@ V1_JAVA_PROTOS = \
java/generated/org/apache/mesos/v1/quota/Protos.java \
java/generated/org/apache/mesos/v1/scheduler/Protos.java
-V1_PYTHON_PROTOS = \
- python/interface/src/mesos/v1/interface/mesos_pb2.py \
+V1_PYTHON_PROTOS = \
+ python/interface/src/mesos/v1/interface/agent_pb2.py \
+ python/interface/src/mesos/v1/interface/allocator_pb2.py \
+ python/interface/src/mesos/v1/interface/executor_pb2.py \
+ python/interface/src/mesos/v1/interface/maintenance_pb2.py \
+ python/interface/src/mesos/v1/interface/master_pb2.py \
+ python/interface/src/mesos/v1/interface/mesos_pb2.py \
+ python/interface/src/mesos/v1/interface/quota_pb2.py \
python/interface/src/mesos/v1/interface/scheduler_pb2.py
-
BUILT_SOURCES += \
$(CXX_LOG_PROTOS) \
$(CXX_PROTOS) \
@@ -448,17 +453,47 @@ python/interface/src/mesos/interface/scheduler_pb2.py: $(SCHEDULER_PROTO)
--python_out=python/interface/src/mesos/interface $^
$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+python/interface/src/mesos/v1/interface/agent_pb2.py: $(V1_AGENT_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/v1/agent $(PROTOCFLAGS) \
+ --python_out=python/interface/src/mesos/v1/interface $^
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
+python/interface/src/mesos/v1/interface/allocator_pb2.py: $(V1_ALLOCATOR_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/v1/allocator $(PROTOCFLAGS) \
+ --python_out=python/interface/src/mesos/v1/interface $^
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
python/interface/src/mesos/v1/interface/executor_pb2.py: $(V1_EXECUTOR_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/v1/executor $(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/v1/interface $^
$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+python/interface/src/mesos/v1/interface/maintenance_pb2.py: $(V1_MAINTENANCE_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/v1/maintenance $(PROTOCFLAGS) \
+ --python_out=python/interface/src/mesos/v1/interface $^
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
+python/interface/src/mesos/v1/interface/master_pb2.py: $(V1_MASTER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/v1/master $(PROTOCFLAGS) \
+ --python_out=python/interface/src/mesos/v1/interface $^
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
python/interface/src/mesos/v1/interface/mesos_pb2.py: $(V1_MESOS_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/v1 $(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/v1/interface $^
+python/interface/src/mesos/v1/interface/quota_pb2.py: $(V1_QUOTA_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/v1/quota $(PROTOCFLAGS) \
+ --python_out=python/interface/src/mesos/v1/interface $^
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
python/interface/src/mesos/v1/interface/scheduler_pb2.py: $(V1_SCHEDULER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/v1/scheduler $(PROTOCFLAGS) \