mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r1131909 [4/5] - in /incubator/mesos/trunk: ./ frameworks/deploy_jar/ frameworks/hadoop-0.20.0/ frameworks/hadoop-0.20.0/bin/ frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/ frameworks/haproxy+apache/ frameworks/mpi/ framework...
Date Sun, 05 Jun 2011 05:49:49 GMT
Copied: incubator/mesos/trunk/src/mesos_exec.cpp (from r1131908, incubator/mesos/trunk/src/nexus_exec.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/mesos_exec.cpp?p2=incubator/mesos/trunk/src/mesos_exec.cpp&p1=incubator/mesos/trunk/src/nexus_exec.cpp&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/nexus_exec.cpp (original)
+++ incubator/mesos/trunk/src/mesos_exec.cpp Sun Jun  5 05:49:41 2011
@@ -10,12 +10,12 @@
 #include <boost/bind.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "nexus_exec.h"
+#include "mesos_exec.h"
 
 #include "fatal.hpp"
 #include "lock.hpp"
 #include "messages.hpp"
-#include "nexus_exec.hpp"
+#include "mesos_exec.hpp"
 
 using std::cerr;
 using std::endl;
@@ -25,19 +25,19 @@ using boost::bind;
 using boost::ref;
 using boost::unordered_map;
 
-using namespace nexus;
-using namespace nexus::internal;
+using namespace mesos;
+using namespace mesos::internal;
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 class ExecutorProcess : public Tuple<Process>
 {
 public:
-  friend class nexus::NexusExecutorDriver;
+  friend class mesos::MesosExecutorDriver;
   
 protected:
   PID slave;
-  NexusExecutorDriver* driver;
+  MesosExecutorDriver* driver;
   Executor* executor;
   FrameworkID fid;
   SlaveID sid;
@@ -47,7 +47,7 @@ protected:
 
 public:
   ExecutorProcess(const PID& _slave,
-                  NexusExecutorDriver* _driver,
+                  MesosExecutorDriver* _driver,
                   Executor* _executor,
                   FrameworkID _fid,
                   bool _local)
@@ -146,7 +146,7 @@ protected:
   }
 };
 
-}} /* namespace nexus { namespace internal { */
+}} /* namespace mesos { namespace internal { */
 
 
 /*
@@ -157,13 +157,13 @@ protected:
 // Default implementation of error() that logs to stderr and exits
 void Executor::error(ExecutorDriver* driver, int code, const string &message)
 {
-  cerr << "Nexus error: " << message
+  cerr << "Mesos error: " << message
        << " (error code: " << code << ")" << endl;
   driver->stop();
 }
 
 
-NexusExecutorDriver::NexusExecutorDriver(Executor* _executor)
+MesosExecutorDriver::MesosExecutorDriver(Executor* _executor)
   : executor(_executor), running(false)
 {
   // Create mutex and condition variable
@@ -176,7 +176,7 @@ NexusExecutorDriver::NexusExecutorDriver
 }
 
 
-NexusExecutorDriver::~NexusExecutorDriver()
+MesosExecutorDriver::~MesosExecutorDriver()
 {
   pthread_mutex_destroy(&mutex);
   pthread_cond_destroy(&cond);
@@ -186,7 +186,7 @@ NexusExecutorDriver::~NexusExecutorDrive
 }
 
 
-int NexusExecutorDriver::start()
+int MesosExecutorDriver::start()
 {
   Lock lock(&mutex);
 
@@ -208,7 +208,7 @@ int NexusExecutorDriver::start()
   std::istringstream iss;
 
   /* Check if this is local (for example, for testing). */
-  value = getenv("NEXUS_LOCAL");
+  value = getenv("MESOS_LOCAL");
 
   if (value != NULL)
     local = true;
@@ -216,26 +216,26 @@ int NexusExecutorDriver::start()
     local = false;
 
   /* Get slave PID from environment. */
-  value = getenv("NEXUS_SLAVE_PID");
+  value = getenv("MESOS_SLAVE_PID");
 
   if (value == NULL)
-    fatal("expecting NEXUS_SLAVE_PID in environment");
+    fatal("expecting MESOS_SLAVE_PID in environment");
 
   slave = make_pid(value);
 
   if (!slave)
-    fatal("cannot parse NEXUS_SLAVE_PID");
+    fatal("cannot parse MESOS_SLAVE_PID");
 
   /* Get framework ID from environment. */
-  value = getenv("NEXUS_FRAMEWORK_ID");
+  value = getenv("MESOS_FRAMEWORK_ID");
 
   if (value == NULL)
-    fatal("expecting NEXUS_FRAMEWORK_ID in environment");
+    fatal("expecting MESOS_FRAMEWORK_ID in environment");
 
   iss.str(value);
 
   if (!(iss >> fid))
-    fatal("cannot parse NEXUS_FRAMEWORK_ID");
+    fatal("cannot parse MESOS_FRAMEWORK_ID");
 
   process = new ExecutorProcess(slave, this, executor, fid, local);
 
@@ -247,7 +247,7 @@ int NexusExecutorDriver::start()
 }
 
 
-int NexusExecutorDriver::stop()
+int MesosExecutorDriver::stop()
 {
   Lock lock(&mutex);
 
@@ -265,7 +265,7 @@ int NexusExecutorDriver::stop()
 }
 
 
-int NexusExecutorDriver::join()
+int MesosExecutorDriver::join()
 {
   Lock lock(&mutex);
   while (running)
@@ -275,14 +275,14 @@ int NexusExecutorDriver::join()
 }
 
 
-int NexusExecutorDriver::run()
+int MesosExecutorDriver::run()
 {
   int ret = start();
   return ret != 0 ? ret : join();
 }
 
 
-int NexusExecutorDriver::sendStatusUpdate(const TaskStatus &status)
+int MesosExecutorDriver::sendStatusUpdate(const TaskStatus &status)
 {
   Lock lock(&mutex);
 
@@ -301,7 +301,7 @@ int NexusExecutorDriver::sendStatusUpdat
 }
 
 
