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 10:20:38 UTC
svn commit: r1131991 - in /incubator/mesos/trunk: ./ src/ src/common/
src/config/ src/configurator/ src/detector/ src/exec/ src/launcher/
src/local/ src/master/ src/messaging/ src/sched/ src/slave/ src/tests/
src/webui/bottle-0.5.6/ src/webui/bottle-0....
Author: benh
Date: Sun Jun 5 08:20:34 2011
New Revision: 1131991
URL: http://svn.apache.org/viewvc?rev=1131991&view=rev
Log:
Directory reorganization and getting Mesos to compile in a separate build directory.
Added:
incubator/mesos/trunk/src/common/
incubator/mesos/trunk/src/common/factory.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/factory.hpp
incubator/mesos/trunk/src/common/fatal.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/fatal.cpp
incubator/mesos/trunk/src/common/fatal.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/fatal.hpp
incubator/mesos/trunk/src/common/foreach.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/foreach.hpp
incubator/mesos/trunk/src/common/lock.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/lock.cpp
incubator/mesos/trunk/src/common/lock.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/lock.hpp
incubator/mesos/trunk/src/common/logging.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/logging.cpp
incubator/mesos/trunk/src/common/logging.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/logging.hpp
incubator/mesos/trunk/src/common/params.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/params.cpp
incubator/mesos/trunk/src/common/params.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/params.hpp
incubator/mesos/trunk/src/common/resources.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/resources.hpp
incubator/mesos/trunk/src/common/string_utils.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/string_utils.cpp
incubator/mesos/trunk/src/common/string_utils.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/string_utils.hpp
incubator/mesos/trunk/src/common/task.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/task.hpp
incubator/mesos/trunk/src/config/
incubator/mesos/trunk/src/config/config.hpp.in
- copied, changed from r1131990, incubator/mesos/trunk/src/config.hpp.in
incubator/mesos/trunk/src/configurator/
incubator/mesos/trunk/src/configurator/configurator.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/configurator.cpp
incubator/mesos/trunk/src/configurator/configurator.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/configurator.hpp
incubator/mesos/trunk/src/configurator/get_conf.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/get_conf.cpp
incubator/mesos/trunk/src/configurator/option.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/option.hpp
incubator/mesos/trunk/src/detector/
incubator/mesos/trunk/src/detector/detector.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master_detector.cpp
incubator/mesos/trunk/src/detector/detector.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master_detector.hpp
incubator/mesos/trunk/src/detector/url_processor.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/url_processor.cpp
incubator/mesos/trunk/src/detector/url_processor.hpp
incubator/mesos/trunk/src/detector/zookeeper.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/zookeeper.cpp
incubator/mesos/trunk/src/detector/zookeeper.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/zookeeper.hpp
incubator/mesos/trunk/src/exec/
incubator/mesos/trunk/src/exec/exec.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/mesos_exec.cpp
incubator/mesos/trunk/src/launcher/
incubator/mesos/trunk/src/launcher/launcher.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/launcher.cpp
incubator/mesos/trunk/src/launcher/launcher.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/launcher.hpp
incubator/mesos/trunk/src/launcher/main.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/launcher_main.cpp
incubator/mesos/trunk/src/local/
incubator/mesos/trunk/src/local/local.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/mesos_local.cpp
incubator/mesos/trunk/src/local/local.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/mesos_local.hpp
incubator/mesos/trunk/src/local/main.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/local.cpp
incubator/mesos/trunk/src/master/
incubator/mesos/trunk/src/master/allocator.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/allocator.hpp
incubator/mesos/trunk/src/master/allocator_factory.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/allocator_factory.cpp
incubator/mesos/trunk/src/master/allocator_factory.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/allocator_factory.hpp
incubator/mesos/trunk/src/master/main.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master_main.cpp
incubator/mesos/trunk/src/master/master.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master.cpp
incubator/mesos/trunk/src/master/master.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master.hpp
incubator/mesos/trunk/src/master/simple_allocator.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/simple_allocator.cpp
incubator/mesos/trunk/src/master/simple_allocator.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/simple_allocator.hpp
incubator/mesos/trunk/src/master/state.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master_state.hpp
incubator/mesos/trunk/src/master/webui.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master_webui.cpp
incubator/mesos/trunk/src/master/webui.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/master_webui.hpp
incubator/mesos/trunk/src/messaging/
incubator/mesos/trunk/src/messaging/messages.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/messages.cpp
incubator/mesos/trunk/src/messaging/messages.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/messages.hpp
incubator/mesos/trunk/src/sched/
incubator/mesos/trunk/src/sched/sched.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/mesos_sched.cpp
incubator/mesos/trunk/src/slave/
incubator/mesos/trunk/src/slave/isolation_module.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/isolation_module.cpp
incubator/mesos/trunk/src/slave/isolation_module.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/isolation_module.hpp
incubator/mesos/trunk/src/slave/isolation_module_factory.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/isolation_module_factory.cpp
incubator/mesos/trunk/src/slave/isolation_module_factory.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/isolation_module_factory.hpp
incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/lxc_isolation_module.cpp
incubator/mesos/trunk/src/slave/lxc_isolation_module.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/lxc_isolation_module.hpp
incubator/mesos/trunk/src/slave/main.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/slave_main.cpp
incubator/mesos/trunk/src/slave/process_based_isolation_module.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/process_based_isolation_module.cpp
incubator/mesos/trunk/src/slave/process_based_isolation_module.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/process_based_isolation_module.hpp
incubator/mesos/trunk/src/slave/projd.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/projd.cpp
incubator/mesos/trunk/src/slave/slave.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/slave.cpp
incubator/mesos/trunk/src/slave/slave.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/slave.hpp
incubator/mesos/trunk/src/slave/solaris_project_isolation_module.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/solaris_project_isolation_module.cpp
incubator/mesos/trunk/src/slave/solaris_project_isolation_module.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/solaris_project_isolation_module.hpp
incubator/mesos/trunk/src/slave/state.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/slave_state.hpp
incubator/mesos/trunk/src/slave/webui.cpp
- copied, changed from r1131990, incubator/mesos/trunk/src/slave_webui.cpp
incubator/mesos/trunk/src/slave/webui.hpp
- copied, changed from r1131990, incubator/mesos/trunk/src/slave_webui.hpp
incubator/mesos/trunk/src/webui/bottle-0.5.6/
incubator/mesos/trunk/src/webui/bottle-0.5.6/PKG-INFO
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/PKG-INFO
incubator/mesos/trunk/src/webui/bottle-0.5.6/README
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/README
incubator/mesos/trunk/src/webui/bottle-0.5.6/bottle.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/bottle.py
incubator/mesos/trunk/src/webui/bottle-0.5.6/setup.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/setup.py
incubator/mesos/trunk/src/webui/bottle-0.5.6/test/
incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_db.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_db.py
incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_environ.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_environ.py
incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_routes.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_routes.py
incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_templates.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_templates.py
incubator/mesos/trunk/src/webui/bottle-0.5.6/test/testall.py
- copied, changed from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/testall.py
Removed:
incubator/mesos/trunk/src/allocator.hpp
incubator/mesos/trunk/src/allocator_factory.cpp
incubator/mesos/trunk/src/allocator_factory.hpp
incubator/mesos/trunk/src/config.hpp.in
incubator/mesos/trunk/src/configurator.cpp
incubator/mesos/trunk/src/configurator.hpp
incubator/mesos/trunk/src/factory.hpp
incubator/mesos/trunk/src/fatal.cpp
incubator/mesos/trunk/src/fatal.hpp
incubator/mesos/trunk/src/foreach.hpp
incubator/mesos/trunk/src/get_conf.cpp
incubator/mesos/trunk/src/isolation_module.cpp
incubator/mesos/trunk/src/isolation_module.hpp
incubator/mesos/trunk/src/isolation_module_factory.cpp
incubator/mesos/trunk/src/isolation_module_factory.hpp
incubator/mesos/trunk/src/launcher.cpp
incubator/mesos/trunk/src/launcher.hpp
incubator/mesos/trunk/src/launcher_main.cpp
incubator/mesos/trunk/src/local.cpp
incubator/mesos/trunk/src/lock.cpp
incubator/mesos/trunk/src/lock.hpp
incubator/mesos/trunk/src/logging.cpp
incubator/mesos/trunk/src/logging.hpp
incubator/mesos/trunk/src/lxc_isolation_module.cpp
incubator/mesos/trunk/src/lxc_isolation_module.hpp
incubator/mesos/trunk/src/master.cpp
incubator/mesos/trunk/src/master.hpp
incubator/mesos/trunk/src/master_detector.cpp
incubator/mesos/trunk/src/master_detector.hpp
incubator/mesos/trunk/src/master_main.cpp
incubator/mesos/trunk/src/master_state.hpp
incubator/mesos/trunk/src/master_webui.cpp
incubator/mesos/trunk/src/master_webui.hpp
incubator/mesos/trunk/src/mesos_exec.cpp
incubator/mesos/trunk/src/mesos_local.cpp
incubator/mesos/trunk/src/mesos_local.hpp
incubator/mesos/trunk/src/mesos_sched.cpp
incubator/mesos/trunk/src/messages.cpp
incubator/mesos/trunk/src/messages.hpp
incubator/mesos/trunk/src/option.hpp
incubator/mesos/trunk/src/params.cpp
incubator/mesos/trunk/src/params.hpp
incubator/mesos/trunk/src/process_based_isolation_module.cpp
incubator/mesos/trunk/src/process_based_isolation_module.hpp
incubator/mesos/trunk/src/projd.cpp
incubator/mesos/trunk/src/resources.hpp
incubator/mesos/trunk/src/simple_allocator.cpp
incubator/mesos/trunk/src/simple_allocator.hpp
incubator/mesos/trunk/src/slave.cpp
incubator/mesos/trunk/src/slave.hpp
incubator/mesos/trunk/src/slave_main.cpp
incubator/mesos/trunk/src/slave_state.hpp
incubator/mesos/trunk/src/slave_webui.cpp
incubator/mesos/trunk/src/slave_webui.hpp
incubator/mesos/trunk/src/solaris_project_isolation_module.cpp
incubator/mesos/trunk/src/solaris_project_isolation_module.hpp
incubator/mesos/trunk/src/string_utils.cpp
incubator/mesos/trunk/src/string_utils.hpp
incubator/mesos/trunk/src/task.hpp
incubator/mesos/trunk/src/url_processor.cpp
incubator/mesos/trunk/src/url_processor.hpp
incubator/mesos/trunk/src/zookeeper.cpp
incubator/mesos/trunk/src/zookeeper.hpp
incubator/mesos/trunk/third_party/bottle-0.5.6/PKG-INFO
incubator/mesos/trunk/third_party/bottle-0.5.6/README
incubator/mesos/trunk/third_party/bottle-0.5.6/bottle.py
incubator/mesos/trunk/third_party/bottle-0.5.6/setup.py
incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_db.py
incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_environ.py
incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_routes.py
incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_templates.py
incubator/mesos/trunk/third_party/bottle-0.5.6/test/testall.py
Modified:
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/tests/Makefile.in
incubator/mesos/trunk/src/tests/external_test.cpp
incubator/mesos/trunk/src/tests/main.cpp
incubator/mesos/trunk/src/tests/test_configurator.cpp
incubator/mesos/trunk/src/tests/test_master.cpp
incubator/mesos/trunk/src/tests/test_resources.cpp
incubator/mesos/trunk/src/tests/test_string_utils.cpp
incubator/mesos/trunk/src/webui/master/swig/master.i
incubator/mesos/trunk/src/webui/slave/swig/slave.i
Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun 5 08:20:34 2011
@@ -1700,7 +1700,7 @@ ac_configure_args=`echo $ac_configure_ar
sed -e "s/CXXFLAGS=/CXXFLAGS=-O2 -fno-strict-aliasing /"`
ac_configure_args="$ac_configure_args --enable-shared=no --with-pic"
-ac_config_files="$ac_config_files Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/config.hpp"
+ac_config_files="$ac_config_files Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/config/config.hpp"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3704,7 +3704,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
"src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
- "src/config.hpp") CONFIG_FILES="$CONFIG_FILES src/config.hpp" ;;
+ "src/config/config.hpp") CONFIG_FILES="$CONFIG_FILES src/config/config.hpp" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 08:20:34 2011
@@ -22,7 +22,7 @@ ac_configure_args=`echo $ac_configure_ar
sed -e "s/CXXFLAGS=/CXXFLAGS=-O2 -fno-strict-aliasing /"`
ac_configure_args="$ac_configure_args --enable-shared=no --with-pic"
-AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/config.hpp])
+AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/config/config.hpp])
AC_CONFIG_SUBDIRS([third_party/libprocess])
AC_CONFIG_SUBDIRS([third_party/gtest-1.5.0])
AC_CONFIG_SUBDIRS([third_party/glog-0.3.1])
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 08:20:34 2011
@@ -40,9 +40,9 @@ ZOOKEEPER = third_party/zookeeper-3.3.1/
CFLAGS += -g
CXXFLAGS += -g
-# Add source dir to CFLAGS and CXXFLAGS.
-CFLAGS += -I@srcdir@
-CXXFLAGS += -I@srcdir@
+# Add source dir and build dir to CFLAGS and CXXFLAGS.
+CFLAGS += -I@srcdir@ -I.
+CXXFLAGS += -I@srcdir@ -I.
# Add include to CFLAGS and CXXFLAGS.
CFLAGS += -I@top_srcdir@/include
@@ -93,37 +93,39 @@ ifeq ($(WITH_ZOOKEEPER),1)
LIBS += -lzookeeper_st
endif
-MASTER_OBJ = master.o allocator_factory.o simple_allocator.o
+MASTER_OBJ = master/master.o master/allocator_factory.o master/simple_allocator.o
-SLAVE_OBJ = slave.o launcher.o isolation_module.o \
- process_based_isolation_module.o
+SLAVE_OBJ = slave/slave.o launcher/launcher.o slave/isolation_module.o \
+ slave/process_based_isolation_module.o
ifeq ($(OS_NAME),solaris)
- SLAVE_OBJ += solaris_project_isolation_module.o
+ SLAVE_OBJ += slave/solaris_project_isolation_module.o
endif
ifeq ($(OS_NAME),linux)
- SLAVE_OBJ += lxc_isolation_module.o
+ SLAVE_OBJ += slave/lxc_isolation_module.o
endif
-MASTER_WEBUI_OBJ = master_webui.o
+MASTER_WEBUI_OBJ = master/webui.o
MASTER_SWIG_WEBUI_OBJ = webui/master/swig/master_wrap.o
-SLAVE_WEBUI_OBJ = slave_webui.o
+SLAVE_WEBUI_OBJ = slave/webui.o
SLAVE_SWIG_WEBUI_OBJ = webui/slave/swig/slave_wrap.o
WEBUI_OBJ = $(MASTER_WEBUI_OBJ) $(SLAVE_WEBUI_OBJ)
SWIG_WEBUI_OBJ = $(MASTER_SWIG_WEBUI_OBJ) $(SLAVE_SWIG_WEBUI_OBJ)
-COMMON_OBJ = fatal.o messages.o lock.o master_detector.o params.o \
- url_processor.o configurator.o string_utils.o logging.o
+COMMON_OBJ = common/fatal.o messaging/messages.o common/lock.o \
+ detector/detector.o common/params.o \
+ detector/url_processor.o configurator/configurator.o \
+ common/string_utils.o common/logging.o
ifeq ($(WITH_ZOOKEEPER),1)
- COMMON_OBJ += zookeeper.o
+ COMMON_OBJ += detector/zookeeper.o
endif
-EXEC_LIB_OBJ = mesos_exec.o
-SCHED_LIB_OBJ = mesos_sched.o mesos_local.o
+EXEC_LIB_OBJ = exec/exec.o
+SCHED_LIB_OBJ = sched/sched.o local/local.o
BASIC_OBJ = $(MASTER_OBJ) $(SLAVE_OBJ) $(COMMON_OBJ) \
$(SCHED_LIB_OBJ) $(EXEC_LIB_OBJ)
@@ -161,6 +163,31 @@ endif
MESOS_PYTHON_LIB = swig/python/_mesos.so
+# In the event we are building in a directory other than source we
+# need to copy over the webui stuff so that the binaries can be run.
+WEBUI_FILES = webui/bottle-0.5.6 webui/common/webui_lib.py \
+ webui/master/framework.tpl webui/master/index.tpl \
+ webui/master/webui.py webui/slave/framework.tpl \
+ webui/slave/index.tpl webui/slave/webui.py \
+ webui/static/stylesheet.css
+
+# Create all the directories that we use but don't get created by
+# default because we don't have a Makefile.in in them.
+$(shell mkdir -p common)
+$(shell mkdir -p configurator)
+$(shell mkdir -p detector)
+$(shell mkdir -p exec)
+$(shell mkdir -p launcher)
+$(shell mkdir -p local)
+$(shell mkdir -p master)
+$(shell mkdir -p messaging)
+$(shell mkdir -p sched)
+$(shell mkdir -p slave)
+$(shell mkdir -p webui/common)
+$(shell mkdir -p webui/master)
+$(shell mkdir -p webui/slave)
+$(shell mkdir -p webui/static)
+
default: all
@@ -187,7 +214,7 @@ $(WEBUI_OBJ): %.o: @srcdir@/%.cpp
$(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.hpp @srcdir@/config.hpp
+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
ifeq ($(WITH_WEBUI),1)
mkdir -p webui/master/swig
$(SWIG) -c++ -python -outdir webui/master/swig -I@top_srcdir@/include -I@srcdir@ -o $@ $<
@@ -195,7 +222,7 @@ 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.hpp @srcdir@/config.hpp
+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
ifeq ($(WITH_WEBUI),1)
mkdir -p webui/slave/swig
$(SWIG) -c++ -python -outdir webui/slave/swig -I@top_srcdir@/include -I@srcdir@ -o $@ $<
@@ -205,22 +232,22 @@ endif
$(MESOS_EXES): $(COMMON_OBJ)
-mesos-master: @srcdir@/master_main.cpp $(MASTER_OBJ) $(MASTER_WEBUI_OBJ) $(MASTER_SWIG_WEBUI_OBJ)
+mesos-master: @srcdir@/master/main.cpp $(MASTER_OBJ) $(MASTER_WEBUI_OBJ) $(MASTER_SWIG_WEBUI_OBJ)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(WEBUI_LDFLAGS) $(LIBS)
-mesos-slave: @srcdir@/slave_main.cpp $(SLAVE_OBJ) $(SLAVE_WEBUI_OBJ) $(SLAVE_SWIG_WEBUI_OBJ)
+mesos-slave: @srcdir@/slave/main.cpp $(SLAVE_OBJ) $(SLAVE_WEBUI_OBJ) $(SLAVE_SWIG_WEBUI_OBJ)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(WEBUI_LDFLAGS) $(LIBS)
-mesos-launcher: @srcdir@/launcher_main.cpp launcher.o
+mesos-launcher: @srcdir@/launcher/main.cpp launcher/launcher.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-mesos-projd: @srcdir@/projd.cpp
+mesos-projd: @srcdir@/slave/projd.cpp
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-mesos-local: @srcdir@/local.cpp mesos_local.o $(MASTER_OBJ) $(SLAVE_OBJ)
+mesos-local: @srcdir@/local/main.cpp local/local.o $(MASTER_OBJ) $(SLAVE_OBJ)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-mesos-getconf: @srcdir@/get_conf.cpp
+mesos-getconf: @srcdir@/configurator/get_conf.cpp
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
java: $(MESOS_JAVA_LIB) swig/java/mesos.jar
@@ -250,10 +277,15 @@ ifdef PYTHON_HEADERS
$(CXX) $(CXXFLAGS) -I$(PYTHON_HEADERS) -shared -o $@ swig/python/mesos_wrap.cpp $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS)
endif
-test:
+$(WEBUI_FILES): %: @srcdir@/%
+ifeq ($(WITH_WEBUI),1)
+ cp -r @srcdir@/$@ $@
+endif
+
+test: all
$(MAKE) -C tests test
-all: $(MESOS_LIBS) $(MESOS_EXES) java python
+all: $(MESOS_LIBS) $(MESOS_EXES) java python $(WEBUI_FILES)
$(MAKE) -C examples
$(MAKE) -C tests
Copied: incubator/mesos/trunk/src/common/factory.hpp (from r1131990, incubator/mesos/trunk/src/factory.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/factory.hpp?p2=incubator/mesos/trunk/src/common/factory.hpp&p1=incubator/mesos/trunk/src/factory.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/fatal.cpp (from r1131990, incubator/mesos/trunk/src/fatal.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/fatal.cpp?p2=incubator/mesos/trunk/src/common/fatal.cpp&p1=incubator/mesos/trunk/src/fatal.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/fatal.cpp (original)
+++ incubator/mesos/trunk/src/common/fatal.cpp Sun Jun 5 08:20:34 2011
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
+
void __fatal(const char *file, int line, const char *fmt, ...)
{
va_list args;
@@ -13,6 +14,7 @@ void __fatal(const char *file, int line,
exit(1);
}
+
void __fatalerror(const char *file, int line, const char *fmt, ...)
{
va_list args;
Copied: incubator/mesos/trunk/src/common/fatal.hpp (from r1131990, incubator/mesos/trunk/src/fatal.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/fatal.hpp?p2=incubator/mesos/trunk/src/common/fatal.hpp&p1=incubator/mesos/trunk/src/fatal.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/fatal.hpp (original)
+++ incubator/mesos/trunk/src/common/fatal.hpp Sun Jun 5 08:20:34 2011
@@ -1,9 +1,3 @@
-/*
- * Basic perror + exit routines.
- *
- * Contributed by Benjamin Hindman <be...@berkeley.edu>, 2008.
- */
-
#ifndef FATAL_HPP
#define FATAL_HPP
@@ -11,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
+
/*
* Like the non-debug version except includes the file name and line
* number in the output.
@@ -18,6 +13,7 @@
#define fatal(fmt...) __fatal(__FILE__, __LINE__, fmt)
void __fatal(const char *file, int line, const char *fmt, ...);
+
/*
* Like the non-debug version except includes the file name and line
* number in the output.
@@ -25,4 +21,5 @@ void __fatal(const char *file, int line,
#define fatalerror(fmt...) __fatalerror(__FILE__, __LINE__, fmt)
void __fatalerror(const char *file, int line, const char *fmt, ...);
+
#endif /* FATAL_HPP */
Copied: incubator/mesos/trunk/src/common/foreach.hpp (from r1131990, incubator/mesos/trunk/src/foreach.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/foreach.hpp?p2=incubator/mesos/trunk/src/common/foreach.hpp&p1=incubator/mesos/trunk/src/foreach.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/lock.cpp (from r1131990, incubator/mesos/trunk/src/lock.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/lock.cpp?p2=incubator/mesos/trunk/src/common/lock.cpp&p1=incubator/mesos/trunk/src/lock.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/lock.hpp (from r1131990, incubator/mesos/trunk/src/lock.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/lock.hpp?p2=incubator/mesos/trunk/src/common/lock.hpp&p1=incubator/mesos/trunk/src/lock.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/lock.hpp (original)
+++ incubator/mesos/trunk/src/common/lock.hpp Sun Jun 5 08:20:34 2011
@@ -3,6 +3,7 @@
#include <pthread.h>
+
namespace mesos { namespace internal {
/**
@@ -19,4 +20,5 @@ public:
}} /* namespace mesos { namespace internal { */
+
#endif /* LOCK_HPP */
Copied: incubator/mesos/trunk/src/common/logging.cpp (from r1131990, incubator/mesos/trunk/src/logging.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/logging.cpp?p2=incubator/mesos/trunk/src/common/logging.cpp&p1=incubator/mesos/trunk/src/logging.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/logging.cpp (original)
+++ incubator/mesos/trunk/src/common/logging.cpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,12 @@
-#include "logging.hpp"
-
#include <sys/stat.h>
#include <glog/logging.h>
#include "fatal.hpp"
+#include "logging.hpp"
using std::string;
+
using namespace mesos::internal;
Copied: incubator/mesos/trunk/src/common/logging.hpp (from r1131990, incubator/mesos/trunk/src/logging.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/logging.hpp?p2=incubator/mesos/trunk/src/common/logging.hpp&p1=incubator/mesos/trunk/src/logging.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/logging.hpp (original)
+++ incubator/mesos/trunk/src/common/logging.hpp Sun Jun 5 08:20:34 2011
@@ -1,7 +1,8 @@
#ifndef __LOGGING_HPP__
#define __LOGGING_HPP__
-#include "configurator.hpp"
+#include "configurator/configurator.hpp"
+
namespace mesos { namespace internal {
Copied: incubator/mesos/trunk/src/common/params.cpp (from r1131990, incubator/mesos/trunk/src/params.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/params.cpp?p2=incubator/mesos/trunk/src/common/params.cpp&p1=incubator/mesos/trunk/src/params.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/params.hpp (from r1131990, incubator/mesos/trunk/src/params.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/params.hpp?p2=incubator/mesos/trunk/src/common/params.hpp&p1=incubator/mesos/trunk/src/params.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/resources.hpp (from r1131990, incubator/mesos/trunk/src/resources.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/resources.hpp?p2=incubator/mesos/trunk/src/common/resources.hpp&p1=incubator/mesos/trunk/src/resources.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/string_utils.cpp (from r1131990, incubator/mesos/trunk/src/string_utils.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/string_utils.cpp?p2=incubator/mesos/trunk/src/common/string_utils.cpp&p1=incubator/mesos/trunk/src/string_utils.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/common/string_utils.hpp (from r1131990, incubator/mesos/trunk/src/string_utils.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/string_utils.hpp?p2=incubator/mesos/trunk/src/common/string_utils.hpp&p1=incubator/mesos/trunk/src/string_utils.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/string_utils.hpp (original)
+++ incubator/mesos/trunk/src/common/string_utils.hpp Sun Jun 5 08:20:34 2011
@@ -4,10 +4,8 @@
#include <string>
#include <vector>
-namespace mesos { namespace internal {
-using std::string;
-using std::vector;
+namespace mesos { namespace internal {
/**
* Contains utility functions for dealing with strings used throughout Mesos.
@@ -19,16 +17,17 @@ public:
* Split a string around the character(s) in delims, placing the
* resulting substrings into the tokens vector.
*/
- static void split(const string& str,
- const string& delims,
- vector<string>* tokens);
+ static void split(const std::string& str,
+ const std::string& delims,
+ std::vector<std::string>* tokens);
/**
* Trim a string, removing characters contained in toRemove from both
* the beginning and end. If toRemove is not given, whitespace characters
* are used by default.
*/
- static string trim(const string& str, const string& toRemove = " \t\n\r");
+ static std::string trim(const std::string& str,
+ const std::string& toRemove = " \t\n\r");
};
}} /* namespace mesos::internal */
Copied: incubator/mesos/trunk/src/common/task.hpp (from r1131990, incubator/mesos/trunk/src/task.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/common/task.hpp?p2=incubator/mesos/trunk/src/common/task.hpp&p1=incubator/mesos/trunk/src/task.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/task.hpp (original)
+++ incubator/mesos/trunk/src/common/task.hpp Sun Jun 5 08:20:34 2011
@@ -2,9 +2,10 @@
#define _TASK_HPP_
#include <string>
-#include <glog/logging.h>
+
#include <mesos_types.hpp>
+
namespace mesos { namespace internal {
// An active task. The master only keeps track of tasks that are active.
@@ -14,8 +15,8 @@ struct Task
FrameworkID frameworkId; // Which framework we belong to
Resources resources;
TaskState state;
- string name;
- string message;
+ std::string name;
+ std::string message;
SlaveID slaveId; // Which slave we're on, not used inside slave.*pp.
Task() {}
@@ -24,7 +25,8 @@ struct Task
id(_id), resources(_res), slaveId(_sid) {}
Task(const TaskID &_id, const FrameworkID &_fid, const Resources &_res,
- const TaskState &_s, const string &_n, const string &_m, const SlaveID &_sid = "")
+ const TaskState &_s, const std::string &_n, const std::string &_m,
+ const SlaveID &_sid = "")
: id(_id), frameworkId(_fid), resources(_res), state(_s), name(_n),
message(_m), slaveId(_sid)
{ }
Copied: incubator/mesos/trunk/src/config/config.hpp.in (from r1131990, incubator/mesos/trunk/src/config.hpp.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/config/config.hpp.in?p2=incubator/mesos/trunk/src/config/config.hpp.in&p1=incubator/mesos/trunk/src/config.hpp.in&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/configurator/configurator.cpp (from r1131990, incubator/mesos/trunk/src/configurator.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/configurator/configurator.cpp?p2=incubator/mesos/trunk/src/configurator/configurator.cpp&p1=incubator/mesos/trunk/src/configurator.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/configurator.cpp (original)
+++ incubator/mesos/trunk/src/configurator/configurator.cpp Sun Jun 5 08:20:34 2011
@@ -6,9 +6,10 @@
#include <iostream>
#include "configurator.hpp"
-#include "foreach.hpp"
-#include "params.hpp"
-#include "string_utils.hpp"
+
+#include "common/foreach.hpp"
+#include "common/params.hpp"
+#include "common/string_utils.hpp"
using namespace mesos::internal;
Copied: incubator/mesos/trunk/src/configurator/configurator.hpp (from r1131990, incubator/mesos/trunk/src/configurator.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/configurator/configurator.hpp?p2=incubator/mesos/trunk/src/configurator/configurator.hpp&p1=incubator/mesos/trunk/src/configurator.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/configurator.hpp (original)
+++ incubator/mesos/trunk/src/configurator/configurator.hpp Sun Jun 5 08:20:34 2011
@@ -9,10 +9,10 @@
#include <glog/logging.h>
-#include "params.hpp"
-#include "foreach.hpp"
#include "option.hpp"
+#include "common/params.hpp"
+
namespace mesos { namespace internal {
Copied: incubator/mesos/trunk/src/configurator/get_conf.cpp (from r1131990, incubator/mesos/trunk/src/get_conf.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/configurator/get_conf.cpp?p2=incubator/mesos/trunk/src/configurator/get_conf.cpp&p1=incubator/mesos/trunk/src/get_conf.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/get_conf.cpp (original)
+++ incubator/mesos/trunk/src/configurator/get_conf.cpp Sun Jun 5 08:20:34 2011
@@ -1,7 +1,11 @@
#include <iostream>
+#include <string>
+
#include "configurator.hpp"
using std::cout;
+using std::string;
+
using namespace mesos::internal;
Copied: incubator/mesos/trunk/src/configurator/option.hpp (from r1131990, incubator/mesos/trunk/src/option.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/configurator/option.hpp?p2=incubator/mesos/trunk/src/configurator/option.hpp&p1=incubator/mesos/trunk/src/option.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/option.hpp (original)
+++ incubator/mesos/trunk/src/configurator/option.hpp Sun Jun 5 08:20:34 2011
@@ -4,11 +4,14 @@
#include <algorithm>
#include <iostream>
#include <fstream>
-#include <string>
#include <map>
+#include <string>
+
#include <glog/logging.h>
-#include "params.hpp"
-#include "foreach.hpp"
+
+#include "common/foreach.hpp"
+#include "common/params.hpp"
+
namespace mesos { namespace internal {
Copied: incubator/mesos/trunk/src/detector/detector.cpp (from r1131990, incubator/mesos/trunk/src/master_detector.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/detector.cpp?p2=incubator/mesos/trunk/src/detector/detector.cpp&p1=incubator/mesos/trunk/src/master_detector.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master_detector.cpp (original)
+++ incubator/mesos/trunk/src/detector/detector.cpp Sun Jun 5 08:20:34 2011
@@ -11,12 +11,16 @@
#include <boost/lexical_cast.hpp>
-#include "config.hpp"
-#include "fatal.hpp"
-#include "foreach.hpp"
-#include "master_detector.hpp"
-#include "messages.hpp"
+#include "config/config.hpp"
+
+#include "common/fatal.hpp"
+#include "common/foreach.hpp"
+
+#include "messaging/messages.hpp"
+
+#include "detector.hpp"
#include "url_processor.hpp"
+
#ifdef WITH_ZOOKEEPER
#include "zookeeper.hpp"
#endif
Copied: incubator/mesos/trunk/src/detector/detector.hpp (from r1131990, incubator/mesos/trunk/src/master_detector.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/detector.hpp?p2=incubator/mesos/trunk/src/detector/detector.hpp&p1=incubator/mesos/trunk/src/master_detector.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/detector/url_processor.cpp (from r1131990, incubator/mesos/trunk/src/url_processor.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/url_processor.cpp?p2=incubator/mesos/trunk/src/detector/url_processor.cpp&p1=incubator/mesos/trunk/src/url_processor.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/url_processor.cpp (original)
+++ incubator/mesos/trunk/src/detector/url_processor.cpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,15 @@
+#include <algorithm>
#include <fstream>
#include <iostream>
#include <string>
-#include <algorithm>
+
#include <glog/logging.h>
+
#include "url_processor.hpp"
using namespace std;
+
namespace mesos { namespace internal {
string UrlProcessor::parseZooFile(const string &zooFilename) {
Added: incubator/mesos/trunk/src/detector/url_processor.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/url_processor.hpp?rev=1131991&view=auto
==============================================================================
--- incubator/mesos/trunk/src/detector/url_processor.hpp (added)
+++ incubator/mesos/trunk/src/detector/url_processor.hpp Sun Jun 5 08:20:34 2011
@@ -0,0 +1,21 @@
+#ifndef _URL_PRCESSOR_HPP_
+#define _URL_PRCESSOR_HPP_
+
+#include <string>
+
+
+namespace mesos { namespace internal {
+
+class UrlProcessor {
+
+public:
+ enum URLType { ZOO, MESOS, UNKNOWN };
+
+ static std::string parseZooFile(const std::string &zooFilename);
+
+ static std::pair<UrlProcessor::URLType, std::string> process(const std::string &_url);
+};
+
+}}
+
+#endif /* _URL_PROCESSOR_HPP_ */
Copied: incubator/mesos/trunk/src/detector/zookeeper.cpp (from r1131990, incubator/mesos/trunk/src/zookeeper.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/zookeeper.cpp?p2=incubator/mesos/trunk/src/detector/zookeeper.cpp&p1=incubator/mesos/trunk/src/zookeeper.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/zookeeper.cpp (original)
+++ incubator/mesos/trunk/src/detector/zookeeper.cpp Sun Jun 5 08:20:34 2011
@@ -5,9 +5,10 @@
#include <process.hpp>
-#include "fatal.hpp"
#include "zookeeper.hpp"
+#include "common/fatal.hpp"
+
using std::cerr;
using std::cout;
using std::endl;
Copied: incubator/mesos/trunk/src/detector/zookeeper.hpp (from r1131990, incubator/mesos/trunk/src/zookeeper.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/detector/zookeeper.hpp?p2=incubator/mesos/trunk/src/detector/zookeeper.hpp&p1=incubator/mesos/trunk/src/zookeeper.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/exec/exec.cpp (from r1131990, incubator/mesos/trunk/src/mesos_exec.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/exec/exec.cpp?p2=incubator/mesos/trunk/src/exec/exec.cpp&p1=incubator/mesos/trunk/src/mesos_exec.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/mesos_exec.cpp (original)
+++ incubator/mesos/trunk/src/exec/exec.cpp Sun Jun 5 08:20:34 2011
@@ -1,3 +1,4 @@
+#include <mesos_exec.h>
#include <signal.h>
#include <cerrno>
@@ -5,17 +6,17 @@
#include <string>
#include <sstream>
+#include <mesos_exec.hpp>
#include <process.hpp>
#include <boost/bind.hpp>
#include <boost/unordered_map.hpp>
-#include "mesos_exec.h"
+#include "common/fatal.hpp"
+#include "common/lock.hpp"
+#include "common/logging.hpp"
-#include "fatal.hpp"
-#include "lock.hpp"
-#include "messages.hpp"
-#include "mesos_exec.hpp"
+#include "messaging/messages.hpp"
using std::cerr;
using std::endl;
@@ -28,6 +29,7 @@ using boost::unordered_map;
using namespace mesos;
using namespace mesos::internal;
+
namespace mesos { namespace internal {
class ExecutorProcess : public MesosProcess
Copied: incubator/mesos/trunk/src/launcher/launcher.cpp (from r1131990, incubator/mesos/trunk/src/launcher.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/launcher/launcher.cpp?p2=incubator/mesos/trunk/src/launcher/launcher.cpp&p1=incubator/mesos/trunk/src/launcher.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/launcher.cpp (original)
+++ incubator/mesos/trunk/src/launcher/launcher.cpp Sun Jun 5 08:20:34 2011
@@ -1,5 +1,3 @@
-#include "launcher.hpp"
-
#include <dirent.h>
#include <errno.h>
#include <libgen.h>
@@ -15,8 +13,10 @@
#include <boost/lexical_cast.hpp>
-#include "foreach.hpp"
-#include "string_utils.hpp"
+#include "launcher.hpp"
+
+#include "common/foreach.hpp"
+#include "common/string_utils.hpp"
using std::cerr;
using std::cout;
Copied: incubator/mesos/trunk/src/launcher/launcher.hpp (from r1131990, incubator/mesos/trunk/src/launcher.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/launcher/launcher.hpp?p2=incubator/mesos/trunk/src/launcher/launcher.hpp&p1=incubator/mesos/trunk/src/launcher.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/launcher.hpp (original)
+++ incubator/mesos/trunk/src/launcher/launcher.hpp Sun Jun 5 08:20:34 2011
@@ -4,9 +4,10 @@
#include <string>
#include <vector>
-#include "mesos.hpp"
+#include <mesos.hpp>
+
+#include "common/fatal.hpp"
-#include "fatal.hpp"
namespace mesos { namespace internal { namespace launcher {
Copied: incubator/mesos/trunk/src/launcher/main.cpp (from r1131990, incubator/mesos/trunk/src/launcher_main.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/launcher/main.cpp?p2=incubator/mesos/trunk/src/launcher/main.cpp&p1=incubator/mesos/trunk/src/launcher_main.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/launcher_main.cpp (original)
+++ incubator/mesos/trunk/src/launcher/main.cpp Sun Jun 5 08:20:34 2011
@@ -1,9 +1,9 @@
-#include "launcher.hpp"
-
-#include "mesos.hpp"
+#include <mesos.hpp>
#include <boost/lexical_cast.hpp>
+#include "launcher.hpp"
+
using std::string;
using boost::lexical_cast;
@@ -12,7 +12,8 @@ using namespace mesos;
using namespace mesos::internal::launcher;
-const char * getenvOrFail(const char *variable) {
+const char * getenvOrFail(const char *variable)
+{
const char *value = getenv(variable);
if (!value)
fatal("environment variable %s not set", variable);
Copied: incubator/mesos/trunk/src/local/local.cpp (from r1131990, incubator/mesos/trunk/src/mesos_local.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/local/local.cpp?p2=incubator/mesos/trunk/src/local/local.cpp&p1=incubator/mesos/trunk/src/mesos_local.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/mesos_local.cpp (original)
+++ incubator/mesos/trunk/src/local/local.cpp Sun Jun 5 08:20:34 2011
@@ -3,11 +3,17 @@
#include <map>
#include <vector>
-#include "configurator.hpp"
-#include "foreach.hpp"
-#include "logging.hpp"
-#include "mesos_local.hpp"
-#include "process_based_isolation_module.hpp"
+#include "local.hpp"
+
+#include "common/foreach.hpp"
+#include "common/logging.hpp"
+
+#include "configurator/configurator.hpp"
+
+#include "master/master.hpp"
+
+#include "slave/process_based_isolation_module.hpp"
+#include "slave/slave.hpp"
using std::map;
using std::vector;
Copied: incubator/mesos/trunk/src/local/local.hpp (from r1131990, incubator/mesos/trunk/src/mesos_local.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/local/local.hpp?p2=incubator/mesos/trunk/src/local/local.hpp&p1=incubator/mesos/trunk/src/mesos_local.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/mesos_local.hpp (original)
+++ incubator/mesos/trunk/src/local/local.hpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,10 @@
#ifndef __MESOS_LOCAL_HPP__
#define __MESOS_LOCAL_HPP__
-// Include the master and slave headers here so that the mesos_sched
-// library will re-compile when they are changed.
-#include "master.hpp"
-#include "slave.hpp"
+#include <process.hpp>
+
+#include "configurator/configurator.hpp"
-#include "configurator.hpp"
namespace mesos { namespace internal { namespace local {
Copied: incubator/mesos/trunk/src/local/main.cpp (from r1131990, incubator/mesos/trunk/src/local.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/local/main.cpp?p2=incubator/mesos/trunk/src/local/main.cpp&p1=incubator/mesos/trunk/src/local.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/local.cpp (original)
+++ incubator/mesos/trunk/src/local/main.cpp Sun Jun 5 08:20:34 2011
@@ -1,11 +1,15 @@
-#include <getopt.h>
-
#include <iostream>
#include <string>
-#include "configurator.hpp"
-#include "logging.hpp"
-#include "mesos_local.hpp"
+#include "local.hpp"
+
+#include "configurator/configurator.hpp"
+
+#include "common/logging.hpp"
+
+#include "master/master.hpp"
+
+#include "slave/slave.hpp"
using std::cerr;
using std::endl;
Copied: incubator/mesos/trunk/src/master/allocator.hpp (from r1131990, incubator/mesos/trunk/src/allocator.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/allocator.hpp?p2=incubator/mesos/trunk/src/master/allocator.hpp&p1=incubator/mesos/trunk/src/allocator.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/allocator.hpp (original)
+++ incubator/mesos/trunk/src/master/allocator.hpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,10 @@
#ifndef __ALLOCATOR_HPP__
#define __ALLOCATOR_HPP__
-#include "master.hpp"
+#include "master/master.hpp"
namespace mesos { namespace internal { namespace master {
-using std::vector;
-
class Allocator {
public:
virtual ~Allocator() {}
@@ -25,7 +23,7 @@ public:
virtual void offerReturned(SlotOffer* offer,
OfferReturnReason reason,
- const vector<SlaveResources>& resourcesLeft) {}
+ const std::vector<SlaveResources>& resourcesLeft) {}
virtual void offersRevived(Framework *framework) {}
Copied: incubator/mesos/trunk/src/master/allocator_factory.cpp (from r1131990, incubator/mesos/trunk/src/allocator_factory.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/allocator_factory.cpp?p2=incubator/mesos/trunk/src/master/allocator_factory.cpp&p1=incubator/mesos/trunk/src/allocator_factory.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/master/allocator_factory.hpp (from r1131990, incubator/mesos/trunk/src/allocator_factory.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/allocator_factory.hpp?p2=incubator/mesos/trunk/src/master/allocator_factory.hpp&p1=incubator/mesos/trunk/src/allocator_factory.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/allocator_factory.hpp (original)
+++ incubator/mesos/trunk/src/master/allocator_factory.hpp Sun Jun 5 08:20:34 2011
@@ -2,7 +2,8 @@
#define __ALLOCATOR_FACTORY_HPP__
#include "allocator.hpp"
-#include "factory.hpp"
+
+#include "common/factory.hpp"
namespace mesos { namespace internal { namespace master {
Copied: incubator/mesos/trunk/src/master/main.cpp (from r1131990, incubator/mesos/trunk/src/master_main.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/main.cpp?p2=incubator/mesos/trunk/src/master/main.cpp&p1=incubator/mesos/trunk/src/master_main.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master_main.cpp (original)
+++ incubator/mesos/trunk/src/master/main.cpp Sun Jun 5 08:20:34 2011
@@ -1,10 +1,11 @@
-#include <getopt.h>
#include <libgen.h>
-#include "configurator.hpp"
-#include "logging.hpp"
+#include "common/logging.hpp"
+
+#include "configurator/configurator.hpp"
+
#include "master.hpp"
-#include "master_webui.hpp"
+#include "webui.hpp"
using std::cerr;
using std::endl;
Copied: incubator/mesos/trunk/src/master/master.cpp (from r1131990, incubator/mesos/trunk/src/master.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?p2=incubator/mesos/trunk/src/master/master.cpp&p1=incubator/mesos/trunk/src/master.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Sun Jun 5 08:20:34 2011
@@ -5,7 +5,7 @@
#include "allocator.hpp"
#include "allocator_factory.hpp"
#include "master.hpp"
-#include "master_webui.hpp"
+#include "webui.hpp"
using std::endl;
using std::make_pair;
Copied: incubator/mesos/trunk/src/master/master.hpp (from r1131990, incubator/mesos/trunk/src/master.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.hpp?p2=incubator/mesos/trunk/src/master/master.hpp&p1=incubator/mesos/trunk/src/master.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master.hpp (original)
+++ incubator/mesos/trunk/src/master/master.hpp Sun Jun 5 08:20:34 2011
@@ -21,15 +21,19 @@
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
-#include "configurator.hpp"
-#include "fatal.hpp"
-#include "foreach.hpp"
-#include "master_state.hpp"
-#include "messages.hpp"
-#include "params.hpp"
-#include "resources.hpp"
-#include "master_detector.hpp"
-#include "task.hpp"
+#include "state.hpp"
+
+#include "common/fatal.hpp"
+#include "common/foreach.hpp"
+#include "common/params.hpp"
+#include "common/resources.hpp"
+#include "common/task.hpp"
+
+#include "configurator/configurator.hpp"
+
+#include "detector/detector.hpp"
+
+#include "messaging/messages.hpp"
namespace mesos { namespace internal { namespace master {
Copied: incubator/mesos/trunk/src/master/simple_allocator.cpp (from r1131990, incubator/mesos/trunk/src/simple_allocator.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/simple_allocator.cpp?p2=incubator/mesos/trunk/src/master/simple_allocator.cpp&p1=incubator/mesos/trunk/src/simple_allocator.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/master/simple_allocator.hpp (from r1131990, incubator/mesos/trunk/src/simple_allocator.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/simple_allocator.hpp?p2=incubator/mesos/trunk/src/master/simple_allocator.hpp&p1=incubator/mesos/trunk/src/simple_allocator.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/simple_allocator.hpp (original)
+++ incubator/mesos/trunk/src/master/simple_allocator.hpp Sun Jun 5 08:20:34 2011
@@ -7,7 +7,9 @@
#include <boost/unordered_set.hpp>
#include "allocator.hpp"
-#include "resources.hpp"
+
+#include "common/resources.hpp"
+
namespace mesos { namespace internal { namespace master {
@@ -15,7 +17,8 @@ using std::vector;
using boost::unordered_map;
using boost::unordered_set;
-class SimpleAllocator : public Allocator {
+class SimpleAllocator : public Allocator
+{
Master* master;
Resources totalResources;
Copied: incubator/mesos/trunk/src/master/state.hpp (from r1131990, incubator/mesos/trunk/src/master_state.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/state.hpp?p2=incubator/mesos/trunk/src/master/state.hpp&p1=incubator/mesos/trunk/src/master_state.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master_state.hpp (original)
+++ incubator/mesos/trunk/src/master/state.hpp Sun Jun 5 08:20:34 2011
@@ -5,9 +5,11 @@
#include <string>
#include <vector>
-#include "config.hpp"
-#include "foreach.hpp"
-#include "mesos_types.hpp"
+#include <mesos_types.hpp>
+
+#include "common/foreach.hpp"
+
+#include "config/config.hpp"
namespace mesos { namespace internal { namespace master { namespace state {
Copied: incubator/mesos/trunk/src/master/webui.cpp (from r1131990, incubator/mesos/trunk/src/master_webui.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/webui.cpp?p2=incubator/mesos/trunk/src/master/webui.cpp&p1=incubator/mesos/trunk/src/master_webui.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master_webui.cpp (original)
+++ incubator/mesos/trunk/src/master/webui.cpp Sun Jun 5 08:20:34 2011
@@ -2,8 +2,8 @@
#include <sstream>
-#include "master_webui.hpp"
-#include "master_state.hpp"
+#include "webui.hpp"
+#include "state.hpp"
#ifdef MESOS_WEBUI
@@ -31,7 +31,7 @@ void *runMasterWebUI(void* webuiPort)
PyRun_SimpleString("import sys\n"
"sys.path.append('webui/master/swig')\n"
"sys.path.append('webui/common')\n"
- "sys.path.append('third_party/bottle-0.5.6')\n");
+ "sys.path.append('webui/bottle-0.5.6')\n");
init_master();
LOG(INFO) << "Loading webui/master/webui.py";
FILE *webui = fopen("webui/master/webui.py", "r");
Copied: incubator/mesos/trunk/src/master/webui.hpp (from r1131990, incubator/mesos/trunk/src/master_webui.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/webui.hpp?p2=incubator/mesos/trunk/src/master/webui.hpp&p1=incubator/mesos/trunk/src/master_webui.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master_webui.hpp (original)
+++ incubator/mesos/trunk/src/master/webui.hpp Sun Jun 5 08:20:34 2011
@@ -3,7 +3,8 @@
#include <process.hpp>
-#include "config.hpp"
+#include "config/config.hpp"
+
#include "master.hpp"
#ifdef MESOS_WEBUI
Copied: incubator/mesos/trunk/src/messaging/messages.cpp (from r1131990, incubator/mesos/trunk/src/messages.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messaging/messages.cpp?p2=incubator/mesos/trunk/src/messaging/messages.cpp&p1=incubator/mesos/trunk/src/messages.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/messaging/messages.hpp (from r1131990, incubator/mesos/trunk/src/messages.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messaging/messages.hpp?p2=incubator/mesos/trunk/src/messaging/messages.hpp&p1=incubator/mesos/trunk/src/messages.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messages.hpp (original)
+++ incubator/mesos/trunk/src/messaging/messages.hpp Sun Jun 5 08:20:34 2011
@@ -15,12 +15,15 @@
#include <mesos.hpp>
#include <mesos_types.hpp>
-#include "foreach.hpp"
-#include "master_state.hpp"
-#include "params.hpp"
-#include "resources.hpp"
-#include "slave_state.hpp"
-#include "task.hpp"
+#include "common/foreach.hpp"
+#include "common/logging.hpp"
+#include "common/params.hpp"
+#include "common/resources.hpp"
+#include "common/task.hpp"
+
+#include "master/state.hpp"
+
+#include "slave/state.hpp"
namespace mesos { namespace internal {
Copied: incubator/mesos/trunk/src/sched/sched.cpp (from r1131990, incubator/mesos/trunk/src/mesos_sched.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/sched/sched.cpp?p2=incubator/mesos/trunk/src/sched/sched.cpp&p1=incubator/mesos/trunk/src/mesos_sched.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/mesos_sched.cpp (original)
+++ incubator/mesos/trunk/src/sched/sched.cpp Sun Jun 5 08:20:34 2011
@@ -1,5 +1,6 @@
#include <dlfcn.h>
#include <errno.h>
+#include <mesos_sched.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -13,20 +14,25 @@
#include <string>
#include <sstream>
+#include <mesos_sched.hpp>
#include <reliable.hpp>
#include <boost/bind.hpp>
#include <boost/unordered_map.hpp>
-#include "mesos_sched.h"
+#include "common/fatal.hpp"
+#include "common/lock.hpp"
+#include "common/logging.hpp"
-#include "fatal.hpp"
-#include "lock.hpp"
-#include "logging.hpp"
-#include "master_detector.hpp"
-#include "messages.hpp"
-#include "mesos_local.hpp"
-#include "mesos_sched.hpp"
+#include "detector/detector.hpp"
+
+#include "local/local.hpp"
+
+#include "master/master.hpp"
+
+#include "messaging/messages.hpp"
+
+#include "slave/slave.hpp"
#define REPLY_TIMEOUT 20
@@ -43,6 +49,7 @@ using boost::unordered_map;
using namespace mesos;
using namespace mesos::internal;
+
using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
Copied: incubator/mesos/trunk/src/slave/isolation_module.cpp (from r1131990, incubator/mesos/trunk/src/isolation_module.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/isolation_module.cpp?p2=incubator/mesos/trunk/src/slave/isolation_module.cpp&p1=incubator/mesos/trunk/src/isolation_module.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/slave/isolation_module.hpp (from r1131990, incubator/mesos/trunk/src/isolation_module.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/isolation_module.hpp?p2=incubator/mesos/trunk/src/slave/isolation_module.hpp&p1=incubator/mesos/trunk/src/isolation_module.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/slave/isolation_module_factory.cpp (from r1131990, incubator/mesos/trunk/src/isolation_module_factory.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/isolation_module_factory.cpp?p2=incubator/mesos/trunk/src/slave/isolation_module_factory.cpp&p1=incubator/mesos/trunk/src/isolation_module_factory.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/slave/isolation_module_factory.hpp (from r1131990, incubator/mesos/trunk/src/isolation_module_factory.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/isolation_module_factory.hpp?p2=incubator/mesos/trunk/src/slave/isolation_module_factory.hpp&p1=incubator/mesos/trunk/src/isolation_module_factory.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/isolation_module_factory.hpp (original)
+++ incubator/mesos/trunk/src/slave/isolation_module_factory.hpp Sun Jun 5 08:20:34 2011
@@ -2,7 +2,9 @@
#define __ISOLATION_MODULE_FACTORY_HPP__
#include "isolation_module.hpp"
-#include "factory.hpp"
+
+#include "common/factory.hpp"
+
namespace mesos { namespace internal { namespace slave {
Copied: incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp (from r1131990, incubator/mesos/trunk/src/lxc_isolation_module.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp?p2=incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp&p1=incubator/mesos/trunk/src/lxc_isolation_module.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/lxc_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,13 @@
-#include "lxc_isolation_module.hpp"
-
#include <stdlib.h>
#include <unistd.h>
#include <algorithm>
-#include "foreach.hpp"
-#include "launcher.hpp"
+#include "lxc_isolation_module.hpp"
+
+#include "common/foreach.hpp"
+
+#include "launcher/launcher.hpp"
using std::cerr;
using std::cout;
Copied: incubator/mesos/trunk/src/slave/lxc_isolation_module.hpp (from r1131990, incubator/mesos/trunk/src/lxc_isolation_module.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/lxc_isolation_module.hpp?p2=incubator/mesos/trunk/src/slave/lxc_isolation_module.hpp&p1=incubator/mesos/trunk/src/lxc_isolation_module.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/lxc_isolation_module.hpp (original)
+++ incubator/mesos/trunk/src/slave/lxc_isolation_module.hpp Sun Jun 5 08:20:34 2011
@@ -6,9 +6,11 @@
#include <boost/unordered_map.hpp>
#include "isolation_module.hpp"
-#include "messages.hpp"
#include "slave.hpp"
+#include "messaging/messages.hpp"
+
+
namespace mesos { namespace internal { namespace slave {
using std::string;
Copied: incubator/mesos/trunk/src/slave/main.cpp (from r1131990, incubator/mesos/trunk/src/slave_main.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/main.cpp?p2=incubator/mesos/trunk/src/slave/main.cpp&p1=incubator/mesos/trunk/src/slave_main.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_main.cpp (original)
+++ incubator/mesos/trunk/src/slave/main.cpp Sun Jun 5 08:20:34 2011
@@ -1,10 +1,10 @@
-#include <getopt.h>
+#include "common/logging.hpp"
+
+#include "configurator/configurator.hpp"
-#include "configurator.hpp"
#include "isolation_module_factory.hpp"
-#include "logging.hpp"
#include "slave.hpp"
-#include "slave_webui.hpp"
+#include "webui.hpp"
using boost::lexical_cast;
using boost::bad_lexical_cast;
Copied: incubator/mesos/trunk/src/slave/process_based_isolation_module.cpp (from r1131990, incubator/mesos/trunk/src/process_based_isolation_module.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/process_based_isolation_module.cpp?p2=incubator/mesos/trunk/src/slave/process_based_isolation_module.cpp&p1=incubator/mesos/trunk/src/process_based_isolation_module.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/process_based_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/slave/process_based_isolation_module.cpp Sun Jun 5 08:20:34 2011
@@ -1,6 +1,6 @@
#include "process_based_isolation_module.hpp"
-#include "foreach.hpp"
+#include "common/foreach.hpp"
using std::cerr;
using std::cout;
Copied: incubator/mesos/trunk/src/slave/process_based_isolation_module.hpp (from r1131990, incubator/mesos/trunk/src/process_based_isolation_module.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/process_based_isolation_module.hpp?p2=incubator/mesos/trunk/src/slave/process_based_isolation_module.hpp&p1=incubator/mesos/trunk/src/process_based_isolation_module.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/process_based_isolation_module.hpp (original)
+++ incubator/mesos/trunk/src/slave/process_based_isolation_module.hpp Sun Jun 5 08:20:34 2011
@@ -6,10 +6,12 @@
#include <boost/unordered_map.hpp>
#include "isolation_module.hpp"
-#include "launcher.hpp"
-#include "messages.hpp"
#include "slave.hpp"
+#include "launcher/launcher.hpp"
+
+#include "messaging/messages.hpp"
+
namespace mesos { namespace internal { namespace slave {
Copied: incubator/mesos/trunk/src/slave/projd.cpp (from r1131990, incubator/mesos/trunk/src/projd.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/projd.cpp?p2=incubator/mesos/trunk/src/slave/projd.cpp&p1=incubator/mesos/trunk/src/projd.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/projd.cpp (original)
+++ incubator/mesos/trunk/src/slave/projd.cpp Sun Jun 5 08:20:34 2011
@@ -5,8 +5,9 @@
#include <iostream>
#include <string>
-#include "fatal.hpp"
-#include "messages.hpp"
+#include "common/fatal.hpp"
+
+#include "messaging/messages.hpp"
namespace mesos { namespace internal { namespace projd {
Copied: incubator/mesos/trunk/src/slave/slave.cpp (from r1131990, incubator/mesos/trunk/src/slave.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/slave.cpp?p2=incubator/mesos/trunk/src/slave/slave.cpp&p1=incubator/mesos/trunk/src/slave.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave.cpp (original)
+++ incubator/mesos/trunk/src/slave/slave.cpp Sun Jun 5 08:20:34 2011
@@ -3,11 +3,11 @@
#include <stdio.h>
#include <string.h>
-#include <fstream>
#include <algorithm>
+#include <fstream>
#include "slave.hpp"
-#include "slave_webui.hpp"
+#include "webui.hpp"
// There's no gethostbyname2 on Solaris, so fake it by calling gethostbyname
#ifdef __sun__
Copied: incubator/mesos/trunk/src/slave/slave.hpp (from r1131990, incubator/mesos/trunk/src/slave.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/slave.hpp?p2=incubator/mesos/trunk/src/slave/slave.hpp&p1=incubator/mesos/trunk/src/slave.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave.hpp (original)
+++ incubator/mesos/trunk/src/slave/slave.hpp Sun Jun 5 08:20:34 2011
@@ -28,16 +28,21 @@
#include <reliable.hpp>
-#include "configurator.hpp"
-#include "fatal.hpp"
-#include "foreach.hpp"
#include "isolation_module.hpp"
-#include "messages.hpp"
-#include "params.hpp"
-#include "resources.hpp"
-#include "slave_state.hpp"
-#include "master_detector.hpp"
-#include "task.hpp"
+#include "state.hpp"
+
+#include "common/fatal.hpp"
+#include "common/foreach.hpp"
+#include "common/params.hpp"
+#include "common/resources.hpp"
+#include "common/task.hpp"
+
+#include "configurator/configurator.hpp"
+
+#include "detector/detector.hpp"
+
+#include "messaging/messages.hpp"
+
namespace mesos { namespace internal { namespace slave {
Copied: incubator/mesos/trunk/src/slave/solaris_project_isolation_module.cpp (from r1131990, incubator/mesos/trunk/src/solaris_project_isolation_module.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/solaris_project_isolation_module.cpp?p2=incubator/mesos/trunk/src/slave/solaris_project_isolation_module.cpp&p1=incubator/mesos/trunk/src/solaris_project_isolation_module.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/solaris_project_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/slave/solaris_project_isolation_module.cpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,12 @@
-#include "solaris_project_isolation_module.hpp"
-
-#include "foreach.hpp"
-
#include <project.h>
#include <rctl.h>
#include <sys/task.h>
+#include "solaris_project_isolation_module.hpp"
+
+#include "common/foreach.hpp"
+
using std::cerr;
using std::cout;
using std::endl;
Copied: incubator/mesos/trunk/src/slave/solaris_project_isolation_module.hpp (from r1131990, incubator/mesos/trunk/src/solaris_project_isolation_module.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/solaris_project_isolation_module.hpp?p2=incubator/mesos/trunk/src/slave/solaris_project_isolation_module.hpp&p1=incubator/mesos/trunk/src/solaris_project_isolation_module.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/solaris_project_isolation_module.hpp (original)
+++ incubator/mesos/trunk/src/slave/solaris_project_isolation_module.hpp Sun Jun 5 08:20:34 2011
@@ -8,6 +8,7 @@
#include "process_based_isolation_module.hpp"
+
namespace mesos { namespace internal { namespace slave {
using std::string;
Copied: incubator/mesos/trunk/src/slave/state.hpp (from r1131990, incubator/mesos/trunk/src/slave_state.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/state.hpp?p2=incubator/mesos/trunk/src/slave/state.hpp&p1=incubator/mesos/trunk/src/slave_state.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_state.hpp (original)
+++ incubator/mesos/trunk/src/slave/state.hpp Sun Jun 5 08:20:34 2011
@@ -5,9 +5,11 @@
#include <string>
#include <vector>
-#include "config.hpp"
-#include "foreach.hpp"
-#include "mesos_types.hpp"
+#include <mesos_types.hpp>
+
+#include "common/foreach.hpp"
+
+#include "config/config.hpp"
namespace mesos { namespace internal { namespace slave { namespace state {
Copied: incubator/mesos/trunk/src/slave/webui.cpp (from r1131990, incubator/mesos/trunk/src/slave_webui.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/webui.cpp?p2=incubator/mesos/trunk/src/slave/webui.cpp&p1=incubator/mesos/trunk/src/slave_webui.cpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_webui.cpp (original)
+++ incubator/mesos/trunk/src/slave/webui.cpp Sun Jun 5 08:20:34 2011
@@ -2,8 +2,8 @@
#include <sstream>
-#include "slave_webui.hpp"
-#include "slave_state.hpp"
+#include "state.hpp"
+#include "webui.hpp"
#ifdef MESOS_WEBUI
@@ -31,7 +31,7 @@ void *runSlaveWebUI(void* webuiPort)
PyRun_SimpleString("import sys\n"
"sys.path.append('webui/slave/swig')\n"
"sys.path.append('webui/common')\n"
- "sys.path.append('third_party/bottle-0.5.6')\n");
+ "sys.path.append('webui/bottle-0.5.6')\n");
init_slave();
LOG(INFO) << "Loading webui/slave/webui.py";
FILE *webui = fopen("webui/slave/webui.py", "r");
Copied: incubator/mesos/trunk/src/slave/webui.hpp (from r1131990, incubator/mesos/trunk/src/slave_webui.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/webui.hpp?p2=incubator/mesos/trunk/src/slave/webui.hpp&p1=incubator/mesos/trunk/src/slave_webui.hpp&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_webui.hpp (original)
+++ incubator/mesos/trunk/src/slave/webui.hpp Sun Jun 5 08:20:34 2011
@@ -3,9 +3,10 @@
#include <process.hpp>
-#include "config.hpp"
#include "slave.hpp"
+#include "config/config.hpp"
+
#ifdef MESOS_WEBUI
namespace mesos { namespace internal { namespace slave {
Modified: incubator/mesos/trunk/src/tests/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/Makefile.in?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/Makefile.in (original)
+++ incubator/mesos/trunk/src/tests/Makefile.in Sun Jun 5 08:20:34 2011
@@ -27,9 +27,9 @@ ZOOKEEPER = third_party/zookeeper-3.3.1/
CFLAGS += -g
CXXFLAGS += -g
-# Add source dir to CFLAGS and CXXFLAGS.
-CFLAGS += -I@srcdir@/..
-CXXFLAGS += -I@srcdir@/..
+# Add source dir and build dir to CFLAGS and CXXFLAGS.
+CFLAGS += -I@srcdir@/.. -I..
+CXXFLAGS += -I@srcdir@/.. -I..
# Add include to CFLAGS and CXXFLAGS.
CFLAGS += -I@top_srcdir@/include
@@ -80,10 +80,28 @@ endif
SCHED_LIB = ../libmesos_sched.a
EXEC_LIB = ../libmesos_exec.a
-TESTS_OBJ = main.o test_master.o test_resources.o \
- external_test.o test_sample_frameworks.o \
- testing_utils.o test_configurator.o \
- test_string_utils.o test_lxc_isolation.o
+TESTS_OBJ = main.o test_master.o test_resources.o external_test.o \
+ test_sample_frameworks.o testing_utils.o \
+ test_configurator.o test_string_utils.o \
+ test_lxc_isolation.o
+
+EXTERNAL_SCRIPTS = LxcIsolation/HoldMoreMemThanRequested.sh \
+ LxcIsolation/ScaleUpAndDown.sh \
+ LxcIsolation/TwoSeparateTasks.sh \
+ LxcIsolation/run_scheduled_memhog_test.sh \
+ SampleFrameworks/CFramework.sh \
+ SampleFrameworks/CFrameworkCmdlineParsing.sh \
+ SampleFrameworks/CFrameworkInvalidCmdline.sh \
+ SampleFrameworks/CFrameworkInvalidEnv.sh \
+ SampleFrameworks/CppFramework.sh \
+ SampleFrameworks/JavaExceptionFramework.sh \
+ SampleFrameworks/JavaFramework.sh \
+ SampleFrameworks/PythonFramework.sh
+
+# Create the external directories in case they aren't there.
+$(shell mkdir -p external/LxcIsolation)
+$(shell mkdir -p external/SampleFrameworks)
+
default: all
@@ -93,13 +111,16 @@ default: all
$(TESTS_OBJ): %.o: @srcdir@/%.cpp
$(CXX) -c $(CXXFLAGS) -o $@ $<
+$(EXTERNAL_SCRIPTS): %: @srcdir@/external/%
+ cp @srcdir@/external/$@ external/$@
+
alltests: $(TESTS_OBJ)
$(CXX) $(CXXFLAGS) -o $@ $(TESTS_OBJ) $(SCHED_LIB) $(EXEC_LIB) $(LDFLAGS) $(LIBS)
-test: alltests
+test: all
./alltests
-all: alltests
+all: alltests $(EXTERNAL_SCRIPTS)
clean:
rm -f $(patsubst %.o, %.d, $(TESTS_OBJ))
Modified: incubator/mesos/trunk/src/tests/external_test.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/external_test.cpp?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/external_test.cpp (original)
+++ incubator/mesos/trunk/src/tests/external_test.cpp Sun Jun 5 08:20:34 2011
@@ -1,15 +1,16 @@
-#include <gtest/gtest.h>
-
#include <stdlib.h>
+#include <gtest/gtest.h>
+
#include <string>
#include <boost/lexical_cast.hpp>
#include "external_test.hpp"
-#include "fatal.hpp"
#include "testing_utils.hpp"
+#include "common/fatal.hpp"
+
using std::string;
using namespace mesos::internal::test;
Modified: incubator/mesos/trunk/src/tests/main.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/main.cpp?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/main.cpp (original)
+++ incubator/mesos/trunk/src/tests/main.cpp Sun Jun 5 08:20:34 2011
@@ -7,16 +7,19 @@
#include <iostream>
#include <string>
-#include "configurator.hpp"
-#include "fatal.hpp"
#include "testing_utils.hpp"
+#include "common/fatal.hpp"
+
+#include "configurator/configurator.hpp"
+
using namespace mesos::internal;
using namespace mesos::internal::test;
-int main(int argc, char **argv) {
- // Get absolute path to Mesos home direcotry (really src right now)
+int main(int argc, char **argv)
+{
+ // Get absolute path to Mesos home directory (really src right now)
char buf[4096];
if (realpath(dirname(argv[0]), buf) == 0)
fatalerror("Failed to find location of alltests using realpath");
Modified: incubator/mesos/trunk/src/tests/test_configurator.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_configurator.cpp?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_configurator.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_configurator.cpp Sun Jun 5 08:20:34 2011
@@ -1,12 +1,14 @@
#include <gtest/gtest.h>
+
#include <iostream>
#include <fstream>
#include <boost/lexical_cast.hpp>
-#include "configurator.hpp"
#include "testing_utils.hpp"
+#include "configurator/configurator.hpp"
+
using std::ofstream;
using std::string;
using std::vector;
Modified: incubator/mesos/trunk/src/tests/test_master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_master.cpp?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_master.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_master.cpp Sun Jun 5 08:20:34 2011
@@ -2,13 +2,16 @@
#include <boost/lexical_cast.hpp>
-#include "master.hpp"
-#include "slave.hpp"
-#include "mesos_exec.hpp"
-#include "mesos_sched.hpp"
-#include "mesos_local.hpp"
-#include "isolation_module.hpp"
-#include "process_based_isolation_module.hpp"
+#include <mesos_exec.hpp>
+#include <mesos_sched.hpp>
+
+#include "local/local.hpp"
+
+#include "master/master.hpp"
+
+#include "slave/isolation_module.hpp"
+#include "slave/process_based_isolation_module.hpp"
+#include "slave/slave.hpp"
using std::string;
using std::vector;
Modified: incubator/mesos/trunk/src/tests/test_resources.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_resources.cpp?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_resources.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_resources.cpp Sun Jun 5 08:20:34 2011
@@ -3,7 +3,7 @@
#include <gtest/gtest.h>
-#include "master.hpp"
+#include "master/master.hpp"
using namespace mesos;
using namespace mesos::internal;
Modified: incubator/mesos/trunk/src/tests/test_string_utils.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_string_utils.cpp?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_string_utils.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_string_utils.cpp Sun Jun 5 08:20:34 2011
@@ -1,9 +1,13 @@
+#include <gtest/gtest.h>
+
#include <sstream>
#include <string>
+#include <vector>
-#include <gtest/gtest.h>
+#include "common/string_utils.hpp"
-#include "string_utils.hpp"
+using std::string;
+using std::vector;
using namespace mesos;
using namespace mesos::internal;
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/PKG-INFO (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/PKG-INFO)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/PKG-INFO?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/PKG-INFO&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/PKG-INFO&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/README (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/README)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/README?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/README&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/README&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/bottle.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/bottle.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/bottle.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/bottle.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/bottle.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/setup.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/setup.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/setup.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/setup.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/setup.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_db.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_db.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_db.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_db.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_db.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_environ.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_environ.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_environ.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_environ.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_environ.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_routes.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_routes.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_routes.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_routes.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_routes.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_templates.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_templates.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_templates.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/test/test_templates.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/test/test_templates.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/webui/bottle-0.5.6/test/testall.py (from r1131990, incubator/mesos/trunk/third_party/bottle-0.5.6/test/testall.py)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/bottle-0.5.6/test/testall.py?p2=incubator/mesos/trunk/src/webui/bottle-0.5.6/test/testall.py&p1=incubator/mesos/trunk/third_party/bottle-0.5.6/test/testall.py&r1=1131990&r2=1131991&rev=1131991&view=diff
==============================================================================
(empty)
Modified: incubator/mesos/trunk/src/webui/master/swig/master.i
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/swig/master.i?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/swig/master.i (original)
+++ incubator/mesos/trunk/src/webui/master/swig/master.i Sun Jun 5 08:20:34 2011
@@ -3,7 +3,7 @@
#define SWIG_NO_EXPORT_ITERATOR_METHODS
%{
-#include <master_state.hpp>
+#include <master/state.hpp>
namespace mesos { namespace internal { namespace master { namespace state {
extern MasterState *get_master();
@@ -27,7 +27,8 @@ extern MasterState *get_master();
%include <mesos_types.h>
%include <mesos_types.hpp>
-%include <master_state.hpp>
+
+%include <master/state.hpp>
namespace mesos { namespace internal { namespace master { namespace state {
%newobject get_master;
Modified: incubator/mesos/trunk/src/webui/slave/swig/slave.i
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/slave/swig/slave.i?rev=1131991&r1=1131990&r2=1131991&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/slave/swig/slave.i (original)
+++ incubator/mesos/trunk/src/webui/slave/swig/slave.i Sun Jun 5 08:20:34 2011
@@ -1,7 +1,7 @@
%module(directors="1") slave
%{
-#include <slave_state.hpp>
+#include <slave/state.hpp>
namespace mesos { namespace internal { namespace slave { namespace state {
extern SlaveState *get_slave();
@@ -22,7 +22,8 @@ extern SlaveState *get_slave();
%include <mesos_types.h>
%include <mesos_types.hpp>
-%include <slave_state.hpp>
+
+%include <slave/state.hpp>
namespace mesos { namespace internal { namespace slave { namespace state {
%newobject get_slave;