You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 11:27:16 UTC
svn commit: r1132335 [1/4] - in /incubator/mesos/trunk: include/
include/mesos/ src/ src/common/ src/detector/ src/examples/ src/exec/
src/java/jni/ src/launcher/ src/local/ src/master/ src/messaging/
src/python/native/ src/sched/ src/slave/ src/tests/
Author: benh
Date: Sun Jun 5 09:27:14 2011
New Revision: 1132335
URL: http://svn.apache.org/viewvc?rev=1132335&view=rev
Log:
Moved mesos header files into include/mesos for better external namespacing.
Added:
incubator/mesos/trunk/include/mesos/
incubator/mesos/trunk/include/mesos/executor.hpp
- copied, changed from r1132333, incubator/mesos/trunk/include/mesos_exec.hpp
incubator/mesos/trunk/include/mesos/mesos.proto
- copied, changed from r1132333, incubator/mesos/trunk/include/mesos.proto
incubator/mesos/trunk/include/mesos/scheduler.hpp
- copied, changed from r1132333, incubator/mesos/trunk/include/mesos_sched.hpp
Removed:
incubator/mesos/trunk/include/mesos.proto
incubator/mesos/trunk/include/mesos_exec.hpp
incubator/mesos/trunk/include/mesos_sched.hpp
Modified:
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/common/resources.hpp
incubator/mesos/trunk/src/common/type_utils.hpp
incubator/mesos/trunk/src/common/zookeeper.cpp
incubator/mesos/trunk/src/detector/detector.cpp
incubator/mesos/trunk/src/detector/detector.hpp
incubator/mesos/trunk/src/examples/cpp_test_executor.cpp
incubator/mesos/trunk/src/examples/cpp_test_framework.cpp
incubator/mesos/trunk/src/examples/memhog.cpp
incubator/mesos/trunk/src/examples/memhog_executor.cpp
incubator/mesos/trunk/src/examples/scheduled_memhog.cpp
incubator/mesos/trunk/src/exec/exec.cpp
incubator/mesos/trunk/src/java/jni/construct.cpp
incubator/mesos/trunk/src/java/jni/convert.cpp
incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp
incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
incubator/mesos/trunk/src/launcher/launcher.hpp
incubator/mesos/trunk/src/launcher/main.cpp
incubator/mesos/trunk/src/local/local.hpp
incubator/mesos/trunk/src/master/master.cpp
incubator/mesos/trunk/src/master/master.hpp
incubator/mesos/trunk/src/master/slaves_manager.hpp
incubator/mesos/trunk/src/master/webui.hpp
incubator/mesos/trunk/src/messaging/messages.hpp
incubator/mesos/trunk/src/python/native/mesos_executor_driver_impl.cpp
incubator/mesos/trunk/src/python/native/mesos_executor_driver_impl.hpp
incubator/mesos/trunk/src/python/native/mesos_scheduler_driver_impl.cpp
incubator/mesos/trunk/src/python/native/mesos_scheduler_driver_impl.hpp
incubator/mesos/trunk/src/python/native/module.cpp
incubator/mesos/trunk/src/python/native/module.hpp
incubator/mesos/trunk/src/python/native/proxy_executor.cpp
incubator/mesos/trunk/src/python/native/proxy_executor.hpp
incubator/mesos/trunk/src/python/native/proxy_scheduler.cpp
incubator/mesos/trunk/src/python/native/proxy_scheduler.hpp
incubator/mesos/trunk/src/sched/sched.cpp
incubator/mesos/trunk/src/slave/slave.hpp
incubator/mesos/trunk/src/slave/webui.hpp
incubator/mesos/trunk/src/tests/Makefile.in
incubator/mesos/trunk/src/tests/configurator_test.cpp
incubator/mesos/trunk/src/tests/external_test.cpp
incubator/mesos/trunk/src/tests/lxc_isolation_test.cpp
incubator/mesos/trunk/src/tests/main.cpp
incubator/mesos/trunk/src/tests/master_test.cpp
incubator/mesos/trunk/src/tests/multimap_test.cpp
incubator/mesos/trunk/src/tests/offer_reply_errors_test.cpp
incubator/mesos/trunk/src/tests/resources_test.cpp
incubator/mesos/trunk/src/tests/sample_frameworks_test.cpp
incubator/mesos/trunk/src/tests/string_utils_test.cpp
incubator/mesos/trunk/src/tests/utils.cpp
incubator/mesos/trunk/src/tests/utils.hpp
Copied: incubator/mesos/trunk/include/mesos/executor.hpp (from r1132333, incubator/mesos/trunk/include/mesos_exec.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos/executor.hpp?p2=incubator/mesos/trunk/include/mesos/executor.hpp&p1=incubator/mesos/trunk/include/mesos_exec.hpp&r1=1132333&r2=1132335&rev=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/include/mesos_exec.hpp (original)
+++ incubator/mesos/trunk/include/mesos/executor.hpp Sun Jun 5 09:27:14 2011
@@ -1,9 +1,9 @@
-#ifndef MESOS_EXEC_HPP
-#define MESOS_EXEC_HPP
+#ifndef __MESOS_EXECUTOR_HPP__
+#define __MESOS_EXECUTOR_HPP__
#include <string>
-#include <mesos.hpp>
+#include <mesos/mesos.hpp>
namespace mesos {
@@ -104,6 +104,6 @@ private:
pthread_cond_t cond;
};
-} /* namespace mesos { */
+} // namespace mesos {
-#endif /* MESOS_EXEC_HPP */
+#endif // __MESOS_EXECUTOR_HPP__
Copied: incubator/mesos/trunk/include/mesos/mesos.proto (from r1132333, incubator/mesos/trunk/include/mesos.proto)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos/mesos.proto?p2=incubator/mesos/trunk/include/mesos/mesos.proto&p1=incubator/mesos/trunk/include/mesos.proto&r1=1132333&r2=1132335&rev=1132335&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/include/mesos/scheduler.hpp (from r1132333, incubator/mesos/trunk/include/mesos_sched.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos/scheduler.hpp?p2=incubator/mesos/trunk/include/mesos/scheduler.hpp&p1=incubator/mesos/trunk/include/mesos_sched.hpp&r1=1132333&r2=1132335&rev=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/include/mesos_sched.hpp (original)
+++ incubator/mesos/trunk/include/mesos/scheduler.hpp Sun Jun 5 09:27:14 2011
@@ -1,11 +1,11 @@
-#ifndef MESOS_SCHED_HPP
-#define MESOS_SCHED_HPP
+#ifndef __MESOS_SCHEDULER_HPP__
+#define __MESOS_SCHEDULER_HPP__
#include <string>
#include <map>
#include <vector>
-#include <mesos.hpp>
+#include <mesos/mesos.hpp>
namespace mesos {
@@ -221,6 +221,6 @@ private:
};
-} /* namespace mesos { */
+} // namespace mesos {
-#endif /* MESOS_SCHED_HPP */
+#endif // __MESOS_SCHEDULER_HPP__
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 09:27:14 2011
@@ -2,6 +2,8 @@
SHELL = '/bin/sh'
+SRCDIR = @srcdir@
+INCLUDEDIR = @top_builddir@/include
BINDIR = @top_builddir@/bin
LIBDIR = @top_builddir@/lib
CONFDIR = @top_builddir@/conf
@@ -11,6 +13,8 @@ CC = @CC@
CXX = @CXX@
SWIG = @SWIG@
+PROTOC=@top_builddir@/third_party/protobuf-2.3.0/src/protoc
+
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@
@@ -34,42 +38,45 @@ WITH_ZOOKEEPER = @WITH_ZOOKEEPER@
WITH_INCLUDED_ZOOKEEPER = @WITH_INCLUDED_ZOOKEEPER@
-LIBPROCESS = third_party/libprocess
-
-LIBEV = $(LIBPROCESS)/third_party/libev-3.8
-
+BOOST = third_party/boost-1.37.0
+PROTOBUF = third_party/protobuf-2.3.0
GLOG = third_party/glog-0.3.1
-
ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
+LIBPROCESS = third_party/libprocess
+LIBEV = $(LIBPROCESS)/third_party/libev-3.8
# Ensure that we get better debugging info.
CFLAGS += -g
CXXFLAGS += -g
# Add source dir and build dir to CFLAGS and CXXFLAGS.
-CFLAGS += -I@srcdir@ -I.
-CXXFLAGS += -I@srcdir@ -I.
+CFLAGS += -I$(SRCDIR) -I.
+CXXFLAGS += -I$(SRCDIR) -I.
-# Add include to CFLAGS and CXXFLAGS.
-CFLAGS += -I@top_srcdir@/include
-CXXFLAGS += -I@top_srcdir@/include
+# Add include and build include to CFLAGS and CXXFLAGS.
+CFLAGS += -I@top_srcdir@/include -I$(INCLUDEDIR)
+CXXFLAGS += -I@top_srcdir@/include -I$(INCLUDEDIR)
# Add boost to CFLAGS and CXXFLAGS.
CFLAGS += -I@top_srcdir@/third_party/boost-1.37.0
CXXFLAGS += -I@top_srcdir@/third_party/boost-1.37.0
+# Add protobuf to include and lib paths.
+CXXFLAGS += -I@top_srcdir@/$(PROTOBUF)/src
+LDFLAGS += -L@top_builddir@/$(PROTOBUF)/src/.libs
+
+# Add glog to include and lib paths.
+CXXFLAGS += -I@top_srcdir@/$(GLOG)/src -I@top_builddir@/$(GLOG)/src
+LDFLAGS += -L@top_builddir@/$(GLOG)/.libs
+
# Add libprocess to CFLAGS, CXXFLAGS, and LDFLAGS.
-CFLAGS += -I@top_srcdir@/$(LIBPROCESS)
-CXXFLAGS += -I@top_srcdir@/$(LIBPROCESS)
+CFLAGS += -I@top_srcdir@/$(LIBPROCESS)/include
+CXXFLAGS += -I@top_srcdir@/$(LIBPROCESS)/include
LDFLAGS += -L@top_builddir@/$(LIBPROCESS)
# Add libev to LDFLAGS.
LDFLAGS += -L@top_builddir@/$(LIBEV)/.libs
-# Add glog to include and lib paths.
-CXXFLAGS += -I@top_srcdir@/$(GLOG)/src -I@top_builddir@/$(GLOG)/src
-LDFLAGS += -L@top_builddir@/$(GLOG)/.libs
-
# Add included ZooKeeper to include and lib paths if necessary.
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
CXXFLAGS += -I@top_srcdir@/$(ZOOKEEPER)/include -I@top_srcdir@/$(ZOOKEEPER)/generated
@@ -80,26 +87,16 @@ endif
CFLAGS += -MMD -MP
CXXFLAGS += -MMD -MP
-# Add build date to CFLAGS, CXXFLAGS
-CFLAGS += -DBUILD_DATE="\"$$(date '+%Y-%m-%d %H:%M:%S')\""
-CXXFLAGS += -DBUILD_DATE="\"$$(date '+%Y-%m-%d %H:%M:%S')\""
-
-# Add build user to CFLAGS, CXXFLAGS
-CFLAGS += -DBUILD_USER="\"$$USER\""
-CXXFLAGS += -DBUILD_USER="\"$$USER\""
-
-# Add libev to LDFLAGS.
-LDFLAGS += -L$(LIBEV)/.libs
-
-# Add glog, libev, libprocess, pthread, and dl to LIBS.
-LIBS += -lglog -lprocess -lev -lpthread -ldl
+# Add protobuf, glog, libev, libprocess, pthread, and dl to LIBS.
+LIBS += -lprotobuf -lglog -lprocess -lev -lpthread -ldl
# Add ZooKeeper if necessary.
ifeq ($(WITH_ZOOKEEPER),1)
- LIBS += -lzookeeper_st
+ LIBS += -lzookeeper_mt
endif
-MASTER_OBJ = master/master.o master/allocator_factory.o master/simple_allocator.o
+MASTER_OBJ = master/master.o master/slaves_manager.o \
+ master/allocator_factory.o master/simple_allocator.o
SLAVE_OBJ = slave/slave.o launcher/launcher.o slave/isolation_module.o \
slave/process_based_isolation_module.o
@@ -112,6 +109,8 @@ ifeq ($(OS_NAME),linux)
SLAVE_OBJ += slave/lxc_isolation_module.o
endif
+PROTOBUF_OBJ = mesos.pb.o messaging/messages.pb.o
+
MASTER_WEBUI_OBJ = master/webui.o
MASTER_SWIG_WEBUI_OBJ = webui/master/swig/master_wrap.o
@@ -121,13 +120,14 @@ SLAVE_SWIG_WEBUI_OBJ = webui/slave/swig/
WEBUI_OBJ = $(MASTER_WEBUI_OBJ) $(SLAVE_WEBUI_OBJ)
SWIG_WEBUI_OBJ = $(MASTER_SWIG_WEBUI_OBJ) $(SLAVE_SWIG_WEBUI_OBJ)
-COMMON_OBJ = common/fatal.o messaging/messages.o common/lock.o \
- detector/detector.o common/params.o \
+COMMON_OBJ = common/fatal.o common/lock.o detector/detector.o \
detector/url_processor.o configurator/configurator.o \
- common/string_utils.o common/logging.o common/date_utils.o
+ common/string_utils.o common/logging.o \
+ common/date_utils.o common/tokenize.o common/resources.o \
+ messaging/messages.o
ifeq ($(WITH_ZOOKEEPER),1)
- COMMON_OBJ += detector/zookeeper.o
+ COMMON_OBJ += common/zookeeper.o
endif
EXEC_LIB_OBJ = exec/exec.o
@@ -136,17 +136,18 @@ SCHED_LIB_OBJ = sched/sched.o local/loca
BASIC_OBJ = $(MASTER_OBJ) $(SLAVE_OBJ) $(COMMON_OBJ) \
$(SCHED_LIB_OBJ) $(EXEC_LIB_OBJ)
-ALL_OBJ = $(BASIC_OBJ) $(WEBUI_OBJ) $(SWIG_WEBUI_OBJ)
+ALL_OBJ = $(PROTOBUF_OBJ) $(BASIC_OBJ) $(WEBUI_OBJ) $(SWIG_WEBUI_OBJ)
-MASTER_EXE_OBJ = $(MASTER_OBJ) $(MASTER_WEBUI_OBJ) \
- $(MASTER_SWIG_WEBUI_OBJ) $(COMMON_OBJ)
+MASTER_EXE_OBJ = $(MASTER_OBJ) $(MASTER_WEBUI_OBJ) \
+ $(MASTER_SWIG_WEBUI_OBJ) $(COMMON_OBJ) common/build.o
-SLAVE_EXE_OBJ = $(SLAVE_OBJ) $(SLAVE_WEBUI_OBJ) \
- $(SLAVE_SWIG_WEBUI_OBJ) $(COMMON_OBJ)
+SLAVE_EXE_OBJ = $(SLAVE_OBJ) $(SLAVE_WEBUI_OBJ) \
+ $(SLAVE_SWIG_WEBUI_OBJ) $(COMMON_OBJ) common/build.o
LAUNCHER_EXE_OBJ = launcher/launcher.o $(COMMON_OBJ)
-LOCAL_EXE_OBJ = local/local.o $(MASTER_OBJ) $(SLAVE_OBJ) $(COMMON_OBJ)
+LOCAL_EXE_OBJ = local/local.o $(MASTER_OBJ) $(SLAVE_OBJ) $(COMMON_OBJ) \
+ common/build.o
MESOS_MASTER_EXE = $(BINDIR)/mesos-master
MESOS_SLAVE_EXE = $(BINDIR)/mesos-slave
@@ -176,6 +177,10 @@ endif
MESOS_LIBS = $(MESOS_LIB) $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB)
+MESOS_JAVA_LIB_OBJ = java/jni/convert.o java/jni/construct.o \
+ java/jni/org_apache_mesos_MesosSchedulerDriver.o \
+ java/jni/org_apache_mesos_MesosExecutorDriver.o
+
# Java and Python shared libraries which contain the everything in
# MESOS_LIB as well as the SWIG wrappers (note, Java requires the use
# of the .dylib suffix on Mac OS X, but at the time Python required
@@ -190,6 +195,14 @@ MESOS_JAVA_JAR = $(LIBDIR)/java/mesos.ja
MESOS_PYTHON_LIB = $(LIBDIR)/python/_mesos.so
+MESOS_PYTHON_LIB_OBJ = python/native/module.o \
+ python/native/proxy_scheduler.o \
+ python/native/mesos_scheduler_driver_impl.o \
+ python/native/proxy_executor.o \
+ python/native/mesos_executor_driver_impl.o
+
+MESOS_PYTHON_FILE = $(LIBDIR)/python/mesos.py
+
# We copy all the webui files into the bin directory.
WEBUI_FILES = $(BINDIR)/webui/bottle-0.8.3 \
$(BINDIR)/webui/common/webui_lib.py \
@@ -225,9 +238,9 @@ WEBUI_DIRECTORIES = $(BINDIR)/webui/comm
$(BINDIR)/webui/master/swig \
$(BINDIR)/webui/slave/swig
-DIRECTORIES = $(BINDIR) $(LIBDIR) $(LIBDIR)/java $(LIBDIR)/python \
- $(CONFDIR) $(DEPLOYDIR) $(OBJ_DIRECTORIES) \
- $(WEBUI_DIRECTORIES)
+DIRECTORIES = $(INCLUDEDIR) $(INCLUDEDIR)/mesos $(BINDIR) $(LIBDIR) \
+ $(LIBDIR)/java $(LIBDIR)/python $(CONFDIR) $(DEPLOYDIR) \
+ $(OBJ_DIRECTORIES) $(WEBUI_DIRECTORIES)
default: all
@@ -238,39 +251,56 @@ default: all
$(DIRECTORIES): %:
mkdir -p $@
-$(BASIC_OBJ): %.o: @srcdir@/%.cpp | $(OBJ_DIRECTORIES)
- $(CXX) -c $(CXXFLAGS) -o $@ $<
+mesos.pb.cc: @top_srcdir@/include/mesos/mesos.proto
+ mkdir -p java/generated
+ $(PROTOC) -I@top_srcdir@/include/mesos --cpp_out=. --java_out=java/generated @top_srcdir@/include/mesos/mesos.proto
-$(MESOS_LIBS): $(COMMON_OBJ) | $(LIBDIR)
+$(INCLUDEDIR)/mesos/mesos.hpp: mesos.pb.cc | $(INCLUDEDIR) $(INCLUDEDIR)/mesos
+ cp mesos.pb.h $(INCLUDEDIR)/mesos/mesos.hpp
-$(MESOS_SCHED_LIB): $(SCHED_LIB_OBJ) $(MASTER_OBJ) $(SLAVE_OBJ)
- $(AR) rcs $@ $^
+messaging/messages.pb.cc: $(SRCDIR)/messaging/messages.proto
+ mkdir -p messaging
+ $(PROTOC) -I$(SRCDIR)/messaging -I@top_srcdir@/include/mesos --cpp_out=messaging $(SRCDIR)/messaging/messages.proto
-$(MESOS_EXEC_LIB): $(EXEC_LIB_OBJ)
- $(AR) rcs $@ $^
+common/build.o: $(SRCDIR)/common/build.cpp force | common
+ $(CXX) -c $(CXXFLAGS) -DBUILD_DATE="\"$$(date '+%Y-%m-%d %H:%M:%S')\"" -DBUILD_USER="\"$$USER\"" -DBUILD_FLAGS="\"$(CFLAGS) $(CXXFLAGS)\"" -o $@ $<
-$(MESOS_LIB): $(SCHED_LIB_OBJ) $(MASTER_OBJ) $(SLAVE_OBJ) $(EXEC_LIB_OBJ)
- $(CXX) $(CXXFLAGS) -shared -o $@ $^ $(LDFLAGS) $(LIBS)
+$(PROTOBUF_OBJ): %.pb.o: %.pb.cc $(INCLUDEDIR)/mesos/mesos.hpp
+ $(CXX) -c $(CXXFLAGS) -I@top_srcdir@/$(PROTOBUF)/src -I. -o $@ $<
-$(WEBUI_OBJ): %.o: @srcdir@/%.cpp
+$(BASIC_OBJ): %.o: $(SRCDIR)/%.cpp $(PROTOBUF_OBJ) | $(OBJ_DIRECTORIES)
+ $(CXX) -c $(CXXFLAGS) -o $@ $<
+
+$(WEBUI_OBJ): %.o: $(SRCDIR)/%.cpp
$(CXX) -c $(CXXFLAGS) $(WEBUI_CXXFLAGS) -o $@ $<
$(SWIG_WEBUI_OBJ): %.o: %.cpp
$(CXX) -c $(CXXFLAGS) $(WEBUI_CXXFLAGS) -o $@ $<
-webui/master/swig/master_wrap.cpp: @srcdir@/webui/master/swig/master.i @srcdir@/master/state.hpp @srcdir@/master/webui.hpp @srcdir@/master/master.hpp config/config.hpp $(BINDIR)/webui/master/swig
+$(MESOS_LIBS): $(COMMON_OBJ) | $(LIBDIR)
+
+$(MESOS_SCHED_LIB):$(SCHED_LIB_OBJ) $(MASTER_OBJ) $(SLAVE_OBJ) $(PROTOBUF_OBJ) common/build.o
+ $(AR) rcs $@ $^
+
+$(MESOS_EXEC_LIB): $(EXEC_LIB_OBJ) $(PROTOBUF_OBJ) common/build.o
+ $(AR) rcs $@ $^
+
+$(MESOS_LIB): $(SCHED_LIB_OBJ) $(MASTER_OBJ) $(SLAVE_OBJ) $(EXEC_LIB_OBJ) $(PROTOBUF_OBJ) common/build.o
+ $(CXX) $(CXXFLAGS) -shared -o $@ $^ $(LDFLAGS) $(LIBS)
+
+webui/master/swig/master_wrap.cpp: $(SRCDIR)/webui/master/swig/master.i $(SRCDIR)/master/state.hpp $(SRCDIR)/master/webui.hpp $(SRCDIR)/master/master.hpp config/config.hpp $(BINDIR)/webui/master/swig
ifeq ($(WITH_WEBUI),1)
mkdir -p webui/master/swig
- $(SWIG) -c++ -python -outdir webui/master/swig -I@top_srcdir@/include -I@srcdir@ -o $@ $<
+ $(SWIG) -c++ -python -outdir webui/master/swig -I$(SRCDIR) -o $@ $<
cp -r webui/master/swig/master.py $(BINDIR)/webui/master/swig
else
echo "" > $@
endif
-webui/slave/swig/slave_wrap.cpp: @srcdir@/webui/slave/swig/slave.i @srcdir@/slave/state.hpp @srcdir@/slave/webui.hpp @srcdir@/slave/slave.hpp config/config.hpp $(BINDIR)/webui/slave/swig
+webui/slave/swig/slave_wrap.cpp: $(SRCDIR)/webui/slave/swig/slave.i $(SRCDIR)/slave/state.hpp $(SRCDIR)/slave/webui.hpp $(SRCDIR)/slave/slave.hpp config/config.hpp $(BINDIR)/webui/slave/swig
ifeq ($(WITH_WEBUI),1)
mkdir -p webui/slave/swig
- $(SWIG) -c++ -python -outdir webui/slave/swig -I@top_srcdir@/include -I@srcdir@ -o $@ $<
+ $(SWIG) -c++ -python -outdir webui/slave/swig -I$(SRCDIR) -o $@ $<
cp -r webui/slave/swig/slave.py $(BINDIR)/webui/slave/swig
else
echo "" > $@
@@ -278,65 +308,84 @@ endif
$(MESOS_EXES): | $(BINDIR)
-$(MESOS_MASTER_EXE): @srcdir@/master/main.cpp $(MASTER_EXE_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $< $(MASTER_EXE_OBJ) $(LDFLAGS) $(WEBUI_LDFLAGS) $(LIBS)
+$(MESOS_MASTER_EXE): $(SRCDIR)/master/main.cpp $(MASTER_EXE_OBJ) $(PROTOBUF_OBJ)
+ $(CXX) $(CXXFLAGS) -o $@ $< $(MASTER_EXE_OBJ) $(PROTOBUF_OBJ) $(LDFLAGS) $(WEBUI_LDFLAGS) $(LIBS)
-$(MESOS_SLAVE_EXE): @srcdir@/slave/main.cpp $(SLAVE_EXE_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $< $(SLAVE_EXE_OBJ) $(LDFLAGS) $(WEBUI_LDFLAGS) $(LIBS)
+$(MESOS_SLAVE_EXE): $(SRCDIR)/slave/main.cpp $(SLAVE_EXE_OBJ) $(PROTOBUF_OBJ)
+ $(CXX) $(CXXFLAGS) -o $@ $< $(SLAVE_EXE_OBJ) $(PROTOBUF_OBJ) $(LDFLAGS) $(WEBUI_LDFLAGS) $(LIBS)
-$(MESOS_LAUNCHER_EXE): @srcdir@/launcher/main.cpp $(LAUNCHER_EXE_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $< launcher/launcher.o $(COMMON_OBJ) $(LDFLAGS) $(LIBS)
+$(MESOS_LAUNCHER_EXE): $(SRCDIR)/launcher/main.cpp $(LAUNCHER_EXE_OBJ) $(PROTOBUF_OBJ)
+ $(CXX) $(CXXFLAGS) -o $@ $< $(LAUNCHER_EXE_OBJ) $(PROTOBUF_OBJ) $(LDFLAGS) $(LIBS)
-$(MESOS_LOCAL_EXE): @srcdir@/local/main.cpp $(LOCAL_EXE_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $< $(LOCAL_EXE_OBJ) $(LDFLAGS) $(LIBS)
+$(MESOS_LOCAL_EXE): $(SRCDIR)/local/main.cpp $(LOCAL_EXE_OBJ) $(PROTOBUF_OBJ)
+ $(CXX) $(CXXFLAGS) -o $@ $< $(LOCAL_EXE_OBJ) $(PROTOBUF_OBJ) $(LDFLAGS) $(LIBS)
-$(MESOS_GETCONF_EXE): @srcdir@/configurator/get_conf.cpp $(COMMON_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $< $(COMMON_OBJ) $(LDFLAGS) $(LIBS)
+$(MESOS_GETCONF_EXE): $(SRCDIR)/configurator/get_conf.cpp $(COMMON_OBJ) $(PROTOBUF_OBJ)
+ $(CXX) $(CXXFLAGS) -o $@ $< $(COMMON_OBJ) $(PROTOBUF_OBJ) $(LDFLAGS) $(LIBS)
-$(MESOS_PROJD_EXE): @srcdir@/slave/projd.cpp $(COMMON_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $< $(COMMON_OBJ) $(LDFLAGS) $(LIBS)
+$(MESOS_PROJD_EXE): $(SRCDIR)/slave/projd.cpp $(COMMON_OBJ) $(PROTOBUF_OBJ)
+ $(CXX) $(CXXFLAGS) -o $@ $< $(COMMON_OBJ) $(PROTOBUF_OBJ) $(LDFLAGS) $(LIBS)
java: $(MESOS_JAVA_LIB) $(MESOS_JAVA_JAR)
-python: $(MESOS_PYTHON_LIB)
-
-$(MESOS_JAVA_JAR): $(MESOS_JAVA_LIB) | $(LIBDIR)/java
+$(MESOS_JAVA_JAR): $(SRCDIR)/java/src/org/apache/mesos/*.java @top_srcdir@/include/mesos/mesos.proto | $(LIBDIR)/java
ifdef JAVA_HOME
- patch -N swig/java/mesos/mesosJNI.java < @srcdir@/swig/java/mesosJNI.java.patch1 || echo -n
- patch swig/java/mesos/mesosJNI.java < @srcdir@/swig/java/mesosJNI.java.patch2 || echo -n
- $(JAVA_HOME)/bin/javac -sourcepath swig/java -d swig/java swig/java/mesos/*.java
- $(JAVA_HOME)/bin/jar cf $@ -C swig/java mesos
+ mkdir -p @top_builddir@/$(PROTOBUF)/java/src/main/java
+ $(PROTOC) --java_out=@top_builddir@/$(PROTOBUF)/java/src/main/java -I@top_srcdir@/$(PROTOBUF)/src @top_srcdir@/$(PROTOBUF)/src/google/protobuf/descriptor.proto
+ $(JAVA_HOME)/bin/javac -d @top_builddir@/$(PROTOBUF)/java/src/main/java @top_srcdir@/$(PROTOBUF)/java/src/main/java/com/google/protobuf/*.java @top_builddir@/$(PROTOBUF)/java/src/main/java/com/google/protobuf/*.java
+ rm -f java/classes/org/apache/mesos/*
+ mkdir -p java/classes/org/apache/mesos
+ $(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java -sourcepath java/generated -d java/classes java/generated/org/apache/mesos/*.java
+ $(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes -sourcepath $(SRCDIR)/java/src -d java/classes $(SRCDIR)/java/src/org/apache/mesos/*.java
+ $(JAVA_HOME)/bin/jar cf $@ -C java/classes org
+ $(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.MesosSchedulerDriver
+ $(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.MesosExecutorDriver
endif
-$(MESOS_JAVA_LIB): @srcdir@/swig/mesos.i $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) | $(LIBDIR)/java
+$(MESOS_JAVA_LIB_OBJ): %.o: $(SRCDIR)/%.cpp $(MESOS_JAVA_JAR)
+ $(CXX) -c $(CXXFLAGS) -Ijava/jni -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(OS_NAME) -I$(JAVA_HEADERS) -o $@ $<
+
+$(MESOS_JAVA_LIB): $(MESOS_JAVA_LIB_OBJ) $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) | $(LIBDIR)/java
ifdef JAVA_HOME
- rm -f swig/java/mesos/*
- mkdir -p swig/java/mesos
- $(SWIG) -c++ -java -I@top_srcdir@/include -o swig/java/mesos_wrap.cpp -outdir swig/java/mesos -package mesos @srcdir@/swig/mesos.i
- $(CXX) $(CXXFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HEADERS) -shared -o $@ swig/java/mesos_wrap.cpp $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(LIBS)
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(MESOS_JAVA_LIB_OBJ) $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(LIBS)
+endif
+
+python: $(MESOS_PYTHON_LIB) $(MESOS_PYTHON_FILE) $(MESOS_PYTHON_PROTOBUFS)
+
+$(MESOS_PYTHON_LIB_OBJ): %.o: $(SRCDIR)/%.cpp
+ifdef PYTHON_HEADERS
+ mkdir -p python/native
+ $(CXX) -c $(CXXFLAGS) -Ipython/native -I$(PYTHON_HEADERS) -o $@ $<
+endif
+
+$(MESOS_PYTHON_LIB): $(MESOS_PYTHON_LIB_OBJ) $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) | $(LIBDIR)/python
+ifdef PYTHON_HEADERS
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(MESOS_PYTHON_LIB_OBJ) $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS)
endif
-$(MESOS_PYTHON_LIB): @srcdir@/swig/mesos.i $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) | $(LIBDIR)/python
+$(MESOS_PYTHON_FILE): $(SRCDIR)/python/src/mesos.py @top_srcdir@/include/mesos/mesos.proto | $(LIBDIR)/python
ifdef PYTHON_HEADERS
- mkdir -p swig/python
- $(SWIG) -c++ -python -threads -I@top_srcdir@/include -o swig/python/mesos_wrap.cpp -outdir swig/python @srcdir@/swig/mesos.i
- $(CXX) $(CXXFLAGS) -I$(PYTHON_HEADERS) -shared -o $@ swig/python/mesos_wrap.cpp $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS)
- cp -r swig/python/mesos.py $(LIBDIR)/python/mesos.py
+ifneq (@top_srcdir@, @top_builddir@)
+ cp -r @top_srcdir@/$(PROTOBUF)/python @top_builddir@/$(PROTOBUF)/python
+endif
+ cp $< $@
+ $(PROTOC) --python_out=@top_builddir@/$(PROTOBUF)/python -I@top_srcdir@/$(PROTOBUF)/src @top_srcdir@/$(PROTOBUF)/src/google/protobuf/descriptor.proto
+ $(PROTOC) --python_out=$(LIBDIR)/python -I@top_srcdir@/include @top_srcdir@/include/mesos/mesos.proto
endif
-$(WEBUI_FILES): $(BINDIR)/%: @srcdir@/% | $(WEBUI_DIRECTORIES)
+$(WEBUI_FILES): $(BINDIR)/%: $(SRCDIR)/% | $(WEBUI_DIRECTORIES)
ifeq ($(WITH_WEBUI),1)
cp -r $< $@
endif
-$(DEPLOY_FILES): $(DEPLOYDIR)/%: @srcdir@/deploy/% | $(DEPLOYDIR)
+$(DEPLOY_FILES): $(DEPLOYDIR)/%: $(SRCDIR)/deploy/% | $(DEPLOYDIR)
cp -r $< $@
-$(CONFDIR)/mesos.conf: | @srcdir@/conf/mesos.conf.template $(CONFDIR)
- cp -r @srcdir@/conf/mesos.conf.template $@
+$(CONFDIR)/mesos.conf: | $(SRCDIR)/conf/mesos.conf.template $(CONFDIR)
+ cp -r $(SRCDIR)/conf/mesos.conf.template $@
-$(CONFDIR)/deploy-env.sh: | @srcdir@/conf/deploy-env.sh.template $(CONFDIR)
- cp -r @srcdir@/conf/deploy-env.sh.template $@
+$(CONFDIR)/deploy-env.sh: | $(SRCDIR)/conf/deploy-env.sh.template $(CONFDIR)
+ cp -r $(SRCDIR)/conf/deploy-env.sh.template $@
test: all
$(MAKE) -C tests test
@@ -366,6 +415,12 @@ clean:
rm -f swig/*/*.d
rm -f swig/java/mesos/*
rm -f swig/python/mesos.py
+ rm -f java/jni/org_apache_mesos_MesosSchedulerDriver.h
+ rm -f java/jni/org_apache_mesos_MesosSchedulerDriver.o
+ rm -f java/jni/org_apache_mesos_MesosSchedulerDriver.d
+ rm -f java/jni/org_apache_mesos_MesosExecutorDriver.h
+ rm -f java/jni/org_apache_mesos_MesosExecutorDriver.o
+ rm -f java/jni/org_apache_mesos_MesosExecutorDriver.d
rm -f $(LIBDIR)/python/mesos.py
rm -f $(LIBDIR)/python/mesos.pyc
rm -f webui/master/swig/master_wrap.h
@@ -383,6 +438,9 @@ clean:
rm -f $(BINDIR)/webui/master/swig/master.py
rm -f $(BINDIR)/webui/master/swig/master.pc
rm -f $(DEPLOY_FILES)
+ rm -f $(INCLUDEDIR)/mesos/mesos.hpp
+ rm -f mesos.pb.cc
+ rm -f mesos.pb.h
rm -f TAGS
-.PHONY: default java python test all clean
+.PHONY: default java python test all clean force
Modified: incubator/mesos/trunk/src/common/resources.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/resources.hpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/common/resources.hpp (original)
+++ incubator/mesos/trunk/src/common/resources.hpp Sun Jun 5 09:27:14 2011
@@ -4,7 +4,7 @@
#include <iterator>
#include <string>
-#include <mesos.hpp>
+#include <mesos/mesos.hpp>
// Resources come in three types: scalar, ranges, and sets. These are
Modified: incubator/mesos/trunk/src/common/type_utils.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/type_utils.hpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/common/type_utils.hpp (original)
+++ incubator/mesos/trunk/src/common/type_utils.hpp Sun Jun 5 09:27:14 2011
@@ -1,7 +1,7 @@
#ifndef __TYPE_UTILS_HPP__
#define __TYPE_UTILS_HPP__
-#include <mesos.hpp>
+#include <mesos/mesos.hpp>
#include <boost/functional/hash.hpp>
Modified: incubator/mesos/trunk/src/common/zookeeper.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/zookeeper.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/common/zookeeper.cpp (original)
+++ incubator/mesos/trunk/src/common/zookeeper.cpp Sun Jun 5 09:27:14 2011
@@ -3,10 +3,10 @@
#include <iostream>
#include <map>
-#include <process.hpp>
-
#include <boost/tuple/tuple.hpp>
+#include <process/process.hpp>
+
#include "zookeeper.hpp"
#include "common/fatal.hpp"
Modified: incubator/mesos/trunk/src/detector/detector.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/detector.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/detector/detector.cpp (original)
+++ incubator/mesos/trunk/src/detector/detector.cpp Sun Jun 5 09:27:14 2011
@@ -1,5 +1,3 @@
-#include <process.hpp>
-
#include <vector>
#include <glog/logging.h>
Modified: incubator/mesos/trunk/src/detector/detector.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/detector.hpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/detector/detector.hpp (original)
+++ incubator/mesos/trunk/src/detector/detector.hpp Sun Jun 5 09:27:14 2011
@@ -7,7 +7,7 @@
#include <climits>
#include <cstdlib>
-#include <process.hpp>
+#include <process/process.hpp>
namespace mesos { namespace internal {
Modified: incubator/mesos/trunk/src/examples/cpp_test_executor.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/cpp_test_executor.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/cpp_test_executor.cpp (original)
+++ incubator/mesos/trunk/src/examples/cpp_test_executor.cpp Sun Jun 5 09:27:14 2011
@@ -1,8 +1,8 @@
-#include <mesos_exec.hpp>
-
#include <cstdlib>
#include <iostream>
+#include <mesos/executor.hpp>
+
using namespace mesos;
using namespace std;
Modified: incubator/mesos/trunk/src/examples/cpp_test_framework.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/cpp_test_framework.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/cpp_test_framework.cpp (original)
+++ incubator/mesos/trunk/src/examples/cpp_test_framework.cpp Sun Jun 5 09:27:14 2011
@@ -1,5 +1,3 @@
-#include <mesos_sched.hpp>
-
#include <libgen.h>
#include <cstdlib>
@@ -8,10 +6,10 @@
#include <boost/lexical_cast.hpp>
-#include "foreach.hpp"
+#include <mesos/scheduler.hpp>
-using namespace std;
using namespace mesos;
+using namespace std;
using boost::lexical_cast;
@@ -48,11 +46,13 @@ public:
virtual void resourceOffer(SchedulerDriver* driver,
const OfferID& offerId,
- const std::vector<SlaveOffer>& offers)
+ const vector<SlaveOffer>& offers)
{
cout << "." << flush;
vector<TaskDescription> tasks;
- foreach (const SlaveOffer& offer, offers) {
+ vector<SlaveOffer>::const_iterator iterator = offers.begin();
+ for (; iterator != offers.end(); ++iterator) {
+ const SlaveOffer& offer = *iterator;
// Lookup resources we care about.
// TODO(benh): It would be nice to ultimately have some helper
// functions for looking up resources.
@@ -130,7 +130,7 @@ public:
virtual void slaveLost(SchedulerDriver* driver, const SlaveID& sid) {}
virtual void error(SchedulerDriver* driver, int code,
- const std::string& message) {}
+ const string& message) {}
private:
string uri;
Modified: incubator/mesos/trunk/src/examples/memhog.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/memhog.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/memhog.cpp (original)
+++ incubator/mesos/trunk/src/examples/memhog.cpp Sun Jun 5 09:27:14 2011
@@ -1,5 +1,3 @@
-#include <mesos_sched.hpp>
-
#include <libgen.h>
#include <cstdlib>
@@ -8,10 +6,10 @@
#include <boost/lexical_cast.hpp>
-#include "foreach.hpp"
+#include <mesos/scheduler.hpp>
-using namespace std;
using namespace mesos;
+using namespace std;
using boost::lexical_cast;
@@ -51,7 +49,9 @@ public:
const vector<SlaveOffer>& offers)
{
vector<TaskDescription> tasks;
- foreach (const SlaveOffer& offer, offers) {
+ vector<SlaveOffer>::const_iterator iterator = offers.begin();
+ for (; iterator != offers.end(); ++iterator) {
+ const SlaveOffer& offer = *iterator;
// Lookup resources we care about.
// TODO(benh): It would be nice to ultimately have some helper
// functions for looking up resources.
Modified: incubator/mesos/trunk/src/examples/memhog_executor.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/memhog_executor.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/memhog_executor.cpp (original)
+++ incubator/mesos/trunk/src/examples/memhog_executor.cpp Sun Jun 5 09:27:14 2011
@@ -1,13 +1,13 @@
#include <time.h>
-#include <mesos_exec.hpp>
-
#include <cstdlib>
#include <iostream>
#include <sstream>
-using namespace std;
+#include <mesos/executor.hpp>
+
using namespace mesos;
+using namespace std;
class MemHogExecutor;
Modified: incubator/mesos/trunk/src/examples/scheduled_memhog.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/scheduled_memhog.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/scheduled_memhog.cpp (original)
+++ incubator/mesos/trunk/src/examples/scheduled_memhog.cpp Sun Jun 5 09:27:14 2011
@@ -1,5 +1,3 @@
-#include <mesos_sched.hpp>
-
#include <libgen.h>
#include <stdlib.h>
#include <unistd.h>
@@ -13,10 +11,10 @@
#include <boost/lexical_cast.hpp>
#include <boost/unordered_map.hpp>
-#include "foreach.hpp"
+#include <mesos/scheduler.hpp>
-using namespace std;
using namespace mesos;
+using namespace std;
using boost::lexical_cast;
@@ -100,7 +98,9 @@ public:
time_t now = time(0);
double curTime = difftime(now, startTime);
vector<TaskDescription> toLaunch;
- foreach (const SlaveOffer &offer, offers) {
+ vector<SlaveOffer>::const_iterator iterator = offers.begin();
+ for (; iterator != offers.end(); ++iterator) {
+ const SlaveOffer& offer = *iterator;
// Lookup resources we care about.
// TODO(benh): It would be nice to ultimately have some helper
// functions for looking up resources.
Modified: incubator/mesos/trunk/src/exec/exec.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/exec/exec.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/exec/exec.cpp (original)
+++ incubator/mesos/trunk/src/exec/exec.cpp Sun Jun 5 09:27:14 2011
@@ -6,12 +6,13 @@
#include <string>
#include <sstream>
-#include <mesos_exec.hpp>
-#include <process.hpp>
-
#include <boost/bind.hpp>
#include <boost/unordered_map.hpp>
+#include <mesos/executor.hpp>
+
+#include <process/process.hpp>
+
#include "common/fatal.hpp"
#include "common/lock.hpp"
#include "common/logging.hpp"
Modified: incubator/mesos/trunk/src/java/jni/construct.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/construct.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/construct.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/construct.cpp Sun Jun 5 09:27:14 2011
@@ -5,10 +5,9 @@
#include <string>
#include <map>
+#include <mesos/mesos.hpp>
+
#include "construct.hpp"
-#include "foreach.hpp"
-#include "mesos_exec.hpp"
-#include "mesos_sched.hpp"
using namespace mesos;
Modified: incubator/mesos/trunk/src/java/jni/convert.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/convert.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/convert.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/convert.cpp Sun Jun 5 09:27:14 2011
@@ -2,9 +2,9 @@
#include <string>
+#include <mesos/mesos.hpp>
+
#include "convert.hpp"
-#include "mesos_exec.hpp"
-#include "mesos_sched.hpp"
using namespace mesos;
Modified: incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp Sun Jun 5 09:27:14 2011
@@ -1,9 +1,10 @@
#include <string>
+#include <mesos/executor.hpp>
+
#include "construct.hpp"
#include "convert.hpp"
#include "org_apache_mesos_MesosExecutorDriver.h"
-#include "mesos_exec.hpp"
using namespace mesos;
Modified: incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp Sun Jun 5 09:27:14 2011
@@ -2,11 +2,13 @@
#include <map>
#include <vector>
+#include <mesos/scheduler.hpp>
+
#include "construct.hpp"
#include "convert.hpp"
-#include "foreach.hpp"
#include "org_apache_mesos_MesosSchedulerDriver.h"
-#include "mesos_sched.hpp"
+
+#include "common/foreach.hpp"
using namespace mesos;
Modified: incubator/mesos/trunk/src/launcher/launcher.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/launcher/launcher.hpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/launcher/launcher.hpp (original)
+++ incubator/mesos/trunk/src/launcher/launcher.hpp Sun Jun 5 09:27:14 2011
@@ -5,7 +5,7 @@
#include <string>
#include <vector>
-#include <mesos.hpp>
+#include <mesos/mesos.hpp>
#include "common/fatal.hpp"
Modified: incubator/mesos/trunk/src/launcher/main.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/launcher/main.cpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/launcher/main.cpp (original)
+++ incubator/mesos/trunk/src/launcher/main.cpp Sun Jun 5 09:27:14 2011
@@ -1,4 +1,4 @@
-#include <mesos.hpp>
+#include <mesos/mesos.hpp>
#include <boost/lexical_cast.hpp>
Modified: incubator/mesos/trunk/src/local/local.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/local/local.hpp?rev=1132335&r1=1132334&r2=1132335&view=diff
==============================================================================
--- incubator/mesos/trunk/src/local/local.hpp (original)
+++ incubator/mesos/trunk/src/local/local.hpp Sun Jun 5 09:27:14 2011
@@ -1,7 +1,7 @@
#ifndef __MESOS_LOCAL_HPP__
#define __MESOS_LOCAL_HPP__
-#include <process.hpp>
+#include <process/process.hpp>
#include "configurator/configurator.hpp"