-int NexusExecutorDriver::sendFrameworkMessage(const FrameworkMessage &message)
+int MesosExecutorDriver::sendFrameworkMessage(const FrameworkMessage &message)
 {
   Lock lock(&mutex);
 
@@ -323,7 +323,7 @@ int NexusExecutorDriver::sendFrameworkMe
  */
 
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 /*
  * We wrap calls from the C API into the C++ API with the following
@@ -331,10 +331,10 @@ namespace nexus { namespace internal {
  */
 class CExecutor : public Executor {
 public:
-  nexus_exec* exec;
+  mesos_exec* exec;
   ExecutorDriver* driver; // Set externally after object is created
   
-  CExecutor(nexus_exec* _exec) : exec(_exec), driver(NULL) {}
+  CExecutor(mesos_exec* _exec) : exec(_exec), driver(NULL) {}
 
   virtual ~CExecutor() {}
 
@@ -354,7 +354,7 @@ public:
     // Convert params to key=value list
     Params paramsObj(task.params);
     string paramsStr = paramsObj.str();
-    nexus_task_desc td = { task.taskId,
+    mesos_task_desc td = { task.taskId,
                            task.slaveId.c_str(),
                            task.name.c_str(),
                            paramsStr.c_str(),
@@ -371,7 +371,7 @@ public:
   virtual void frameworkMessage(ExecutorDriver*,
                                 const FrameworkMessage& message)
   {
-    nexus_framework_message msg = { message.slaveId.c_str(),
+    mesos_framework_message msg = { message.slaveId.c_str(),
                                     message.taskId,
                                     message.data.data(),
                                     message.data.size() };
@@ -398,13 +398,13 @@ public:
  */
 CExecutor* c_executor = NULL;
 
-}} /* namespace nexus { namespace internal {*/
+}} /* namespace mesos { namespace internal {*/
 
 
 extern "C" {
 
 
-int nexus_exec_run(struct nexus_exec* exec)
+int mesos_exec_run(struct mesos_exec* exec)
 {
   if (exec == NULL || c_executor != NULL) {
     errno = EINVAL;
@@ -414,7 +414,7 @@ int nexus_exec_run(struct nexus_exec* ex
   CExecutor executor(exec);
   c_executor = &executor;
   
-  NexusExecutorDriver driver(&executor);
+  MesosExecutorDriver driver(&executor);
   executor.driver = &driver;
   driver.run();
 
@@ -424,8 +424,8 @@ int nexus_exec_run(struct nexus_exec* ex
 }
 
 
-int nexus_exec_send_message(struct nexus_exec* exec,
-                            struct nexus_framework_message* msg)
+int mesos_exec_send_message(struct mesos_exec* exec,
+                            struct mesos_framework_message* msg)
 {
   if (exec == NULL || c_executor == NULL || msg == NULL) {
     errno = EINVAL;
@@ -441,8 +441,8 @@ int nexus_exec_send_message(struct nexus
 }
 
 
-int nexus_exec_status_update(struct nexus_exec* exec,
-                             struct nexus_task_status* status)
+int mesos_exec_status_update(struct mesos_exec* exec,
+                             struct mesos_task_status* status)
 {
 
   if (exec == NULL || c_executor == NULL || status == NULL) {

Copied: incubator/mesos/trunk/src/mesos_local.cpp (from r1131908, incubator/mesos/trunk/src/nexus_local.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/mesos_local.cpp?p2=incubator/mesos/trunk/src/mesos_local.cpp&p1=incubator/mesos/trunk/src/nexus_local.cpp&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/nexus_local.cpp (original)
+++ incubator/mesos/trunk/src/mesos_local.cpp Sun Jun  5 05:49:41 2011
@@ -9,18 +9,18 @@
 #include "configurator.hpp"
 #include "foreach.hpp"
 #include "logging.hpp"
-#include "nexus_local.hpp"
+#include "mesos_local.hpp"
 #include "process_based_isolation_module.hpp"
 
 using std::map;
 using std::vector;
 
-using nexus::internal::master::Master;
-using nexus::internal::slave::Slave;
-using nexus::internal::slave::IsolationModule;
-using nexus::internal::slave::ProcessBasedIsolationModule;
+using mesos::internal::master::Master;
+using mesos::internal::slave::Slave;
+using mesos::internal::slave::IsolationModule;
+using mesos::internal::slave::ProcessBasedIsolationModule;
 
-using namespace nexus::internal;
+using namespace mesos::internal;
 
 
 namespace {
@@ -29,13 +29,13 @@ static pthread_once_t glog_initialized =
 
 
 void initialize_glog() {
-  google::InitGoogleLogging("nexus-local");
+  google::InitGoogleLogging("mesos-local");
 }
 
 } /* namespace { */
 
 
-namespace nexus { namespace internal { namespace local {
+namespace mesos { namespace internal { namespace local {
 
 static Master *master = NULL;
 static map<IsolationModule*, Slave*> slaves;
@@ -124,4 +124,4 @@ void shutdown()
   detector = NULL;
 }
 
-}}} /* namespace nexus { namespace internal { namespace local { */
+}}} /* namespace mesos { namespace internal { namespace local { */

Copied: incubator/mesos/trunk/src/mesos_local.hpp (from r1131908, incubator/mesos/trunk/src/nexus_local.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/mesos_local.hpp?p2=incubator/mesos/trunk/src/mesos_local.hpp&p1=incubator/mesos/trunk/src/nexus_local.hpp&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/nexus_local.hpp (original)
+++ incubator/mesos/trunk/src/mesos_local.hpp Sun Jun  5 05:49:41 2011
@@ -1,14 +1,14 @@
-#ifndef __NEXUS_LOCAL_HPP__
-#define __NEXUS_LOCAL_HPP__
+#ifndef __MESOS_LOCAL_HPP__
+#define __MESOS_LOCAL_HPP__
 
-// Include the master and slave headers here so that the nexus_sched
+// 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 "configurator.hpp"
 
-namespace nexus { namespace internal { namespace local {
+namespace mesos { namespace internal { namespace local {
 
 void registerOptions(Configurator* conf);
 
@@ -21,4 +21,4 @@ void shutdown();
 
 }}}
 
-#endif /* __NEXUS_LOCAL_HPP__ */
+#endif /* __MESOS_LOCAL_HPP__ */

Copied: incubator/mesos/trunk/src/mesos_sched.cpp (from r1131908, incubator/mesos/trunk/src/nexus_sched.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/mesos_sched.cpp?p2=incubator/mesos/trunk/src/mesos_sched.cpp&p1=incubator/mesos/trunk/src/nexus_sched.cpp&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/nexus_sched.cpp (original)
+++ incubator/mesos/trunk/src/mesos_sched.cpp Sun Jun  5 05:49:41 2011
@@ -18,7 +18,7 @@
 #include <boost/bind.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "nexus_sched.h"
+#include "mesos_sched.h"
 
 #include "fatal.hpp"
 #include "hash_pid.hpp"
@@ -26,8 +26,8 @@
 #include "logging.hpp"
 #include "master_detector.hpp"
 #include "messages.hpp"
-#include "nexus_local.hpp"
-#include "nexus_sched.hpp"
+#include "mesos_local.hpp"
+#include "mesos_sched.hpp"
 
 #define REPLY_TIMEOUT 20
 
@@ -42,13 +42,13 @@ using boost::bind;
 using boost::ref;
 using boost::unordered_map;
 
-using namespace nexus;
-using namespace nexus::internal;
-using nexus::internal::master::Master;
-using nexus::internal::slave::Slave;
+using namespace mesos;
+using namespace mesos::internal;
+using mesos::internal::master::Master;
+using mesos::internal::slave::Slave;
 
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 
 class RbReply : public Tuple<Process>
@@ -91,7 +91,7 @@ private:
 /**
  * TODO(benh): Update this comment.
  * Scheduler process, responsible for interacting with the master
- * and responding to Nexus API calls from schedulers. In order to
+ * and responding to Mesos API calls from schedulers. In order to
  * allow a message to be sent back to the master we allow friend
  * functions to invoke 'send'. Therefore, care must be done to insure
  * any synchronization necessary is performed.
@@ -99,10 +99,10 @@ private:
 class SchedulerProcess : public Tuple<ReliableProcess>
 {
 public:
-  friend class nexus::NexusSchedulerDriver;
+  friend class mesos::MesosSchedulerDriver;
 
 private:
-  NexusSchedulerDriver* driver;
+  MesosSchedulerDriver* driver;
   Scheduler* sched;
   FrameworkID fid;
   string frameworkName;
@@ -118,7 +118,7 @@ private:
   unordered_map<TaskID, RbReply *> rbReplies;
 
 public:
-  SchedulerProcess(NexusSchedulerDriver* _driver,
+  SchedulerProcess(MesosSchedulerDriver* _driver,
                    Scheduler* _sched,
 		   FrameworkID _fid,
                    const string& _frameworkName,
@@ -139,7 +139,7 @@ protected:
     // Get username of current user.
     struct passwd* passwd;
     if ((passwd = getpwuid(getuid())) == NULL)
-      fatal("NexusSchedulerDriver failed to get username information");
+      fatal("MesosSchedulerDriver failed to get username information");
 
     const string user(passwd->pw_name);
 
@@ -361,7 +361,7 @@ protected:
   }
 };
 
-}} /* namespace nexus { namespace internal { */
+}} /* namespace mesos { namespace internal { */
 
 
 /*
@@ -402,13 +402,13 @@ ExecutorInfo Scheduler::getExecutorInfo(
 // Default implementation of Scheduler::error that logs to stderr
 void Scheduler::error(SchedulerDriver* driver, int code, const string &message)
 {
-  cerr << "Nexus error: " << message
+  cerr << "Mesos error: " << message
        << " (error code: " << code << ")" << endl;
   driver->stop();
 }
 
 
-NexusSchedulerDriver::NexusSchedulerDriver(Scheduler* sched,
+MesosSchedulerDriver::MesosSchedulerDriver(Scheduler* sched,
 					   const string &url,
 					   FrameworkID fid)
 {
@@ -427,7 +427,7 @@ NexusSchedulerDriver::NexusSchedulerDriv
 }
 
 
-NexusSchedulerDriver::NexusSchedulerDriver(Scheduler* sched,
+MesosSchedulerDriver::MesosSchedulerDriver(Scheduler* sched,
 					   const string_map &params,
 					   FrameworkID fid)
 {
@@ -444,7 +444,7 @@ NexusSchedulerDriver::NexusSchedulerDriv
 }
 
 
-NexusSchedulerDriver::NexusSchedulerDriver(Scheduler* sched,
+MesosSchedulerDriver::MesosSchedulerDriver(Scheduler* sched,
 					   int argc,
                                            char** argv,
 					   FrameworkID fid)
@@ -462,7 +462,7 @@ NexusSchedulerDriver::NexusSchedulerDriv
 }
 
 
-void NexusSchedulerDriver::init(Scheduler* _sched,
+void MesosSchedulerDriver::init(Scheduler* _sched,
                                 Params* _conf,
                                 FrameworkID _fid)
 {
@@ -484,7 +484,7 @@ void NexusSchedulerDriver::init(Schedule
 }
 
 
-NexusSchedulerDriver::~NexusSchedulerDriver()
+MesosSchedulerDriver::~MesosSchedulerDriver()
 {
   pthread_mutex_destroy(&mutex);
   pthread_cond_destroy(&cond);
@@ -520,7 +520,7 @@ NexusSchedulerDriver::~NexusSchedulerDri
 }
 
 
-int NexusSchedulerDriver::start()
+int MesosSchedulerDriver::start()
 {
   Lock lock(&mutex);
 
@@ -553,7 +553,7 @@ int NexusSchedulerDriver::start()
 }
 
 
-int NexusSchedulerDriver::stop()
+int MesosSchedulerDriver::stop()
 {
   Lock lock(&mutex);
 
@@ -576,7 +576,7 @@ int NexusSchedulerDriver::stop()
 }
 
 
-int NexusSchedulerDriver::join()
+int MesosSchedulerDriver::join()
 {
   Lock lock(&mutex);
   while (running)
@@ -586,14 +586,14 @@ int NexusSchedulerDriver::join()
 }
 
 
-int NexusSchedulerDriver::run()
+int MesosSchedulerDriver::run()
 {
   int ret = start();
   return ret != 0 ? ret : join();
 }
 
 
-int NexusSchedulerDriver::killTask(TaskID tid)
+int MesosSchedulerDriver::killTask(TaskID tid)
 {
   Lock lock(&mutex);
 
@@ -611,7 +611,7 @@ int NexusSchedulerDriver::killTask(TaskI
 }
 
 
-int NexusSchedulerDriver::replyToOffer(OfferID offerId,
+int MesosSchedulerDriver::replyToOffer(OfferID offerId,
 				       const vector<TaskDescription> &tasks,
 				       const string_map &params)
 {
@@ -630,7 +630,7 @@ int NexusSchedulerDriver::replyToOffer(O
 }
 
 
-int NexusSchedulerDriver::reviveOffers()
+int MesosSchedulerDriver::reviveOffers()
 {
   Lock lock(&mutex);
 
@@ -648,7 +648,7 @@ int NexusSchedulerDriver::reviveOffers()
 }
 
 
-int NexusSchedulerDriver::sendFrameworkMessage(const FrameworkMessage &message)
+int MesosSchedulerDriver::sendFrameworkMessage(const FrameworkMessage &message)
 {
   Lock lock(&mutex);
 
@@ -665,7 +665,7 @@ int NexusSchedulerDriver::sendFrameworkM
 }
 
 
-int NexusSchedulerDriver::sendHints(const string_map& hints)
+int MesosSchedulerDriver::sendHints(const string_map& hints)
 {
   Lock lock(&mutex);
 
@@ -680,7 +680,7 @@ int NexusSchedulerDriver::sendHints(cons
 }
 
 
-void NexusSchedulerDriver::error(int code, const string& message)
+void MesosSchedulerDriver::error(int code, const string& message)
 {
   sched->error(this, code, message);
 }
@@ -690,13 +690,13 @@ void NexusSchedulerDriver::error(int cod
  * Implementation of C API. We comprimise the performance of the C API
  * in favor of the performance of the C++ API by having the C API call
  * into the C++ API. Having the C++ API call into the C API is slower
- * because the rest of Nexus is written in C++, which means
+ * because the rest of Mesos is written in C++, which means
  * translations are required when going from C++ to C and then back to
  * C++ when having the C++ API call into the C API.
  */
 
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 /*
  * We wrap calls from the C API into the C++ API with the following
@@ -707,13 +707,13 @@ class CScheduler : public Scheduler
 public:
   string frameworkName;
   ExecutorInfo execInfo;
-  nexus_sched* sched;
+  mesos_sched* sched;
   SchedulerDriver* driver; // Set externally after object is created
 
   CScheduler(string fwName,
                       string execUri,
                       string execArg,
-                      nexus_sched* _sched)
+                      mesos_sched* _sched)
     : frameworkName(fwName),
       execInfo(execUri, execArg),
       sched(_sched),
@@ -750,9 +750,9 @@ public:
     }
 
     // Create C offer structs
-    nexus_slot* c_offers = new nexus_slot[offers.size()];
+    mesos_slot* c_offers = new mesos_slot[offers.size()];
     for (size_t i = 0; i < offers.size(); i++) {
-      nexus_slot offer = { offers[i].slaveId.c_str(),
+      mesos_slot offer = { offers[i].slaveId.c_str(),
                            offers[i].host.c_str(),
                            paramStrs[i].c_str() };
       c_offers[i] = offer;
@@ -769,7 +769,7 @@ public:
 
   virtual void statusUpdate(SchedulerDriver*, TaskStatus &status)
   {
-    nexus_task_status c_status = { status.taskId,
+    mesos_task_status c_status = { status.taskId,
                                    status.state,
                                    status.data.data(),
                                    status.data.size() };
@@ -778,7 +778,7 @@ public:
 
   virtual void frameworkMessage(SchedulerDriver*, FrameworkMessage &message)
   {
-    nexus_framework_message c_message = { message.slaveId.c_str(),
+    mesos_framework_message c_message = { message.slaveId.c_str(),
                                           message.taskId,
                                           message.data.data(),
                                           message.data.size() };
@@ -798,24 +798,24 @@ public:
 
 
 /*
- * We record the mapping from nexus_sched to CScheduler. It would
+ * We record the mapping from mesos_sched to CScheduler. It would
  * be preferable to somehow link the two without requiring any extra data
- * structures, but without adding some random field to nexus_sched (or
+ * structures, but without adding some random field to mesos_sched (or
  * doing some object prefix approach), this is the best we got.
  *
  * TODO(benh): Make access to these thread safe once we have some
  * locking mechanism that abstracts away if we are using pthreads or
  * libprocess.
  */
-unordered_map<nexus_sched* , CScheduler*> c_schedulers;
+unordered_map<mesos_sched* , CScheduler*> c_schedulers;
 
 
-CScheduler* lookupCScheduler(nexus_sched* sched)
+CScheduler* lookupCScheduler(mesos_sched* sched)
 {
   assert(sched != NULL);
 
   // TODO(benh): Protect 'c_schedulers' (see above).
-  unordered_map<nexus_sched*, CScheduler*>::iterator it =
+  unordered_map<mesos_sched*, CScheduler*>::iterator it =
     c_schedulers.find(sched);
 
   CScheduler* cs = it == c_schedulers.end() ? NULL : it->second;
@@ -834,10 +834,10 @@ CScheduler* lookupCScheduler(nexus_sched
 }
 
 
-void removeCScheduler(nexus_sched* sched)
+void removeCScheduler(mesos_sched* sched)
 {
   // TODO(benh): Protect 'c_schedulers' (see above).
-  unordered_map<nexus_sched*, CScheduler*>::iterator it =
+  unordered_map<mesos_sched*, CScheduler*>::iterator it =
     c_schedulers.find(sched);
 
   CScheduler* cs = it == c_schedulers.end() ? NULL : it->second;
@@ -851,17 +851,17 @@ void removeCScheduler(nexus_sched* sched
 }
 
 
-}} /* namespace nexus { namespace internal { */
+}} /* namespace mesos { namespace internal { */
 
 
 extern "C" {
 
 // TODO(*): For safety, it would be better if we allocate the
-// nexus_sched objects (that way we won't ever call into them and
+// mesos_sched objects (that way we won't ever call into them and
 // segfault in our code), but that's not the C way, probably because
-// it means nexus_sched objects can't get put on the stack.
+// it means mesos_sched objects can't get put on the stack.
 
-int nexus_sched_init(struct nexus_sched* sched)
+int mesos_sched_init(struct mesos_sched* sched)
 {
   if (sched == NULL) {
     errno = EINVAL;
@@ -872,7 +872,7 @@ int nexus_sched_init(struct nexus_sched*
 }
 
 
-int nexus_sched_destroy(struct nexus_sched* sched)
+int mesos_sched_destroy(struct mesos_sched* sched)
 {
   if (sched == NULL) {
     errno = EINVAL;
@@ -885,7 +885,7 @@ int nexus_sched_destroy(struct nexus_sch
 }
 
 
-int nexus_sched_reg(struct nexus_sched* sched, const char* master)
+int mesos_sched_reg(struct mesos_sched* sched, const char* master)
 {
   if (sched == NULL || master == NULL) {
     errno = EINVAL;
@@ -900,7 +900,7 @@ int nexus_sched_reg(struct nexus_sched* 
   }
 
   try {
-    cs->driver = new NexusSchedulerDriver(cs, master);
+    cs->driver = new MesosSchedulerDriver(cs, master);
   } catch (ConfigurationException& e) {
     string message = string("Configuration error: ") + e.what();
     sched->error(sched, 2, message.c_str());
@@ -914,7 +914,7 @@ int nexus_sched_reg(struct nexus_sched* 
 }
 
 
-int nexus_sched_reg_with_params(struct nexus_sched* sched, const char* params)
+int mesos_sched_reg_with_params(struct mesos_sched* sched, const char* params)
 {
   if (sched == NULL || params == NULL) {
     errno = EINVAL;
@@ -930,7 +930,7 @@ int nexus_sched_reg_with_params(struct n
 
   try {
     Params paramsObj(params);
-    cs->driver = new NexusSchedulerDriver(cs, paramsObj.getMap());
+    cs->driver = new MesosSchedulerDriver(cs, paramsObj.getMap());
   } catch (ConfigurationException& e) {
     string message = string("Configuration error: ") + e.what();
     sched->error(sched, 2, message.c_str());
@@ -944,7 +944,7 @@ int nexus_sched_reg_with_params(struct n
 }
 
 
-int nexus_sched_reg_with_cmdline(struct nexus_sched* sched,
+int mesos_sched_reg_with_cmdline(struct mesos_sched* sched,
                                  int argc,
                                  char** argv)
 {
@@ -961,7 +961,7 @@ int nexus_sched_reg_with_cmdline(struct 
   }
 
   try {
-    cs->driver = new NexusSchedulerDriver(cs, argc, argv);
+    cs->driver = new MesosSchedulerDriver(cs, argc, argv);
   } catch (ConfigurationException& e) {
     string message = string("Configuration error: ") + e.what();
     sched->error(sched, 2, message.c_str());
@@ -975,7 +975,7 @@ int nexus_sched_reg_with_cmdline(struct 
 }
 
 
-int nexus_sched_unreg(struct nexus_sched* sched)
+int mesos_sched_unreg(struct mesos_sched* sched)
 {
   if (sched == NULL) {
     errno = EINVAL;
@@ -995,8 +995,8 @@ int nexus_sched_unreg(struct nexus_sched
 }
 
 
-int nexus_sched_send_message(struct nexus_sched* sched,
-                             struct nexus_framework_message* msg)
+int mesos_sched_send_message(struct mesos_sched* sched,
+                             struct mesos_framework_message* msg)
 {
   if (sched == NULL || msg == NULL) {
     errno = EINVAL;
@@ -1019,7 +1019,7 @@ int nexus_sched_send_message(struct nexu
 }
 
 
-int nexus_sched_kill_task(struct nexus_sched* sched, task_id tid)
+int mesos_sched_kill_task(struct mesos_sched* sched, task_id tid)
 {
   if (sched == NULL) {
     errno = EINVAL;
@@ -1039,9 +1039,9 @@ int nexus_sched_kill_task(struct nexus_s
 }
 
 
-int nexus_sched_reply_to_offer(struct nexus_sched* sched,
+int mesos_sched_reply_to_offer(struct mesos_sched* sched,
                                offer_id oid,
-                               struct nexus_task_desc* tasks,
+                               struct mesos_task_desc* tasks,
                                int num_tasks,
                                const char* params)
 {
@@ -1087,7 +1087,7 @@ int nexus_sched_reply_to_offer(struct ne
 }
 
 
-int nexus_sched_revive_offers(struct nexus_sched* sched)
+int mesos_sched_revive_offers(struct mesos_sched* sched)
 {
   if (sched == NULL) {
     errno = EINVAL;
@@ -1107,7 +1107,7 @@ int nexus_sched_revive_offers(struct nex
 }
 
 
-int nexus_sched_join(struct nexus_sched* sched)
+int mesos_sched_join(struct mesos_sched* sched)
 {
   if (sched == NULL) {
     errno = EINVAL;

Modified: incubator/mesos/trunk/src/messages.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messages.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messages.cpp (original)
+++ incubator/mesos/trunk/src/messages.cpp Sun Jun  5 05:49:41 2011
@@ -6,7 +6,7 @@ using std::string;
 using namespace process::serialization;
 
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 
 void operator & (serializer& s, const TaskState& state)
@@ -153,4 +153,4 @@ void operator & (deserializer& s, Task& 
   s & taskInfo.slaveId;
 }
 
-}} /* namespace nexus { namespace internal { */
+}} /* namespace mesos { namespace internal { */

Modified: incubator/mesos/trunk/src/messages.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messages.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messages.hpp (original)
+++ incubator/mesos/trunk/src/messages.hpp Sun Jun  5 05:49:41 2011
@@ -8,8 +8,8 @@
 #include <reliable.hpp>
 #include <tuple.hpp>
 
-#include <nexus.hpp>
-#include <nexus_types.hpp>
+#include <mesos.hpp>
+#include <mesos_types.hpp>
 
 #include "params.hpp"
 #include "resources.hpp"
@@ -17,7 +17,7 @@
 #include "task.hpp"
 
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 enum MessageType {
   /* From framework to master. */
@@ -104,7 +104,7 @@ enum MessageType {
   S2S_CHILD_EXIT,       // Sent by reaper process
   S2S_SHUTDOWN,         // Used in tests to shut down slave
 
-  NEXUS_MESSAGES,
+  MESOS_MESSAGES,
 };
 
 
@@ -353,7 +353,7 @@ TUPLE(S2S_SHUTDOWN,
       ());
 
 
-/* Serialization functions for various Nexus data types. */
+/* Serialization functions for various Mesos data types. */
 
 void operator & (process::serialization::serializer&, const TaskState&);
 void operator & (process::serialization::deserializer&, TaskState&);
@@ -436,7 +436,7 @@ void operator & (process::serialization:
 }
 
 
-}} /* namespace nexus { namespace internal { */
+}} /* namespace mesos { namespace internal { */
 
 
 #endif /* MESSAGES_HPP */

Modified: incubator/mesos/trunk/src/option.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/option.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/option.hpp (original)
+++ incubator/mesos/trunk/src/option.hpp Sun Jun  5 05:49:41 2011
@@ -10,7 +10,7 @@
 #include "params.hpp"
 #include "foreach.hpp"
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
     
 using std::string;
 using std::cout;
@@ -143,6 +143,6 @@ public:
   ValidatorBase *validator;
 };
 
-} }   // end nexus :: internal namespace
+} }   // end mesos :: internal namespace
 
 #endif

Modified: incubator/mesos/trunk/src/params.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/params.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/params.cpp (original)
+++ incubator/mesos/trunk/src/params.cpp Sun Jun  5 05:49:41 2011
@@ -1,10 +1,10 @@
-#include <nexus.h>
+#include <mesos.h>
 
 #include "params.hpp"
 
 
-using namespace nexus;
-using namespace nexus::internal;
+using namespace mesos;
+using namespace mesos::internal;
 
 
 int params_get_int(const char *params, const char *key, int defVal)

Modified: incubator/mesos/trunk/src/params.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/params.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/params.hpp (original)
+++ incubator/mesos/trunk/src/params.hpp Sun Jun  5 05:49:41 2011
@@ -13,7 +13,7 @@
 #include "string_utils.hpp"
 
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 using std::map;
 using std::ostringstream;

Modified: incubator/mesos/trunk/src/process_based_isolation_module.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/process_based_isolation_module.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/process_based_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/process_based_isolation_module.cpp Sun Jun  5 05:49:41 2011
@@ -17,9 +17,9 @@ using boost::lexical_cast;
 using boost::unordered_map;
 using boost::unordered_set;
 
-using namespace nexus;
-using namespace nexus::internal;
-using namespace nexus::internal::slave;
+using namespace mesos;
+using namespace mesos::internal;
+using namespace mesos::internal::slave;
 
 
 ProcessBasedIsolationModule::ProcessBasedIsolationModule()

Modified: incubator/mesos/trunk/src/process_based_isolation_module.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/process_based_isolation_module.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/process_based_isolation_module.hpp (original)
+++ incubator/mesos/trunk/src/process_based_isolation_module.hpp Sun Jun  5 05:49:41 2011
@@ -11,10 +11,10 @@
 #include "slave.hpp"
 
 
-namespace nexus { namespace internal { namespace slave {
+namespace mesos { namespace internal { namespace slave {
 
 using boost::unordered_map;
-using nexus::internal::launcher::ExecutorLauncher;
+using mesos::internal::launcher::ExecutorLauncher;
 
 class ProcessBasedIsolationModule : public IsolationModule {
 public:
@@ -30,7 +30,7 @@ public:
   };
 
   // Extra shutdown message for reaper
-  enum { SHUTDOWN_REAPER = NEXUS_MESSAGES };
+  enum { SHUTDOWN_REAPER = MESOS_MESSAGES };
 
 protected:
   bool initialized;

Modified: incubator/mesos/trunk/src/projd.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/projd.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/projd.cpp (original)
+++ incubator/mesos/trunk/src/projd.cpp Sun Jun  5 05:49:41 2011
@@ -9,10 +9,10 @@
 #include "messages.hpp"
 
 
-namespace nexus { namespace internal { namespace projd {
+namespace mesos { namespace internal { namespace projd {
 
-using namespace nexus;
-using namespace nexus::internal;
+using namespace mesos;
+using namespace mesos::internal;
 
 using std::cout;
 using std::cerr;
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
   if (!parent)
     fatal("cannot parse PARENT_PID");
 
-  nexus::internal::projd::ProjectDaemon projd(parent);
+  mesos::internal::projd::ProjectDaemon projd(parent);
 
   Process::wait(Process::spawn(&projd));
 

Modified: incubator/mesos/trunk/src/resources.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/resources.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/resources.hpp (original)
+++ incubator/mesos/trunk/src/resources.hpp Sun Jun  5 05:49:41 2011
@@ -1,7 +1,7 @@
 #ifndef __RESOURCES_HPP__
 #define __RESOURCES_HPP__
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 // Some memory unit constants.
 const int64_t Kilobyte = 1024;

Modified: incubator/mesos/trunk/src/scaling/nested_exec.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/scaling/nested_exec.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/scaling/nested_exec.py (original)
+++ incubator/mesos/trunk/src/scaling/nested_exec.py Sun Jun  5 05:49:41 2011
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-import nexus
+import mesos
 import pickle
 import time
 
 
-class NestedExecutor(nexus.Executor):
+class NestedExecutor(mesos.Executor):
   def __init__(self):
-    nexus.Executor.__init__(self)
+    mesos.Executor.__init__(self)
     self.tid = -1
 
   def init(self, driver, args):
@@ -18,14 +18,14 @@ class NestedExecutor(nexus.Executor):
     print "(%s:%d) Sleeping for %s seconds." % (self.fid, self.tid, duration)
     # TODO(benh): Don't sleep, this blocks the event loop!
     time.sleep(duration)
-    status = nexus.TaskStatus(self.tid, nexus.TASK_FINISHED, "")
+    status = mesos.TaskStatus(self.tid, mesos.TASK_FINISHED, "")
     driver.sendStatusUpdate(status)
     time.sleep(1)
     
   def killTask(self, driver, tid):
     if (self.tid != tid):
       print "Expecting different task id ... killing anyway!"
-    status = nexus.TaskStatus(tid, nexus.TASK_FINISHED, "")
+    status = mesos.TaskStatus(tid, mesos.TASK_FINISHED, "")
     driver.sendStatusUpdate(status)
 
   def error(self, driver, code, message):
@@ -33,4 +33,4 @@ class NestedExecutor(nexus.Executor):
 
 
 if __name__ == "__main__":
-  nexus.NexusExecutorDriver(NestedExecutor()).run()
+  mesos.MesosExecutorDriver(NestedExecutor()).run()

Modified: incubator/mesos/trunk/src/scaling/scaling_exec.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/scaling/scaling_exec.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/scaling/scaling_exec.py (original)
+++ incubator/mesos/trunk/src/scaling/scaling_exec.py Sun Jun  5 05:49:41 2011
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import nexus
+import mesos
 import os
 import pickle
 import sys
@@ -7,9 +7,9 @@ import sys
 CPUS = 1
 MEM = 50*1024*1024
 
-class NestedScheduler(nexus.Scheduler):
+class NestedScheduler(mesos.Scheduler):
   def __init__(self, todo, duration, executor):
-    nexus.Scheduler.__init__(self)
+    mesos.Scheduler.__init__(self)
     self.tid = 0
     self.todo = todo
     self.finished = 0
@@ -21,7 +21,7 @@ class NestedScheduler(nexus.Scheduler):
 
   def getExecutorInfo(self, driver):
     execPath = os.path.join(os.getcwd(), "nested_exec")
-    return nexus.ExecutorInfo(execPath, "")
+    return mesos.ExecutorInfo(execPath, "")
 
   def registered(self, driver, fid):
     print "Nested Scheduler Registered!"
@@ -32,16 +32,16 @@ class NestedScheduler(nexus.Scheduler):
       if self.todo != self.tid:
         self.tid += 1
         pars = {"cpus": "%d" % CPUS, "mem": "%d" % MEM}
-        task = nexus.TaskDescription(self.tid, offer.slaveId,
+        task = mesos.TaskDescription(self.tid, offer.slaveId,
                                      "task %d" % self.tid, pars,
                                      pickle.dumps(self.duration))
         tasks.append(task)
-        #msg = nexus.FrameworkMessage(-1, , "")
+        #msg = mesos.FrameworkMessage(-1, , "")
         #executor.sendFrameworkMessage("")
     driver.replyToOffer(oid, tasks, {})
 
   def statusUpdate(self, driver, status):
-    if status.state == nexus.TASK_FINISHED:
+    if status.state == mesos.TASK_FINISHED:
       self.finished += 1
     if self.finished == self.todo:
       print "All nested tasks done, stopping scheduler and enclosing executor!"
@@ -49,9 +49,9 @@ class NestedScheduler(nexus.Scheduler):
       self.executor.stop()
 
 
-class ScalingExecutor(nexus.Executor):
+class ScalingExecutor(mesos.Executor):
   def __init__(self):
-    nexus.Executor.__init__(self)
+    mesos.Executor.__init__(self)
     self.tid = -1
     self.nested_driver = -1
 
@@ -60,7 +60,7 @@ class ScalingExecutor(nexus.Executor):
     master, (todo, duration) = pickle.loads(task.arg)
     scheduler = NestedScheduler(todo, duration, self)
     print "Running here:" + master
-    self.nested_driver = nexus.NexusSchedulerDriver(scheduler, master)
+    self.nested_driver = mesos.MesosSchedulerDriver(scheduler, master)
     self.nested_driver.start()
     
   def killTask(self, driver, tid):
@@ -69,7 +69,7 @@ class ScalingExecutor(nexus.Executor):
     if self.nested_driver != -1:
       self.nested_driver.stop()
       self.nested_driver.join()
-    driver.sendStatusUpdate(nexus.TaskStatus(tid, nexus.TASK_FINISHED, ""))
+    driver.sendStatusUpdate(mesos.TaskStatus(tid, mesos.TASK_FINISHED, ""))
 
   def shutdown(self, driver):
     self.killTask(self.tid)
@@ -79,4 +79,4 @@ class ScalingExecutor(nexus.Executor):
 
 
 if __name__ == "__main__":
-  nexus.NexusExecutorDriver(ScalingExecutor()).run()
+  mesos.MesosExecutorDriver(ScalingExecutor()).run()

Modified: incubator/mesos/trunk/src/scaling/scaling_sched.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/scaling/scaling_sched.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/scaling/scaling_sched.py (original)
+++ incubator/mesos/trunk/src/scaling/scaling_sched.py Sun Jun  5 05:49:41 2011
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import nexus
+import mesos
 import random
 import sys
 import time
@@ -24,9 +24,9 @@ config = [ (50, 120),
            (50, 120),
            (50, 120) ]
 
-class ScalingScheduler(nexus.Scheduler):
+class ScalingScheduler(mesos.Scheduler):
   def __init__(self, master):
-    nexus.Scheduler.__init__(self)
+    mesos.Scheduler.__init__(self)
     self.tid = 0
     self.master = master
     print self.master
@@ -37,7 +37,7 @@ class ScalingScheduler(nexus.Scheduler):
 
   def getExecutorInfo(self, driver):
     execPath = os.path.join(os.getcwd(), "scaling_exec")
-    return nexus.ExecutorInfo(execPath, "")
+    return mesos.ExecutorInfo(execPath, "")
 
   def registered(self, driver, fid):
     print "Scaling Scheduler Registered!"
@@ -56,7 +56,7 @@ class ScalingScheduler(nexus.Scheduler):
         (todo, duration) = config[self.tid]
         arg = pickle.dumps((self.master, (todo, duration)))
         pars = {"cpus": "%d" % CPUS, "mem": "%d" % MEM}
-        task = nexus.TaskDescription(self.tid, offer.slaveId,
+        task = mesos.TaskDescription(self.tid, offer.slaveId,
                                      "task %d" % self.tid, pars, arg)
         tasks.append(task)
         self.running[self.tid] = (todo, duration)
@@ -66,7 +66,7 @@ class ScalingScheduler(nexus.Scheduler):
 
   def statusUpdate(self, driver, status):
     # For now, we are expecting our tasks to be lost ...
-    if status.state == nexus.TASK_LOST:
+    if status.state == mesos.TASK_LOST:
       todo, duration = self.running[status.taskId]
       print "Finished %d todo at %d secs" % (todo, duration)
       del self.running[status.taskId]
@@ -79,4 +79,4 @@ if __name__ == "__main__":
       print "Cannot do scaling experiments with 'local' or 'localquiet'!"
       sys.exit(1)
 
-  nexus.NexusSchedulerDriver(ScalingScheduler(sys.argv[1]), sys.argv[1]).run()
+  mesos.MesosSchedulerDriver(ScalingScheduler(sys.argv[1]), sys.argv[1]).run()

Modified: incubator/mesos/trunk/src/scheduled_memhog.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/scheduled_memhog.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/scheduled_memhog.cpp (original)
+++ incubator/mesos/trunk/src/scheduled_memhog.cpp Sun Jun  5 05:49:41 2011
@@ -1,4 +1,4 @@
-#include <nexus_sched.hpp>
+#include <mesos_sched.hpp>
 
 #include <libgen.h>
 #include <stdlib.h>
@@ -18,7 +18,7 @@
 #include "foreach.hpp"
 
 using namespace std;
-using namespace nexus;
+using namespace mesos;
 
 using boost::lexical_cast;
 
@@ -159,7 +159,7 @@ int main(int argc, char ** argv) {
   realpath(dirname(argv[0]), buf);
   string executor = string(buf) + "/memhog-executor";
   MyScheduler sched(executor, argv[2], 1);
-  NexusSchedulerDriver driver(&sched, argv[1]);
+  MesosSchedulerDriver driver(&sched, argv[1]);
   driver.run();
   return (sched.successfulTasks == sched.tasks.size()) ? 0 : 1;
 }

Modified: incubator/mesos/trunk/src/simple_allocator.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/simple_allocator.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/simple_allocator.cpp (original)
+++ incubator/mesos/trunk/src/simple_allocator.cpp Sun Jun  5 05:49:41 2011
@@ -8,9 +8,9 @@
 using std::max;
 using std::sort;
 
-using namespace nexus;
-using namespace nexus::internal;
-using namespace nexus::internal::master;
+using namespace mesos;
+using namespace mesos::internal;
+using namespace mesos::internal::master;
 
 
 void SimpleAllocator::frameworkAdded(Framework* framework)

Modified: incubator/mesos/trunk/src/simple_allocator.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/simple_allocator.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/simple_allocator.hpp (original)
+++ incubator/mesos/trunk/src/simple_allocator.hpp Sun Jun  5 05:49:41 2011
@@ -9,7 +9,7 @@
 #include "allocator.hpp"
 #include "resources.hpp"
 
-namespace nexus { namespace internal { namespace master {
+namespace mesos { namespace internal { namespace master {
 
 using std::vector;
 using boost::unordered_map;

Modified: incubator/mesos/trunk/src/slave.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave.cpp (original)
+++ incubator/mesos/trunk/src/slave.cpp Sun Jun  5 05:49:41 2011
@@ -22,9 +22,9 @@ using boost::lexical_cast;
 using boost::unordered_map;
 using boost::unordered_set;
 
-using namespace nexus;
-using namespace nexus::internal;
-using namespace nexus::internal::slave;
+using namespace mesos;
+using namespace mesos::internal;
+using namespace mesos::internal::slave;
 
 
 namespace {
@@ -136,9 +136,9 @@ void Slave::operator () ()
   const char *hostname = he->h_name;
 
   // Get our public DNS name. Normally this is our hostname, but on EC2
-  // we look for the NEXUS_PUBLIC_DNS environment variable. This allows
+  // we look for the MESOS_PUBLIC_DNS environment variable. This allows
   // the master to display our public name in its web UI.
-  const char *publicDns = getenv("NEXUS_PUBLIC_DNS");
+  const char *publicDns = getenv("MESOS_PUBLIC_DNS");
   if (!publicDns) {
     publicDns = hostname;
   }

Modified: incubator/mesos/trunk/src/slave.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave.hpp (original)
+++ incubator/mesos/trunk/src/slave.hpp Sun Jun  5 05:49:41 2011
@@ -39,10 +39,10 @@
 #include "master_detector.hpp"
 #include "task.hpp"
 
-namespace nexus { namespace internal { namespace slave {
+namespace mesos { namespace internal { namespace slave {
 
-using namespace nexus;
-using namespace nexus::internal;
+using namespace mesos;
+using namespace mesos::internal;
 
 using std::list;
 using std::pair;

Modified: incubator/mesos/trunk/src/slave_main.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave_main.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_main.cpp (original)
+++ incubator/mesos/trunk/src/slave_main.cpp Sun Jun  5 05:49:41 2011
@@ -11,7 +11,7 @@ using boost::bad_lexical_cast;
 
 using namespace std;
 
-using namespace nexus::internal::slave;
+using namespace mesos::internal::slave;
 
 
 void usage(const char *programName, const Configurator& conf)
@@ -20,7 +20,7 @@ void usage(const char *programName, cons
        << " --url=MASTER_URL [--cpus=NUM] [--mem=BYTES] [...]" << endl
        << endl
        << "MASTER_URL may be one of:" << endl
-       << "  nexus://id@host:port" << endl
+       << "  mesos://id@host:port" << endl
        << "  zoo://host1:port1,host2:port2,..." << endl
        << "  zoofile://file where file contains a host:port pair per line"
        << endl
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
   Configurator conf;
   conf.addOption<string>("url", 'u', "Master URL");
   conf.addOption<string>("isolation", 'i', "Isolation module name", "process");
-#ifdef NEXUS_WEBUI
+#ifdef MESOS_WEBUI
   conf.addOption<int>("webui_port", 'w', "Web UI port", 8081);
 #endif
   Logging::registerOptions(&conf);
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
   }
 
   LOG(INFO) << "Build: " << BUILD_DATE << " by " << BUILD_USER;
-  LOG(INFO) << "Starting Nexus slave";
+  LOG(INFO) << "Starting Mesos slave";
 
   if (chdir(dirname(argv[0])) != 0)
     fatalerror("Could not chdir into %s", dirname(argv[0]));
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
   bool quiet = Logging::isQuiet(params);
   MasterDetector *detector = MasterDetector::create(url, pid, false, quiet);
 
-#ifdef NEXUS_WEBUI
+#ifdef MESOS_WEBUI
   startSlaveWebUI(pid, (char*) params["webui_port"].c_str());
 #endif
 

Modified: incubator/mesos/trunk/src/slave_state.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave_state.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_state.hpp (original)
+++ incubator/mesos/trunk/src/slave_state.hpp Sun Jun  5 05:49:41 2011
@@ -9,7 +9,7 @@
 #include "foreach.hpp"
 #include "messages.hpp"
 
-namespace nexus { namespace internal { namespace slave { namespace state {
+namespace mesos { namespace internal { namespace slave { namespace state {
 
 struct Task
 {

Modified: incubator/mesos/trunk/src/slave_webui.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave_webui.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_webui.cpp (original)
+++ incubator/mesos/trunk/src/slave_webui.cpp Sun Jun  5 05:49:41 2011
@@ -3,7 +3,7 @@
 #include "slave_webui.hpp"
 #include "slave_state.hpp"
 
-#ifdef NEXUS_WEBUI
+#ifdef MESOS_WEBUI
 
 #include <process.hpp>
 #include <pthread.h>
@@ -17,7 +17,7 @@ PID slave;
 
 }
 
-namespace nexus { namespace internal { namespace slave {
+namespace mesos { namespace internal { namespace slave {
 
 
 void *runSlaveWebUI(void* webuiPort)
@@ -81,7 +81,7 @@ SlaveState *get_slave()
 
 } /* namespace state { */
 
-}}} /* namespace nexus { namespace internal { namespace slave { */
+}}} /* namespace mesos { namespace internal { namespace slave { */
 
 
-#endif /* NEXUS_WEBUI */
+#endif /* MESOS_WEBUI */

Modified: incubator/mesos/trunk/src/slave_webui.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave_webui.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave_webui.hpp (original)
+++ incubator/mesos/trunk/src/slave_webui.hpp Sun Jun  5 05:49:41 2011
@@ -6,14 +6,14 @@
 #include "config.hpp"
 #include "slave.hpp"
 
-#ifdef NEXUS_WEBUI
+#ifdef MESOS_WEBUI
 
-namespace nexus { namespace internal { namespace slave {
+namespace mesos { namespace internal { namespace slave {
 
 void startSlaveWebUI(const PID &slave, char* webuiPort);
 
 }}} /* namespace */
 
-#endif /* NEXUS_WEBUI */
+#endif /* MESOS_WEBUI */
 
 #endif /* SLAVE_WEBUI_HPP */

Modified: incubator/mesos/trunk/src/solaris_project_isolation_module.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/solaris_project_isolation_module.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/solaris_project_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/solaris_project_isolation_module.cpp Sun Jun  5 05:49:41 2011
@@ -22,9 +22,9 @@ using boost::lexical_cast;
 using boost::unordered_map;
 using boost::unordered_set;
 
-using namespace nexus;
-using namespace nexus::internal;
-using namespace nexus::internal::slave;
+using namespace mesos;
+using namespace mesos::internal;
+using namespace mesos::internal::slave;
 
 
 SolarisProjectIsolationModule::SolarisProjectIsolationModule()
@@ -92,10 +92,10 @@ void SolarisProjectIsolationModule::Comm
 {
   LOG(INFO) << "Starting projd for project " << project;
 
-  // Get location of Nexus install in order to find projd.
-  const char* nexus_home = getenv("NEXUS_HOME");
-  if (!nexus_home)
-    nexus_home = "..";
+  // Get location of Mesos install in order to find projd.
+  const char* mesos_home = getenv("MESOS_HOME");
+  if (!mesos_home)
+    mesos_home = "..";
 
   pid_t pid;
   if ((pid = fork()) == -1)
@@ -115,10 +115,10 @@ void SolarisProjectIsolationModule::Comm
     if (setproject(project.c_str(), "root", TASK_FINAL) != 0)
       fatal("setproject failed");
 
-    string projd = string(nexus_home) + "/src/nexus-projd";
+    string projd = string(mesos_home) + "/src/mesos-projd";
 
     // Execute projd.
-    execl(projd.c_str(), "nexus-projd", (char *) NULL);
+    execl(projd.c_str(), "mesos-projd", (char *) NULL);
     // If we get here, the execl call failed.
     fatalerror("Could not execute %s", projd.c_str());
     // TODO: Exit the slave if this happens
@@ -173,7 +173,7 @@ void SolarisProjectIsolationModule::Comm
 
   while (getprojent(&proj, proj_buf, PROJECT_BUFSZ) != NULL) {
     string project(proj.pj_name);
-    if (project.find("nexus.project.") != string::npos) {
+    if (project.find("mesos.project.") != string::npos) {
       launchProjd(project);
       module->projects.push(project);
     }
@@ -182,7 +182,7 @@ void SolarisProjectIsolationModule::Comm
   endprojent();
 
   if (module->projects.size() == 0)
-    LOG(FATAL) << "Could not find any Nexus projects to use";
+    LOG(FATAL) << "Could not find any Mesos projects to use";
 
   do {
     switch (receive()) {

Modified: incubator/mesos/trunk/src/solaris_project_isolation_module.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/solaris_project_isolation_module.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/solaris_project_isolation_module.hpp (original)
+++ incubator/mesos/trunk/src/solaris_project_isolation_module.hpp Sun Jun  5 05:49:41 2011
@@ -8,14 +8,14 @@
 
 #include "process_based_isolation_module.hpp"
 
-namespace nexus { namespace internal { namespace slave {
+namespace mesos { namespace internal { namespace slave {
 
 using std::string;
 using std::queue;
 
 using boost::unordered_map;
 
-using nexus::internal::launcher::ExecutorLauncher;
+using mesos::internal::launcher::ExecutorLauncher;
 
 class SolarisProjectIsolationModule : public ProcessBasedIsolationModule {
 protected:

Modified: incubator/mesos/trunk/src/string_utils.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/string_utils.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/string_utils.cpp (original)
+++ incubator/mesos/trunk/src/string_utils.cpp Sun Jun  5 05:49:41 2011
@@ -3,7 +3,7 @@
 using std::string;
 using std::vector;
 
-using namespace nexus::internal;
+using namespace mesos::internal;
 
 
 void StringUtils::split(const string& str,

Modified: incubator/mesos/trunk/src/string_utils.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/string_utils.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/string_utils.hpp (original)
+++ incubator/mesos/trunk/src/string_utils.hpp Sun Jun  5 05:49:41 2011
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-namespace nexus { namespace internal {
+namespace mesos { namespace internal {
 
 using std::string;
 using std::vector;
@@ -31,6 +31,6 @@ public:
   static string trim(const string& str, const string& toRemove = " \t\n\r");
 };
 
-}} /* namespace nexus::internal */
+}} /* namespace mesos::internal */
 
 #endif

Modified: incubator/mesos/trunk/src/swig/java/TestExceptionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/TestExceptionExecutor.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/TestExceptionExecutor.java (original)
+++ incubator/mesos/trunk/src/swig/java/TestExceptionExecutor.java Sun Jun  5 05:49:41 2011
@@ -1,9 +1,9 @@
 import java.io.File;
-import nexus.*;
+import mesos.*;
 
 public class TestExceptionExecutor extends Executor {
   static {
-    System.loadLibrary("nexus");
+    System.loadLibrary("mesos");
   }
 
   @Override
@@ -18,7 +18,7 @@ public class TestExceptionExecutor exten
 
   public static void main(String[] args) throws Exception {
     TestExceptionExecutor exec = new TestExceptionExecutor();
-    ExecutorDriver driver = new NexusExecutorDriver(exec);
+    ExecutorDriver driver = new MesosExecutorDriver(exec);
     driver.run();
   }
 }

Modified: incubator/mesos/trunk/src/swig/java/TestExceptionFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/TestExceptionFramework.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/TestExceptionFramework.java (original)
+++ incubator/mesos/trunk/src/swig/java/TestExceptionFramework.java Sun Jun  5 05:49:41 2011
@@ -1,9 +1,9 @@
 import java.io.File;
-import nexus.*;
+import mesos.*;
 
 public class TestExceptionFramework {
   static {
-    System.loadLibrary("nexus");
+    System.loadLibrary("mesos");
   }
 
   static class MyScheduler extends Scheduler {
@@ -81,7 +81,7 @@ public class TestExceptionFramework {
   }
 
   public static void main(String[] args) throws Exception {
-    new NexusSchedulerDriver(new MyScheduler(), args[0]).run();
+    new MesosSchedulerDriver(new MyScheduler(), args[0]).run();
     // TODO: Java should just exit here, and it does so on Linux, but
     // it doesn't on OS X. We should figure out why. It may have to do
     // with the libprocess threads being around and not being marked

Modified: incubator/mesos/trunk/src/swig/java/TestExecutor.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/TestExecutor.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/TestExecutor.java (original)
+++ incubator/mesos/trunk/src/swig/java/TestExecutor.java Sun Jun  5 05:49:41 2011
@@ -1,9 +1,9 @@
 import java.io.File;
-import nexus.*;
+import mesos.*;
 
 public class TestExecutor extends Executor {
   static {
-    System.loadLibrary("nexus");
+    System.loadLibrary("mesos");
   }
 
   @Override
@@ -23,7 +23,7 @@ public class TestExecutor extends Execut
 
   public static void main(String[] args) throws Exception {
     TestExecutor exec = new TestExecutor();
-    ExecutorDriver driver = new NexusExecutorDriver(exec);
+    ExecutorDriver driver = new MesosExecutorDriver(exec);
     driver.run();
   }
 }

Modified: incubator/mesos/trunk/src/swig/java/TestFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/TestFramework.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/TestFramework.java (original)
+++ incubator/mesos/trunk/src/swig/java/TestFramework.java Sun Jun  5 05:49:41 2011
@@ -1,9 +1,9 @@
 import java.io.File;
-import nexus.*;
+import mesos.*;
 
 public class TestFramework {
   static {
-    System.loadLibrary("nexus");
+    System.loadLibrary("mesos");
   }
 
   static class MyScheduler extends Scheduler {
@@ -79,6 +79,6 @@ public class TestFramework {
   }
 
   public static void main(String[] args) throws Exception {
-    new NexusSchedulerDriver(new MyScheduler(), args[0]).run();
+    new MesosSchedulerDriver(new MyScheduler(), args[0]).run();
   }
 }

Copied: incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1 (from r1131908, incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch1)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1?p2=incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1&p1=incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch1&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch1 (original)
+++ incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1 Sun Jun  5 05:49:41 2011
@@ -1,5 +1,5 @@
---- nexus/nexusJNI.java 2010-05-12 14:19:47.000000000 -0700
-+++ nexusJNI.java 2010-05-12 14:50:31.000000000 -0700
+--- mesos/mesosJNI.java 2010-05-12 14:19:47.000000000 -0700
++++ mesosJNI.java 2010-05-12 14:50:31.000000000 -0700
 @@ -1,6 +1,6 @@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
@@ -9,7 +9,7 @@
   * Do not make changes to this file unless you know what you are doing--modify
   * the SWIG interface file instead.
 @@ -177,49 +177,49 @@
-   public final static native long SWIGNexusExecutorDriverUpcast(long jarg1);
+   public final static native long SWIGMesosExecutorDriverUpcast(long jarg1);
  
    public static String SwigDirector_Scheduler_getFrameworkName(Scheduler self, long arg0) {
 -    return self.getFrameworkName(new SchedulerDriver(arg0, false));

Copied: incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2 (from r1131908, incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch2)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2?p2=incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2&p1=incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch2&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch2 (original)
+++ incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2 Sun Jun  5 05:49:41 2011
@@ -1,7 +1,7 @@
---- nexus/nexusJNI.java 2010-05-12 19:52:01.000000000 +0000
-+++ nexusJNI.java.patched 2010-05-12 19:49:26.000000000 +0000
+--- mesos/mesosJNI.java 2010-05-12 19:52:01.000000000 +0000
++++ mesosJNI.java.patched 2010-05-12 19:49:26.000000000 +0000
 @@ -175,49 +175,79 @@
-   public final static native long SWIGNexusExecutorDriverUpcast(long jarg1);
+   public final static native long SWIGMesosExecutorDriverUpcast(long jarg1);
  
    public static String SwigDirector_Scheduler_getFrameworkName(Scheduler self, long arg0) {
 -    return self.getFrameworkName((arg0 == 0) ? null : new SchedulerDriver(arg0, false));

Modified: incubator/mesos/trunk/src/swig/java/test_exception_framework
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/test_exception_framework?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/test_exception_framework (original)
+++ incubator/mesos/trunk/src/swig/java/test_exception_framework Sun Jun  5 05:49:41 2011
@@ -1,4 +1,4 @@
 #!/bin/sh
 FWDIR=`dirname $0`
 cd $FWDIR
-exec java -cp .:nexus.jar -Djava.library.path=. TestExceptionFramework $@
+exec java -cp .:mesos.jar -Djava.library.path=. TestExceptionFramework $@

Modified: incubator/mesos/trunk/src/swig/java/test_executor
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/test_executor?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/test_executor (original)
+++ incubator/mesos/trunk/src/swig/java/test_executor Sun Jun  5 05:49:41 2011
@@ -1,4 +1,4 @@
 #!/bin/sh
 FWDIR=`dirname $0`
 cd $FWDIR
-exec java -cp .:nexus.jar -Djava.library.path=. TestExecutor $@
+exec java -cp .:mesos.jar -Djava.library.path=. TestExecutor $@

Modified: incubator/mesos/trunk/src/swig/java/test_framework
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/test_framework?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/test_framework (original)
+++ incubator/mesos/trunk/src/swig/java/test_framework Sun Jun  5 05:49:41 2011
@@ -1,4 +1,4 @@
 #!/bin/sh
 FWDIR=`dirname $0`
 cd $FWDIR
-exec java -cp .:nexus.jar -Djava.library.path=. TestFramework $@
+exec java -cp .:mesos.jar -Djava.library.path=. TestFramework $@

Copied: incubator/mesos/trunk/src/swig/mesos.i (from r1131908, incubator/mesos/trunk/src/swig/nexus.i)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/mesos.i?p2=incubator/mesos/trunk/src/swig/mesos.i&p1=incubator/mesos/trunk/src/swig/nexus.i&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/nexus.i (original)
+++ incubator/mesos/trunk/src/swig/mesos.i Sun Jun  5 05:49:41 2011
@@ -1,4 +1,4 @@
-%module(directors="1") nexus
+%module(directors="1") mesos
 
 #define SWIG_NO_EXPORT_ITERATOR_METHODS
 
@@ -6,8 +6,8 @@
 #include <algorithm>
 #include <stdexcept>
 
-#include <nexus_sched.hpp>
-#include <nexus_exec.hpp>
+#include <mesos_sched.hpp>
+#include <mesos_exec.hpp>
 
 #define SWIG_STD_NOASSIGN_STL
 %}
@@ -29,57 +29,57 @@
 #ifdef SWIGJAVA
   /* Typemaps for vector<char> to convert it to a byte array */
   /* Based on a post at http://www.nabble.com/Swing-to-Java:-using-native-types-for-vector%3CT%3E-td22504981.html */
-  %naturalvar nexus::data_string; 
+  %naturalvar mesos::data_string; 
 
-  %typemap(jni) nexus::data_string "jbyteArray" 
-  %typemap(jtype) nexus::data_string "byte[]" 
-  %typemap(jstype) nexus::data_string "byte[]" 
+  %typemap(jni) mesos::data_string "jbyteArray" 
+  %typemap(jtype) mesos::data_string "byte[]" 
+  %typemap(jstype) mesos::data_string "byte[]" 
 
-  %typemap(out) nexus::data_string 
+  %typemap(out) mesos::data_string 
   %{ 
      $result = jenv->NewByteArray($1.size()); 
      jenv->SetByteArrayRegion($result, 0, $1.size(), (jbyte *) &$1[0]); 
   %} 
 
-  %typemap(javaout) nexus::data_string 
+  %typemap(javaout) mesos::data_string 
   { 
     return $jnicall; 
   } 
 
-  %typemap(jni) const nexus::data_string & "jbyteArray" 
-  %typemap(jtype) const nexus::data_string & "byte[]" 
-  %typemap(jstype) const nexus::data_string & "byte[]" 
+  %typemap(jni) const mesos::data_string & "jbyteArray" 
+  %typemap(jtype) const mesos::data_string & "byte[]" 
+  %typemap(jstype) const mesos::data_string & "byte[]" 
 
-  %typemap(in) const nexus::data_string & 
+  %typemap(in) const mesos::data_string & 
   %{ if(!$input) { 
        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException,
-         "null nexus::data_string"); 
+         "null mesos::data_string"); 
        return $null; 
       } 
       const jsize $1_size = jenv->GetArrayLength($input); 
       jbyte *$1_ptr = jenv->GetByteArrayElements($input, NULL); 
-      nexus::data_string $1_str((char *) $1_ptr, $1_size); 
+      mesos::data_string $1_str((char *) $1_ptr, $1_size); 
       jenv->ReleaseByteArrayElements($input, $1_ptr, JNI_ABORT); 
       $1 = &$1_str; 
   %} 
 
-  %typemap(javain) const nexus::data_string & "$javainput" 
+  %typemap(javain) const mesos::data_string & "$javainput" 
 
-  %typemap(out) const nexus::data_string & 
+  %typemap(out) const mesos::data_string & 
   %{ 
      $result = jenv->NewByteArray($1->size()); 
      jenv->SetByteArrayRegion($result, 0, $1->size(), (jbyte *) &(*$1)[0]); 
   %} 
 
-  %typemap(javaout) const nexus::data_string & 
+  %typemap(javaout) const mesos::data_string & 
   { 
     return $jnicall; 
   } 
 
-  /* Typemaps for NexusSchedulerDriver to keep a reference to the Scheduler */
-  %typemap(javain) nexus::Scheduler* "getCPtrAndAddReference($javainput)"
+  /* Typemaps for MesosSchedulerDriver to keep a reference to the Scheduler */
+  %typemap(javain) mesos::Scheduler* "getCPtrAndAddReference($javainput)"
 
-  %typemap(javacode) nexus::NexusSchedulerDriver %{
+  %typemap(javacode) mesos::MesosSchedulerDriver %{
     private static java.util.HashSet<Scheduler> schedulers =
       new java.util.HashSet<Scheduler>();
 
@@ -91,7 +91,7 @@
     }
   %}
 
-  %typemap(javafinalize) nexus::NexusSchedulerDriver %{
+  %typemap(javafinalize) mesos::MesosSchedulerDriver %{
     protected void finalize() {
       synchronized (schedulers) {
         schedulers.remove(getScheduler());
@@ -100,10 +100,10 @@
     }
   %}
 
-  /* Typemaps for NexusExecutorDriver to keep a reference to the Executor */
-  %typemap(javain) nexus::Executor* "getCPtrAndAddReference($javainput)"
+  /* Typemaps for MesosExecutorDriver to keep a reference to the Executor */
+  %typemap(javain) mesos::Executor* "getCPtrAndAddReference($javainput)"
 
-  %typemap(javacode) nexus::NexusExecutorDriver %{
+  %typemap(javacode) mesos::MesosExecutorDriver %{
     private static java.util.HashSet<Executor> executors =
       new java.util.HashSet<Executor>();
 
@@ -115,7 +115,7 @@
     }
   %}
 
-  %typemap(javafinalize) nexus::NexusExecutorDriver %{
+  %typemap(javafinalize) mesos::MesosExecutorDriver %{
     protected void finalize() {
       synchronized (executors) {
         executors.remove(getExecutor());
@@ -127,38 +127,38 @@
 
 #ifdef SWIGPYTHON
   /* Add a reference to scheduler in the Python wrapper object to prevent it
-     from being garbage-collected while the NexusSchedulerDriver exists */
-  %feature("pythonappend") nexus::NexusSchedulerDriver::NexusSchedulerDriver %{
+     from being garbage-collected while the MesosSchedulerDriver exists */
+  %feature("pythonappend") mesos::MesosSchedulerDriver::MesosSchedulerDriver %{
         self.scheduler = args[0]
   %}
 
   /* Add a reference to executor in the Python wrapper object to prevent it
-     from being garbage-collected while the NexusExecutorDriver exists */
-  %feature("pythonappend") nexus::NexusExecutorDriver::NexusExecutorDriver %{
+     from being garbage-collected while the MesosExecutorDriver exists */
+  %feature("pythonappend") mesos::MesosExecutorDriver::MesosExecutorDriver %{
         self.executor = args[0]
   %}
 #endif /* SWIGPYTHON */
 
 #ifdef SWIGRUBY
-  /* Hide NexusSchedulerDriver::getScheduler because it would require
+  /* Hide MesosSchedulerDriver::getScheduler because it would require
      object tracking to be turned on */
-  %ignore nexus::NexusSchedulerDriver::getScheduler();
+  %ignore mesos::MesosSchedulerDriver::getScheduler();
 #endif /* SWIGRUBY */
 
 /* Rename task_state enum so that the generated class is called TaskState */
 %rename(TaskState) task_state;
 
 /* Make it possible to inherit from Scheduler/Executor in target language */
-%feature("director") nexus::Scheduler;
-%feature("director") nexus::Executor;
+%feature("director") mesos::Scheduler;
+%feature("director") mesos::Executor;
 
 /* Declare template instantiations we will use */
-%template(SlaveOfferVector) std::vector<nexus::SlaveOffer>;
-%template(TaskDescriptionVector) std::vector<nexus::TaskDescription>;
+%template(SlaveOfferVector) std::vector<mesos::SlaveOffer>;
+%template(TaskDescriptionVector) std::vector<mesos::TaskDescription>;
 %template(StringMap) std::map<std::string, std::string>;
 
-%include <nexus_types.h>
-%include <nexus_types.hpp>
-%include <nexus.hpp>
-%include <nexus_sched.hpp>
-%include <nexus_exec.hpp>
+%include <mesos_types.h>
+%include <mesos_types.hpp>
+%include <mesos.hpp>
+%include <mesos_sched.hpp>
+%include <mesos_exec.hpp>

Modified: incubator/mesos/trunk/src/swig/python/test_exec.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/python/test_exec.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/python/test_exec.py (original)
+++ incubator/mesos/trunk/src/swig/python/test_exec.py Sun Jun  5 05:49:41 2011
@@ -1,17 +1,17 @@
 #!/usr/bin/env python
-import nexus
+import mesos
 import sys
 import time
 
-class MyExecutor(nexus.Executor):
+class MyExecutor(mesos.Executor):
   def __init__(self):
-    nexus.Executor.__init__(self)
+    mesos.Executor.__init__(self)
 
   def launchTask(self, driver, task):
     print "Running task %d" % task.taskId
     time.sleep(1)
     print "Sending the update..."
-    update = nexus.TaskStatus(task.taskId, nexus.TASK_FINISHED, "")
+    update = mesos.TaskStatus(task.taskId, mesos.TASK_FINISHED, "")
     driver.sendStatusUpdate(update)
     print "Sent the update"
 
@@ -20,4 +20,4 @@ class MyExecutor(nexus.Executor):
 
 if __name__ == "__main__":
   print "Starting executor"
-  nexus.NexusExecutorDriver(MyExecutor()).run()
+  mesos.MesosExecutorDriver(MyExecutor()).run()

Modified: incubator/mesos/trunk/src/swig/python/test_framework.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/python/test_framework.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/python/test_framework.py (original)
+++ incubator/mesos/trunk/src/swig/python/test_framework.py Sun Jun  5 05:49:41 2011
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import nexus
+import mesos
 import os
 import sys
 import time
@@ -9,9 +9,9 @@ TOTAL_TASKS = 5
 TASK_CPUS = 1
 TASK_MEM = 32 * 1024 * 1024
 
-class MyScheduler(nexus.Scheduler):
+class MyScheduler(mesos.Scheduler):
   def __init__(self):
-    nexus.Scheduler.__init__(self) # Required to extend Scheduler in Python
+    mesos.Scheduler.__init__(self) # Required to extend Scheduler in Python
     self.tasksLaunched = 0
     self.tasksFinished = 0
 
@@ -20,7 +20,7 @@ class MyScheduler(nexus.Scheduler):
 
   def getExecutorInfo(self, driver):
     execPath = os.path.join(os.getcwd(), "test_exec.sh")
-    return nexus.ExecutorInfo(execPath, "")
+    return mesos.ExecutorInfo(execPath, "")
 
   def registered(self, driver, fid):
     print "Registered!"
@@ -34,14 +34,14 @@ class MyScheduler(nexus.Scheduler):
         self.tasksLaunched += 1
         print "Accepting offer on %s to start task %d" % (offer.host, tid)
         params = {"cpus": "%d" % TASK_CPUS, "mem": "%d" % TASK_MEM}
-        td = nexus.TaskDescription(tid, offer.slaveId, "task %d" % tid,
+        td = mesos.TaskDescription(tid, offer.slaveId, "task %d" % tid,
             params, "")
         tasks.append(td)
     driver.replyToOffer(oid, tasks, {})
 
   def statusUpdate(self, driver, update):
     print "Task %d is in state %d" % (update.taskId, update.state)
-    if update.state == nexus.TASK_FINISHED:
+    if update.state == mesos.TASK_FINISHED:
       self.tasksFinished += 1
       if self.tasksFinished == TOTAL_TASKS:
         print "All tasks done, exiting"
@@ -49,4 +49,4 @@ class MyScheduler(nexus.Scheduler):
 
 if __name__ == "__main__":
   print "Connecting to %s" % sys.argv[1]
-  nexus.NexusSchedulerDriver(MyScheduler(), sys.argv[1]).run()
+  mesos.MesosSchedulerDriver(MyScheduler(), sys.argv[1]).run()

Modified: incubator/mesos/trunk/src/swig/ruby/test_framework.rb
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/ruby/test_framework.rb?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/ruby/test_framework.rb (original)
+++ incubator/mesos/trunk/src/swig/ruby/test_framework.rb Sun Jun  5 05:49:41 2011
@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
 
-require 'nexus'
+require 'mesos'
 
 # TODO: Ruby schedulers seems to be slightly broken under the new API - find out why
-class MyScheduler < Nexus::Scheduler
+class MyScheduler < Mesos::Scheduler
   def get_framework_name(driver)
     "Ruby test framework"
   end
 
   def get_executor_info(driver)
-    Nexus::ExecutorInfo.new(Dir.pwd + "/../../test-executor", "")
+    Mesos::ExecutorInfo.new(Dir.pwd + "/../../test-executor", "")
   end
 
   def registered(driver, fid)
@@ -24,5 +24,5 @@ class MyScheduler < Nexus::Scheduler
 end
 
 sched = MyScheduler.new
-driver = Nexus::NexusSchedulerDriver.new(sched, ARGV[0])
+driver = Mesos::MesosSchedulerDriver.new(sched, ARGV[0])
 driver.run()

Modified: incubator/mesos/trunk/src/task.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/task.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/task.hpp (original)
+++ incubator/mesos/trunk/src/task.hpp Sun Jun  5 05:49:41 2011
@@ -3,9 +3,9 @@
 
 #include <string>
 #include <glog/logging.h>
-#include <nexus_types.hpp>
+#include <mesos_types.hpp>
 
-namespace nexus { namespace internal { 
+namespace mesos { namespace internal { 
 
 // An active task. The master only keeps track of tasks that are active.
 struct Task

Modified: incubator/mesos/trunk/src/test_exec.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/test_exec.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/test_exec.cpp (original)
+++ incubator/mesos/trunk/src/test_exec.cpp Sun Jun  5 05:49:41 2011
@@ -3,14 +3,14 @@
 
 #include <iostream>
 
-#include "nexus_exec.h"
+#include "mesos_exec.h"
 
 using std::cout;
 using std::cerr;
 using std::endl;
 
 
-void init(struct nexus_exec* exec,
+void init(struct mesos_exec* exec,
           slave_id sid,
           const char* host,
           framework_id fid,
@@ -23,44 +23,44 @@ void init(struct nexus_exec* exec,
 }
 
 
-void launch_task(struct nexus_exec* exec, struct nexus_task_desc* task)
+void launch_task(struct mesos_exec* exec, struct mesos_task_desc* task)
 {
-  struct nexus_task_status done = { task->tid, TASK_FINISHED, 0, 0 };
+  struct mesos_task_status done = { task->tid, TASK_FINISHED, 0, 0 };
   cout << "run()" << endl;
   sleep(1);
   cout << "run() done" << endl;
-  nexus_exec_status_update(exec, &done);
+  mesos_exec_status_update(exec, &done);
 }
 
 
-void kill_task(struct nexus_exec* exec, task_id tid)
+void kill_task(struct mesos_exec* exec, task_id tid)
 {
   cout << "asked to kill task, but that isn't implemented" << endl;
 }
 
 
-void framework_message(struct nexus_exec* exec,
-                       struct nexus_framework_message* msg)
+void framework_message(struct mesos_exec* exec,
+                       struct mesos_framework_message* msg)
 {
   cout << "received framework message" << endl;
 }
 
 
-void shutdown(struct nexus_exec* exec)
+void shutdown(struct mesos_exec* exec)
 {
   cerr << "shutdown requested" << endl;
   exit(1);
 }
 
 
-void error(struct nexus_exec* exec, int code, const char* msg)
+void error(struct mesos_exec* exec, int code, const char* msg)
 {
   cerr << "error encountered: " << msg << endl;
   exit(1);
 }
 
 
-struct nexus_exec exec = { 
+struct mesos_exec exec = { 
   init,
   launch_task,
   kill_task,
@@ -72,5 +72,5 @@ struct nexus_exec exec = { 
 
 
 int main() {
-  return nexus_exec_run(&exec);
+  return mesos_exec_run(&exec);
 }

Modified: incubator/mesos/trunk/src/test_framework.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/test_framework.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/test_framework.cpp (original)
+++ incubator/mesos/trunk/src/test_framework.cpp Sun Jun  5 05:49:41 2011
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <nexus_sched.h>
+#include <mesos_sched.h>
 
 using namespace std;
 
@@ -12,39 +12,39 @@ int tasksStarted = 0;
 int tasksFinished = 0;
 
 
-void registered(nexus_sched *sched, framework_id fid)
+void registered(mesos_sched *sched, framework_id fid)
 {
-  cout << "Registered with Nexus, framework ID = " << fid << endl;
+  cout << "Registered with Mesos, framework ID = " << fid << endl;
 }
 
 
-void slot_offer(nexus_sched *sched, offer_id oid,
-                nexus_slot *slots, int num_slots)
+void slot_offer(mesos_sched *sched, offer_id oid,
+                mesos_slot *slots, int num_slots)
 {
   // TODO: Make this loop over offers rather than looking only at first offer!
   cout << "Got slot offer " << oid << endl;
   if (tasksStarted >= TOTAL_TASKS) {
     cout << "Refusing it" << endl;
-    nexus_sched_reply_to_offer(sched, oid, 0, 0, "timeout=-1");
+    mesos_sched_reply_to_offer(sched, oid, 0, 0, "timeout=-1");
   } else {
     task_id tid = tasksStarted++;
     cout << "Accepting it to start task " << tid << endl;
-    nexus_task_desc desc = { tid, slots[0].sid, "task",
+    mesos_task_desc desc = { tid, slots[0].sid, "task",
       "cpus=1\nmem=33554432", 0, 0 };
-    nexus_sched_reply_to_offer(sched, oid, &desc, 1, "");
+    mesos_sched_reply_to_offer(sched, oid, &desc, 1, "");
     if (tasksStarted > 4)
-      nexus_sched_unreg(sched);
+      mesos_sched_unreg(sched);
   }
 }
 
 
-void slot_offer_rescinded(nexus_sched *sched, offer_id oid)
+void slot_offer_rescinded(mesos_sched *sched, offer_id oid)
 {
   cout << "Slot offer rescinded: " << oid << endl;
 }
 
 
-void status_update(nexus_sched *sched, nexus_task_status *status)
+void status_update(mesos_sched *sched, mesos_task_status *status)
 {
   cout << "Task " << status->tid << " entered state " << status->state << endl;
   if (status->state == TASK_FINISHED) {
@@ -55,27 +55,27 @@ void status_update(nexus_sched *sched, n
 }
 
 
-void framework_message(nexus_sched *sched, nexus_framework_message *msg)
+void framework_message(mesos_sched *sched, mesos_framework_message *msg)
 {
   cout << "Got a framework message from slave " << msg->sid
        << ": " << (char *) msg->data << endl;
 }
 
 
-void slave_lost(nexus_sched *sched, slave_id sid)
+void slave_lost(mesos_sched *sched, slave_id sid)
 {
   cout << "Lost slave " << sid << endl;
 }  
 
 
-void error(nexus_sched *sched, int code, const char *message)
+void error(mesos_sched *sched, int code, const char *message)
 {
-  cout << "Error from Nexus: " << message << endl;
+  cout << "Error from Mesos: " << message << endl;
   exit(code);
 }
 
 
-nexus_sched sched = {
+mesos_sched sched = {
   "test framework",
   "", // Executor (will be set in main to get absolute path)
   registered,
@@ -105,29 +105,29 @@ int main(int argc, char **argv)
     exit(1);
   }
 
-  if (nexus_sched_init(&sched) < 0) {
-    perror("nexus_sched_init");
+  if (mesos_sched_init(&sched) < 0) {
+    perror("mesos_sched_init");
     exit(1);
   }
 
   if (argc == 1 && strlen(argv[1]) > 0 && argv[1][0] != '-') {
     // Initialize with master URL alone
-    if (nexus_sched_reg(&sched, argv[1]) < 0) {
-      perror("nexus_sched_reg");
+    if (mesos_sched_reg(&sched, argv[1]) < 0) {
+      perror("mesos_sched_reg");
       exit(1);
     }
   } else {
     // Initialize by parsing command line
-    if (nexus_sched_reg_with_cmdline(&sched, argc, argv) < 0) {
-      perror("nexus_sched_reg");
+    if (mesos_sched_reg_with_cmdline(&sched, argc, argv) < 0) {
+      perror("mesos_sched_reg");
       exit(1);
     }
   }
 
-  nexus_sched_join(&sched);
+  mesos_sched_join(&sched);
 
-  if (nexus_sched_destroy(&sched) < 0) {
-    perror("nexus_sched_destroy");
+  if (mesos_sched_destroy(&sched) < 0) {
+    perror("mesos_sched_destroy");
     exit(1);
   }
 

Modified: incubator/mesos/trunk/src/tests/external/LxcIsolation/run_scheduled_memhog_test.sh
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/external/LxcIsolation/run_scheduled_memhog_test.sh?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/external/LxcIsolation/run_scheduled_memhog_test.sh (original)
+++ incubator/mesos/trunk/src/tests/external/LxcIsolation/run_scheduled_memhog_test.sh Sun Jun  5 05:49:41 2011
@@ -13,7 +13,7 @@ if [[ $EUID -ne 0 ]]; then
 fi
 
 # Launch master
-$MESOS_HOME/nexus-master -p 5432 > master.log 2>&1 &
+$MESOS_HOME/mesos-master -p 5432 > master.log 2>&1 &
 MASTER_PID=$!
 echo "Launched master, PID = $MASTER_PID"
 sleep 2
@@ -27,7 +27,7 @@ if [[ $KILL_EXIT_CODE -ne 0 ]]; then
 fi
 
 # Launch slave
-$MESOS_HOME/nexus-slave -u 1@$HOSTNAME:5432 -i lxc \
+$MESOS_HOME/mesos-slave -u 1@$HOSTNAME:5432 -i lxc \
                         -c 2 -m $[512*1024*1024] > slave.log 2>&1 &
 SLAVE_PID=$!
 echo "Launched slave, PID = $SLAVE_PID"

Modified: incubator/mesos/trunk/src/tests/external_test.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/external_test.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/external_test.cpp (original)
+++ incubator/mesos/trunk/src/tests/external_test.cpp Sun Jun  5 05:49:41 2011
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 
-#include <ctype.h>
 #include <stdlib.h>
 
 #include <string>
@@ -12,21 +11,7 @@
 #include "testing_utils.hpp"
 
 using std::string;
-
-namespace {
-
-// Check that a test name contains only letters, numbers and underscores, to
-// prevent messing with directories outside test_output in runExternalTest.
-bool isValidTestName(const char* name) {
-  for (const char* p = name; *p != 0; p++) {
-    if (!isalnum(*p) && *p != '_') {
-      return false;
-    }
-  }
-  return true;
-}
-
-}
+using namespace mesos::internal::test;
 
 
 /**
@@ -36,25 +21,14 @@ bool isValidTestName(const char* name) {
  * piping its output to files called stdout and stderr, and the test
  * passes if the script returns 0.
  */
-void nexus::test::runExternalTest(const char* testCase, const char* testName)
+void mesos::internal::test::runExternalTest(const char* testCase,
+                                            const char* testName)
 {
-  // Remove DISABLED_ prefix from test name if this is a disabled test
-  if (strncmp(testName, "DISABLED_", strlen("DISABLED_")) == 0)
-    testName += strlen("DISABLED_");
-  // Check that the test name is valid
-  if (!isValidTestName(testCase) || !isValidTestName(testName)) {
-    FAIL() << "Invalid test name for external test (name should " 
-           << "only contain alphanumeric and underscore characters)";
-  }
+  // Create and go into the test's work directory
+  enterTestDirectory(testCase, testName);
   // Figure out the absolute path to the test script
-  string script = MESOS_HOME + "/tests/external/" + testCase
+  string script = mesosHome + "/tests/external/" + testCase
                              + "/" + testName + ".sh";
-  // Make the work directory for this test
-  string workDir = MESOS_HOME + "/test_output/" + testCase + "/" + testName;
-  string command = "rm -fr '" + workDir + "'";
-  ASSERT_EQ(0, system(command.c_str())) << "Command failed: " << command;
-  command = "mkdir -p '" + workDir + "'";
-  ASSERT_EQ(0, system(command.c_str())) << "Command failed: " << command;
   // Fork a process to change directory and run the test
   pid_t pid;
   if ((pid = fork()) == -1) {
@@ -66,14 +40,13 @@ void nexus::test::runExternalTest(const 
     wait(&exitCode);
     ASSERT_EQ(0, exitCode) << "External test " << testName << " failed";
   } else {
-    // In child process. Go into to the work directory, redirect IO to files,
+    // In child process. Redirect standard output and error to files,
     // set MESOS_HOME environment variable, and exec the test script.
-    chdir(workDir.c_str());
     if (freopen("stdout", "w", stdout) == NULL)
       fatalerror("freopen failed");
     if (freopen("stderr", "w", stderr) == NULL)
       fatalerror("freopen failed");
-    setenv("MESOS_HOME", MESOS_HOME.c_str(), 1);
+    setenv("MESOS_HOME", mesosHome.c_str(), 1);
     execl(script.c_str(), script.c_str(), (char*) NULL);
     // If we get here, execl failed; report the error
     fatalerror("Could not execute %s", script.c_str());

Modified: incubator/mesos/trunk/src/tests/external_test.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/external_test.hpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/external_test.hpp (original)
+++ incubator/mesos/trunk/src/tests/external_test.hpp Sun Jun  5 05:49:41 2011
@@ -12,10 +12,10 @@
  */
 #define TEST_EXTERNAL(testCase, testName) \
   TEST(testCase, testName) { \
-    nexus::internal::test::runExternalTest(#testCase, #testName); \
+    mesos::internal::test::runExternalTest(#testCase, #testName); \
   }
 
-namespace nexus { namespace internal { namespace test {
+namespace mesos { namespace internal { namespace test {
 
 /**
  * Function called by TEST_EXTERNAL to execute external tests. See
@@ -23,6 +23,6 @@ namespace nexus { namespace internal { n
  */
 void runExternalTest(const char* testCase, const char* testName);
 
-}}} /* namespace nexus::internal::test */
+}}} /* namespace mesos::internal::test */
 
 #endif /* __EXTERNAL_TEST_HPP__ */

Modified: incubator/mesos/trunk/src/tests/main.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/main.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/main.cpp (original)
+++ incubator/mesos/trunk/src/tests/main.cpp Sun Jun  5 05:49:41 2011
@@ -11,8 +11,8 @@
 #include "fatal.hpp"
 #include "testing_utils.hpp"
 
-using namespace nexus::internal;
-using namespace nexus::internal::test;
+using namespace mesos::internal;
+using namespace mesos::internal::test;
 
 
 int main(int argc, char **argv) {

Modified: incubator/mesos/trunk/src/tests/test_configurator.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_configurator.cpp?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_configurator.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_configurator.cpp Sun Jun  5 05:49:41 2011
@@ -14,9 +14,9 @@ using std::cout;
 
 using boost::lexical_cast;
 
-using namespace nexus;
-using namespace nexus::internal;
-using namespace nexus::internal::test;
+using namespace mesos;
+using namespace mesos::internal;
+using namespace mesos::internal::test;
 
 
 TEST(ConfiguratorTest, Environment)



Mime
View raw message