You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 11:17:48 UTC
svn commit: r1132274 - in /incubator/mesos/trunk: include/ src/
src/examples/java/ src/java/jni/ src/java/src/mesos/ src/java/src/org/
src/java/src/org/apache/ src/java/src/org/apache/mesos/ src/master/
src/sched/ third_party/libprocess/
Author: benh
Date: Sun Jun 5 09:17:47 2011
New Revision: 1132274
URL: http://svn.apache.org/viewvc?rev=1132274&view=rev
Log:
Updated Java package from mesos to org.apache.mesos (this touched a lot more files than expected).
Added:
incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp
- copied, changed from r1132273, incubator/mesos/trunk/src/java/jni/mesos_MesosExecutorDriver.cpp
incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
- copied, changed from r1132273, incubator/mesos/trunk/src/java/jni/mesos_MesosSchedulerDriver.cpp
incubator/mesos/trunk/src/java/src/org/
incubator/mesos/trunk/src/java/src/org/apache/
incubator/mesos/trunk/src/java/src/org/apache/mesos/
incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java
- copied, changed from r1132273, incubator/mesos/trunk/src/java/src/mesos/Executor.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java
- copied, changed from r1132273, incubator/mesos/trunk/src/java/src/mesos/ExecutorDriver.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java
- copied, changed from r1132273, incubator/mesos/trunk/src/java/src/mesos/MesosExecutorDriver.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
- copied, changed from r1132273, incubator/mesos/trunk/src/java/src/mesos/MesosSchedulerDriver.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java
- copied, changed from r1132273, incubator/mesos/trunk/src/java/src/mesos/Scheduler.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java
- copied, changed from r1132273, incubator/mesos/trunk/src/java/src/mesos/SchedulerDriver.java
Removed:
incubator/mesos/trunk/src/java/jni/mesos_MesosExecutorDriver.cpp
incubator/mesos/trunk/src/java/jni/mesos_MesosSchedulerDriver.cpp
incubator/mesos/trunk/src/java/src/mesos/Executor.java
incubator/mesos/trunk/src/java/src/mesos/ExecutorDriver.java
incubator/mesos/trunk/src/java/src/mesos/MesosExecutorDriver.java
incubator/mesos/trunk/src/java/src/mesos/MesosSchedulerDriver.java
incubator/mesos/trunk/src/java/src/mesos/Scheduler.java
incubator/mesos/trunk/src/java/src/mesos/SchedulerDriver.java
incubator/mesos/trunk/third_party/libprocess/test.hpp
Modified:
incubator/mesos/trunk/include/mesos.proto
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java
incubator/mesos/trunk/src/examples/java/TestExecutor.java
incubator/mesos/trunk/src/examples/java/TestFramework.java
incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java
incubator/mesos/trunk/src/java/jni/construct.cpp
incubator/mesos/trunk/src/java/jni/construct.hpp
incubator/mesos/trunk/src/java/jni/convert.cpp
incubator/mesos/trunk/src/java/jni/convert.hpp
incubator/mesos/trunk/src/master/master.cpp
incubator/mesos/trunk/src/master/master.hpp
incubator/mesos/trunk/src/sched/sched.cpp
Modified: incubator/mesos/trunk/include/mesos.proto
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos.proto?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/include/mesos.proto (original)
+++ incubator/mesos/trunk/include/mesos.proto Sun Jun 5 09:17:47 2011
@@ -1,5 +1,6 @@
package mesos;
+option java_package = "org.apache.mesos";
option java_outer_classname = "Protos";
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 09:17:47 2011
@@ -180,9 +180,9 @@ endif
MESOS_LIBS = $(MESOS_LIB) $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB)
-MESOS_JAVA_LIB_OBJ = java/jni/convert.o java/jni/construct.o \
- java/jni/mesos_MesosSchedulerDriver.o \
- java/jni/mesos_MesosExecutorDriver.o
+MESOS_JAVA_LIB_OBJ = java/jni/convert.o java/jni/construct.o \
+ java/jni/org_apache_mesos_MesosSchedulerDriver.o \
+ java/jni/org_apache_mesos_MesosExecutorDriver.o
# Java and Python shared libraries which contain the everything in
# MESOS_LIB as well as the SWIG wrappers (note, Java requires the use
@@ -331,18 +331,18 @@ $(MESOS_PROJD_EXE): $(SRCDIR)/slave/proj
java: $(MESOS_JAVA_LIB) $(MESOS_JAVA_JAR)
-$(MESOS_JAVA_JAR): $(SRCDIR)/java/src/mesos/*.java @top_srcdir@/include/mesos.proto | $(LIBDIR)/java
+$(MESOS_JAVA_JAR): $(SRCDIR)/java/src/org/apache/mesos/*.java @top_srcdir@/include/mesos.proto | $(LIBDIR)/java
ifdef JAVA_HOME
mkdir -p @top_builddir@/$(PROTOBUF)/java/src/main/java
$(PROTOC) --java_out=@top_builddir@/$(PROTOBUF)/java/src/main/java -I@top_srcdir@/$(PROTOBUF)/src @top_srcdir@/$(PROTOBUF)/src/google/protobuf/descriptor.proto
$(JAVA_HOME)/bin/javac -d @top_builddir@/$(PROTOBUF)/java/src/main/java @top_srcdir@/$(PROTOBUF)/java/src/main/java/com/google/protobuf/*.java @top_builddir@/$(PROTOBUF)/java/src/main/java/com/google/protobuf/*.java
- rm -f java/classes/mesos/*
- mkdir -p java/classes/mesos
- $(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java -sourcepath java/generated -d java/classes java/generated/mesos/*.java
- $(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes -sourcepath $(SRCDIR)/java/src -d java/classes $(SRCDIR)/java/src/mesos/*.java
- $(JAVA_HOME)/bin/jar cf $@ -C java/classes mesos
- $(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes mesos.MesosSchedulerDriver
- $(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes mesos.MesosExecutorDriver
+ rm -f java/classes/org/apache/mesos/*
+ mkdir -p java/classes/org/apache/mesos
+ $(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java -sourcepath java/generated -d java/classes java/generated/org/apache/mesos/*.java
+ $(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes -sourcepath $(SRCDIR)/java/src -d java/classes $(SRCDIR)/java/src/org/apache/mesos/*.java
+ $(JAVA_HOME)/bin/jar cf $@ -C java/classes org
+ $(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.MesosSchedulerDriver
+ $(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.MesosExecutorDriver
endif
$(MESOS_JAVA_LIB_OBJ): %.o: $(SRCDIR)/%.cpp $(MESOS_JAVA_JAR)
Modified: incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java Sun Jun 5 09:17:47 2011
@@ -2,8 +2,8 @@ import java.io.File;
import java.util.List;
-import mesos.*;
-import mesos.Protos.*;
+import org.apache.mesos.*;
+import org.apache.mesos.Protos.*;
public class TestExceptionFramework {
Modified: incubator/mesos/trunk/src/examples/java/TestExecutor.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestExecutor.java?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestExecutor.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestExecutor.java Sun Jun 5 09:17:47 2011
@@ -1,7 +1,7 @@
import java.io.File;
-import mesos.*;
-import mesos.Protos.*;
+import org.apache.mesos.*;
+import org.apache.mesos.Protos.*;
public class TestExecutor implements Executor {
Modified: incubator/mesos/trunk/src/examples/java/TestFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestFramework.java?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestFramework.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestFramework.java Sun Jun 5 09:17:47 2011
@@ -6,8 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import mesos.*;
-import mesos.Protos.*;
+import org.apache.mesos.*;
+import org.apache.mesos.Protos.*;
public class TestFramework {
Modified: incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java Sun Jun 5 09:17:47 2011
@@ -8,8 +8,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import mesos.*;
-import mesos.Protos.*;
+import org.apache.mesos.*;
+import org.apache.mesos.Protos.*;
public class TestMultipleExecutorsFramework {
Modified: incubator/mesos/trunk/src/java/jni/construct.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/construct.cpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/construct.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/construct.cpp Sun Jun 5 09:17:47 2011
@@ -199,7 +199,7 @@ template <>
TaskState construct(JNIEnv* env, jobject jobj)
{
// int value = obj.getNumber(value);
- jclass clazz = env->FindClass("mesos/Protos$TaskState");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$TaskState");
jmethodID getNumber = env->GetStaticMethodID(clazz, "getNumber", "()I");
Modified: incubator/mesos/trunk/src/java/jni/construct.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/construct.hpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/construct.hpp (original)
+++ incubator/mesos/trunk/src/java/jni/construct.hpp Sun Jun 5 09:17:47 2011
@@ -5,6 +5,6 @@
template <typename T>
-T construct(JNIEnv *env, jobject jobj);
+T construct(JNIEnv* env, jobject jobj);
-#endif /* __CONSTRUCT_HPP__ */
+#endif // __CONSTRUCT_HPP__
Modified: incubator/mesos/trunk/src/java/jni/convert.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/convert.cpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/convert.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/convert.cpp Sun Jun 5 09:17:47 2011
@@ -12,7 +12,7 @@ using std::string;
template <>
-jobject convert(JNIEnv *env, const string &s)
+jobject convert(JNIEnv* env, const string& s)
{
return env->NewStringUTF(s.c_str());
}
@@ -29,10 +29,11 @@ jobject convert(JNIEnv* env, const Frame
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// FrameworkID frameworkId = FrameworkID.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$FrameworkID");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$FrameworkID");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$FrameworkID;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$FrameworkID;");
jobject jframeworkId = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -51,10 +52,11 @@ jobject convert(JNIEnv* env, const TaskI
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// TaskID taskId = TaskID.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$TaskID");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$TaskID");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$TaskID;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$TaskID;");
jobject jtaskId = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -73,10 +75,11 @@ jobject convert(JNIEnv* env, const Slave
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// SlaveID slaveId = SlaveID.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$SlaveID");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$SlaveID");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$SlaveID;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$SlaveID;");
jobject jslaveId = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -95,10 +98,11 @@ jobject convert(JNIEnv* env, const Offer
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// OfferID offerId = OfferID.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$OfferID");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$OfferID");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$OfferID;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$OfferID;");
jobject jofferId = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -112,10 +116,11 @@ jobject convert(JNIEnv* env, const TaskS
jint jvalue = state;
// TaskState state = TaskState.valueOf(value);
- jclass clazz = env->FindClass("mesos/Protos$TaskState");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$TaskState");
jmethodID valueOf =
- env->GetStaticMethodID(clazz, "valueOf", "(I)Lmesos/Protos$TaskState;");
+ env->GetStaticMethodID(clazz, "valueOf",
+ "(I)Lorg/apache/mesos/Protos$TaskState;");
jobject jstate = env->CallStaticObjectMethod(clazz, valueOf, jvalue);
@@ -134,10 +139,11 @@ jobject convert(JNIEnv* env, const TaskD
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// TaskDescription task = TaskDescription.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$TaskDescription");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$TaskDescription");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$TaskDescription;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$TaskDescription;");
jobject jtask = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -156,10 +162,11 @@ jobject convert(JNIEnv* env, const TaskS
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// TaskStatus status = TaskStatus.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$TaskStatus");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$TaskStatus");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$TaskStatus;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$TaskStatus;");
jobject jstatus = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -178,10 +185,11 @@ jobject convert(JNIEnv* env, const Slave
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// SlaveOffer offer = SlaveOffer.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$SlaveOffer");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$SlaveOffer");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$SlaveOffer;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$SlaveOffer;");
jobject joffer = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -200,10 +208,11 @@ jobject convert(JNIEnv* env, const Frame
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// FrameworkMessage message = FrameworkMessage.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$FrameworkMessage");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$FrameworkMessage");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$FrameworkMessage;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$FrameworkMessage;");
jobject jmessage = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -222,10 +231,11 @@ jobject convert(JNIEnv* env, const Execu
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// ExecutorInfo executor = ExecutorInfo.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$ExecutorInfo");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$ExecutorInfo");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$ExecutorInfo;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$ExecutorInfo;");
jobject jexecutor = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
@@ -244,10 +254,11 @@ jobject convert(JNIEnv* env, const Execu
env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
// ExecutorArgs args = ExecutorArgs.parseFrom(data);
- jclass clazz = env->FindClass("mesos/Protos$ExecutorArgs");
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$ExecutorArgs");
jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom", "([B)Lmesos/Protos$ExecutorArgs;");
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$ExecutorArgs;");
jobject jargs = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
Modified: incubator/mesos/trunk/src/java/jni/convert.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/convert.hpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/convert.hpp (original)
+++ incubator/mesos/trunk/src/java/jni/convert.hpp Sun Jun 5 09:17:47 2011
@@ -7,4 +7,4 @@
template <typename T>
jobject convert(JNIEnv* env, const T& t);
-#endif /* __CONVERT_HPP__ */
+#endif // __CONVERT_HPP__
Copied: incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp (from r1132273, incubator/mesos/trunk/src/java/jni/mesos_MesosExecutorDriver.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp?p2=incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp&p1=incubator/mesos/trunk/src/java/jni/mesos_MesosExecutorDriver.cpp&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/mesos_MesosExecutorDriver.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp Sun Jun 5 09:17:47 2011
@@ -2,7 +2,7 @@
#include "construct.hpp"
#include "convert.hpp"
-#include "mesos_MesosExecutorDriver.h"
+#include "org_apache_mesos_MesosExecutorDriver.h"
#include "mesos_exec.hpp"
using namespace mesos;
@@ -40,14 +40,14 @@ void JNIExecutor::init(ExecutorDriver* d
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID exec = env->GetFieldID(clazz, "exec", "Lmesos/Executor;");
+ jfieldID exec = env->GetFieldID(clazz, "exec", "Lorg/apache/mesos/Executor;");
jobject jexec = env->GetObjectField(jdriver, exec);
clazz = env->GetObjectClass(jexec);
// exec.init(driver);
jmethodID init =
- env->GetMethodID(clazz, "init", "(Lmesos/ExecutorDriver;Lmesos/Protos$ExecutorArgs;)V");
+ env->GetMethodID(clazz, "init", "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$ExecutorArgs;)V");
jobject jargs = convert<ExecutorArgs>(env, args);
@@ -73,14 +73,14 @@ void JNIExecutor::launchTask(ExecutorDri
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID exec = env->GetFieldID(clazz, "exec", "Lmesos/Executor;");
+ jfieldID exec = env->GetFieldID(clazz, "exec", "Lorg/apache/mesos/Executor;");
jobject jexec = env->GetObjectField(jdriver, exec);
clazz = env->GetObjectClass(jexec);
// exec.launchTask(driver, desc);
jmethodID launchTask = env->GetMethodID(clazz, "launchTask",
- "(Lmesos/ExecutorDriver;Lmesos/Protos$TaskDescription;)V");
+ "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$TaskDescription;)V");
jobject jdesc = convert<TaskDescription>(env, desc);
@@ -106,14 +106,14 @@ void JNIExecutor::killTask(ExecutorDrive
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID exec = env->GetFieldID(clazz, "exec", "Lmesos/Executor;");
+ jfieldID exec = env->GetFieldID(clazz, "exec", "Lorg/apache/mesos/Executor;");
jobject jexec = env->GetObjectField(jdriver, exec);
clazz = env->GetObjectClass(jexec);
// exec.killTask(driver, taskId);
jmethodID killTask = env->GetMethodID(clazz, "killTask",
- "(Lmesos/ExecutorDriver;Lmesos/Protos$TaskID;)V");
+ "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$TaskID;)V");
jobject jtaskId = convert<TaskID>(env, taskId);
@@ -139,14 +139,14 @@ void JNIExecutor::frameworkMessage(Execu
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID exec = env->GetFieldID(clazz, "exec", "Lmesos/Executor;");
+ jfieldID exec = env->GetFieldID(clazz, "exec", "Lorg/apache/mesos/Executor;");
jobject jexec = env->GetObjectField(jdriver, exec);
clazz = env->GetObjectClass(jexec);
// exec.frameworkMessage(driver, message);
jmethodID frameworkMessage = env->GetMethodID(clazz, "frameworkMessage",
- "(Lmesos/ExecutorDriver;Lmesos/Protos$FrameworkMessage;)V");
+ "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$FrameworkMessage;)V");
jobject jmessage = convert<FrameworkMessage>(env, message);
@@ -172,14 +172,14 @@ void JNIExecutor::shutdown(ExecutorDrive
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID exec = env->GetFieldID(clazz, "exec", "Lmesos/Executor;");
+ jfieldID exec = env->GetFieldID(clazz, "exec", "Lorg/apache/mesos/Executor;");
jobject jexec = env->GetObjectField(jdriver, exec);
clazz = env->GetObjectClass(jexec);
// exec.shutdown(driver);
jmethodID shutdown =
- env->GetMethodID(clazz, "shutdown", "(Lmesos/ExecutorDriver;)V");
+ env->GetMethodID(clazz, "shutdown", "(Lorg/apache/mesos/ExecutorDriver;)V");
env->ExceptionClear();
@@ -203,14 +203,14 @@ void JNIExecutor::error(ExecutorDriver*
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID exec = env->GetFieldID(clazz, "exec", "Lmesos/Executor;");
+ jfieldID exec = env->GetFieldID(clazz, "exec", "Lorg/apache/mesos/Executor;");
jobject jexec = env->GetObjectField(jdriver, exec);
clazz = env->GetObjectClass(jexec);
// exec.error(driver, code, message);
jmethodID error = env->GetMethodID(clazz, "error",
- "(Lmesos/ExecutorDriver;ILjava/lang/String;)V");
+ "(Lorg/apache/mesos/ExecutorDriver;ILjava/lang/String;)V");
jint jcode = code;
jobject jmessage = convert<string>(env, message);
@@ -236,11 +236,11 @@ extern "C" {
#endif
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: initialize
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_mesos_MesosExecutorDriver_initialize
+JNIEXPORT void JNICALL Java_org_apache_mesos_MesosExecutorDriver_initialize
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -263,11 +263,11 @@ JNIEXPORT void JNICALL Java_mesos_MesosE
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: finalize
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_mesos_MesosExecutorDriver_finalize
+JNIEXPORT void JNICALL Java_org_apache_mesos_MesosExecutorDriver_finalize
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -293,11 +293,11 @@ JNIEXPORT void JNICALL Java_mesos_MesosE
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: start
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosExecutorDriver_start
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosExecutorDriver_start
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -311,11 +311,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosE
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: stop
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosExecutorDriver_stop
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosExecutorDriver_stop
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -329,11 +329,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosE
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: join
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosExecutorDriver_join
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosExecutorDriver_join
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -347,11 +347,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosE
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: sendStatusUpdate
- * Signature: (Lmesos/Protos$TaskStatus;)I
+ * Signature: (Lorg/apache/mesos/Protos$TaskStatus;)I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosExecutorDriver_sendStatusUpdate
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosExecutorDriver_sendStatusUpdate
(JNIEnv* env, jobject thiz, jobject jstatus)
{
// Construct a C++ TaskStatus from the Java TaskStatus.
@@ -369,11 +369,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosE
/*
- * Class: mesos_MesosExecutorDriver
+ * Class: org_apache_mesos_MesosExecutorDriver
* Method: sendFrameworkMessage
- * Signature: (Lmesos/Protos$FrameworkMessage;)I
+ * Signature: (Lorg/apache/mesos/Protos$FrameworkMessage;)I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosExecutorDriver_sendFrameworkMessage
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosExecutorDriver_sendFrameworkMessage
(JNIEnv* env, jobject thiz, jobject jmessage)
{
// Construct a C++ FrameworkMessage from the Java FrameworkMessage.
Copied: incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp (from r1132273, incubator/mesos/trunk/src/java/jni/mesos_MesosSchedulerDriver.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp?p2=incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp&p1=incubator/mesos/trunk/src/java/jni/mesos_MesosSchedulerDriver.cpp&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/mesos_MesosSchedulerDriver.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp Sun Jun 5 09:17:47 2011
@@ -5,7 +5,7 @@
#include "construct.hpp"
#include "convert.hpp"
#include "foreach.hpp"
-#include "mesos_MesosSchedulerDriver.h"
+#include "org_apache_mesos_MesosSchedulerDriver.h"
#include "mesos_sched.hpp"
using namespace mesos;
@@ -54,14 +54,14 @@ string JNIScheduler::getFrameworkName(Sc
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// String name = sched.getFrameworkName(driver);
jmethodID getFrameworkName = env->GetMethodID(clazz, "getFrameworkName",
- "(Lmesos/SchedulerDriver;)Ljava/lang/String;");
+ "(Lorg/apache/mesos/SchedulerDriver;)Ljava/lang/String;");
env->ExceptionClear();
@@ -90,14 +90,14 @@ ExecutorInfo JNIScheduler::getExecutorIn
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// ExecutorInfo executor = sched.getExecutorInfo(driver);
jmethodID getExecutorInfo = env->GetMethodID(clazz, "getExecutorInfo",
- "(Lmesos/SchedulerDriver;)Lmesos/Protos$ExecutorInfo;");
+ "(Lorg/apache/mesos/SchedulerDriver;)Lorg/apache/mesos/Protos$ExecutorInfo;");
env->ExceptionClear();
@@ -125,14 +125,14 @@ void JNIScheduler::registered(SchedulerD
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.registered(driver, frameworkId);
jmethodID registered = env->GetMethodID(clazz, "registered",
- "(Lmesos/SchedulerDriver;Lmesos/Protos$FrameworkID;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$FrameworkID;)V");
jobject jframeworkId = convert<FrameworkID>(env, frameworkId);
@@ -160,14 +160,14 @@ void JNIScheduler::resourceOffer(Schedul
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.resourceOffer(driver, offerId, offers);
jmethodID resourceOffer = env->GetMethodID(clazz, "resourceOffer",
- "(Lmesos/SchedulerDriver;Lmesos/Protos$OfferID;Ljava/util/List;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$OfferID;Ljava/util/List;)V");
jobject jofferId = convert<OfferID>(env, offerId);
@@ -208,14 +208,14 @@ void JNIScheduler::offerRescinded(Schedu
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.offerRescinded(driver, offerId);
jmethodID offerRescinded = env->GetMethodID(clazz, "offerRescinded",
- "(Lmesos/SchedulerDriver;Lmesos/Protos$OfferID;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$OfferID;)V");
jobject jofferId = convert<OfferID>(env, offerId);
@@ -242,14 +242,14 @@ void JNIScheduler::statusUpdate(Schedule
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.statusUpdate(driver, status);
jmethodID statusUpdate = env->GetMethodID(clazz, "statusUpdate",
- "(Lmesos/SchedulerDriver;Lmesos/Protos$TaskStatus;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$TaskStatus;)V");
jobject jstatus = convert<TaskStatus>(env, status);
@@ -276,14 +276,14 @@ void JNIScheduler::frameworkMessage(Sche
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.frameworkMessage(driver, message);
jmethodID frameworkMessage = env->GetMethodID(clazz, "frameworkMessage",
- "(Lmesos/SchedulerDriver;Lmesos/Protos$FrameworkMessage;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$FrameworkMessage;)V");
jobject jmessage = convert<FrameworkMessage>(env, message);
@@ -309,14 +309,14 @@ void JNIScheduler::slaveLost(SchedulerDr
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.slaveLost(driver, slaveId);
jmethodID slaveLost = env->GetMethodID(clazz, "slaveLost",
- "(Lmesos/SchedulerDriver;Lmesos/Protos$SlaveID;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$SlaveID;)V");
jobject jslaveId = convert<SlaveID>(env, slaveId);
@@ -343,14 +343,14 @@ void JNIScheduler::error(SchedulerDriver
jclass clazz = env->GetObjectClass(jdriver);
- jfieldID sched = env->GetFieldID(clazz, "sched", "Lmesos/Scheduler;");
+ jfieldID sched = env->GetFieldID(clazz, "sched", "Lorg/apache/mesos/Scheduler;");
jobject jsched = env->GetObjectField(jdriver, sched);
clazz = env->GetObjectClass(jsched);
// sched.error(driver, code, message);
jmethodID error = env->GetMethodID(clazz, "error",
- "(Lmesos/SchedulerDriver;ILjava/lang/String;)V");
+ "(Lorg/apache/mesos/SchedulerDriver;ILjava/lang/String;)V");
jint jcode = code;
jobject jmessage = convert<string>(env, message);
@@ -376,11 +376,11 @@ extern "C" {
#endif
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: initialize
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_mesos_MesosSchedulerDriver_initialize
+JNIEXPORT void JNICALL Java_org_apache_mesos_MesosSchedulerDriver_initialize
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -399,7 +399,7 @@ JNIEXPORT void JNICALL Java_mesos_MesosS
jobject jurl = env->GetObjectField(thiz, url);
// Get out the framework id possibly passed into the constructor.
- jfieldID frameworkId = env->GetFieldID(clazz, "frameworkId", "Lmesos/Protos$FrameworkID;");
+ jfieldID frameworkId = env->GetFieldID(clazz, "frameworkId", "Lorg/apache/mesos/Protos$FrameworkID;");
jobject jframeworkId = env->GetObjectField(thiz, frameworkId);
// Create the C++ driver and initialize the __driver variable.
@@ -414,11 +414,11 @@ JNIEXPORT void JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: finalize
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_mesos_MesosSchedulerDriver_finalize
+JNIEXPORT void JNICALL Java_org_apache_mesos_MesosSchedulerDriver_finalize
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -444,11 +444,11 @@ JNIEXPORT void JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: start
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_start
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_start
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -462,11 +462,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: stop
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_stop
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_stop
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -480,11 +480,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: join
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_join
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_join
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -498,11 +498,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: sendFrameworkMessage
- * Signature: (Lmesos/Protos$FrameworkMessage;)I
+ * Signature: (Lorg/apache/mesos/Protos$FrameworkMessage;)I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_sendFrameworkMessage
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_sendFrameworkMessage
(JNIEnv* env, jobject thiz, jobject jmessage)
{
// Construct a C++ FrameworkMessage from the Java FrameworkMessage.
@@ -520,11 +520,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: killTask
- * Signature: (Lmesos/Protos$TaskID;)I
+ * Signature: (Lorg/apache/mesos/Protos$TaskID;)I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_killTask
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_killTask
(JNIEnv* env, jobject thiz, jobject jtaskId)
{
// Construct a C++ TaskID from the Java TaskId.
@@ -542,11 +542,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: replyToOffer
- * Signature: (Lmesos/Protos$OfferID;Ljava/util/Collection;Ljava/util/Map;)I
+ * Signature: (Lorg/apache/mesos/Protos$OfferID;Ljava/util/Collection;Ljava/util/Map;)I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_replyToOffer
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_replyToOffer
(JNIEnv* env, jobject thiz, jobject jofferId, jobject jtasks, jobject jparams)
{
// Construct a C++ OfferID from the Java OfferID.
@@ -592,11 +592,11 @@ JNIEXPORT jint JNICALL Java_mesos_MesosS
/*
- * Class: mesos_MesosSchedulerDriver
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: reviveOffers
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_mesos_MesosSchedulerDriver_reviveOffers
+JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers
(JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
Copied: incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java (from r1132273, incubator/mesos/trunk/src/java/src/mesos/Executor.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java?p2=incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java&p1=incubator/mesos/trunk/src/java/src/mesos/Executor.java&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/mesos/Executor.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java Sun Jun 5 09:17:47 2011
@@ -1,6 +1,6 @@
-package mesos;
+package org.apache.mesos;
-import mesos.Protos.*;
+import org.apache.mesos.Protos.*;
/**
Copied: incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java (from r1132273, incubator/mesos/trunk/src/java/src/mesos/ExecutorDriver.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java?p2=incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java&p1=incubator/mesos/trunk/src/java/src/mesos/ExecutorDriver.java&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/mesos/ExecutorDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java Sun Jun 5 09:17:47 2011
@@ -1,6 +1,6 @@
-package mesos;
+package org.apache.mesos;
-import mesos.Protos.*;
+import org.apache.mesos.Protos.*;
/**
Copied: incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java (from r1132273, incubator/mesos/trunk/src/java/src/mesos/MesosExecutorDriver.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java?p2=incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java&p1=incubator/mesos/trunk/src/java/src/mesos/MesosExecutorDriver.java&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/mesos/MesosExecutorDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java Sun Jun 5 09:17:47 2011
@@ -1,6 +1,6 @@
-package mesos;
+package org.apache.mesos;
-import mesos.Protos.*;
+import org.apache.mesos.Protos.*;
/**
Copied: incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java (from r1132273, incubator/mesos/trunk/src/java/src/mesos/MesosSchedulerDriver.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java?p2=incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java&p1=incubator/mesos/trunk/src/java/src/mesos/MesosSchedulerDriver.java&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/mesos/MesosSchedulerDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java Sun Jun 5 09:17:47 2011
@@ -1,6 +1,6 @@
-package mesos;
+package org.apache.mesos;
-import mesos.Protos.*;
+import org.apache.mesos.Protos.*;
import java.util.Collection;
import java.util.Collections;
Copied: incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java (from r1132273, incubator/mesos/trunk/src/java/src/mesos/Scheduler.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java?p2=incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java&p1=incubator/mesos/trunk/src/java/src/mesos/Scheduler.java&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/mesos/Scheduler.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java Sun Jun 5 09:17:47 2011
@@ -1,6 +1,6 @@
-package mesos;
+package org.apache.mesos;
-import mesos.Protos.*;
+import org.apache.mesos.Protos.*;
import java.util.List;
Copied: incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java (from r1132273, incubator/mesos/trunk/src/java/src/mesos/SchedulerDriver.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java?p2=incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java&p1=incubator/mesos/trunk/src/java/src/mesos/SchedulerDriver.java&r1=1132273&r2=1132274&rev=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/mesos/SchedulerDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java Sun Jun 5 09:17:47 2011
@@ -1,6 +1,6 @@
-package mesos;
+package org.apache.mesos;
-import mesos.Protos.*;
+import org.apache.mesos.Protos.*;
import java.util.Collection;
import java.util.Map;
Modified: incubator/mesos/trunk/src/master/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Sun Jun 5 09:17:47 2011
@@ -1666,7 +1666,8 @@ OfferID Master::makeOffer(Framework* fra
r.slave->resourcesOffered += r.resources;
}
- LOG(INFO) << "Sending " << offer << " to " << framework;
+ LOG(INFO) << "Sending offer " << offer->offerId
+ << " to framework " << framework->frameworkId;
MSG<M2F_RESOURCE_OFFER> out;
out.mutable_offer_id()->MergeFrom(offerId);
Modified: incubator/mesos/trunk/src/master/master.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.hpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.hpp (original)
+++ incubator/mesos/trunk/src/master/master.hpp Sun Jun 5 09:17:47 2011
@@ -456,6 +456,28 @@ struct Slave
};
+// Pretty-printing of SlotOffers, Tasks, Frameworks, Slaves, etc.
+
+inline std::ostream& operator << (std::ostream& stream, const SlotOffer *o)
+{
+ stream << "offer " << o->offerId;
+ return stream;
+}
+
+
+inline std::ostream& operator << (std::ostream& stream, const Slave *s)
+{
+ stream << "slave " << s->slaveId;
+ return stream;
+}
+
+
+inline std::ostream& operator << (std::ostream& stream, const Framework *f)
+{
+ stream << "framework " << f->frameworkId;
+ return stream;
+}
+
}}} // namespace mesos { namespace internal { namespace master {
#endif // __MASTER_HPP__
Modified: incubator/mesos/trunk/src/sched/sched.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/sched/sched.cpp?rev=1132274&r1=1132273&r2=1132274&view=diff
==============================================================================
--- incubator/mesos/trunk/src/sched/sched.cpp (original)
+++ incubator/mesos/trunk/src/sched/sched.cpp Sun Jun 5 09:17:47 2011
@@ -8,6 +8,8 @@
#include <arpa/inet.h>
+#include <google/protobuf/descriptor.h>
+
#include <iostream>
#include <map>
#include <string>
@@ -177,14 +179,15 @@ protected:
void noMasterDetected()
{
+ VLOG(1) << "No master detected, waiting for another master";
// In this case, we don't actually invoke Scheduler::error
// since we might get reconnected to a master imminently.
active = false;
- VLOG(1) << "No master detected, waiting for another master";
}
void masterDetectionFailure()
{
+ VLOG(1) << "Master detection failed";
active = false;
// TODO(benh): Better error codes/messages!
int32_t code = 1;
@@ -195,6 +198,7 @@ protected:
void registerReply(const FrameworkID& frameworkId)
{
+ VLOG(1) << "Framework registered with " << frameworkId;
this->frameworkId = frameworkId;
process::invoke(bind(&Scheduler::registered, sched, driver,
cref(frameworkId)));
@@ -204,6 +208,8 @@ protected:
const vector<SlaveOffer>& offers,
const vector<string>& pids)
{
+ VLOG(1) << "Received offer " << offerId;
+
// Save the pid associated with each slave (one per SlaveOffer) so
// later we can send framework messages directly.
CHECK(offers.size() == pids.size());
@@ -220,6 +226,7 @@ protected:
void rescindOffer(const OfferID& offerId)
{
+ VLOG(1) << "Rescinded offer " << offerId;
savedOffers.erase(offerId);
process::invoke(bind(&Scheduler::offerRescinded, sched, driver,
cref(offerId)));
@@ -227,6 +234,11 @@ protected:
void statusUpdate(const FrameworkID& frameworkId, const TaskStatus& status)
{
+ VLOG(1) << "Status update: task " << status.task_id()
+ << " of framework " << frameworkId
+ << " is now in state "
+ << TaskState_descriptor()->FindValueByNumber(status.state())->name();
+
CHECK(this->frameworkId == frameworkId);
// TODO(benh): Note that this maybe a duplicate status update!
@@ -254,19 +266,23 @@ protected:
void lostSlave(const SlaveID& slaveId)
{
+ VLOG(1) << "Lost slave " << slaveId;
savedSlavePids.erase(slaveId);
process::invoke(bind(&Scheduler::slaveLost, sched, driver, cref(slaveId)));
}
void frameworkMessage(const FrameworkMessage& message)
{
+ VLOG(1) << "Received message";
process::invoke(bind(&Scheduler::frameworkMessage, sched, driver,
cref(message)));
}
void error(int32_t code, const string& message)
{
- process::invoke(bind(&Scheduler::error, sched, driver, code, cref(message)));
+ VLOG(1) << "Got error '" << message << "' (code: " << code << ")";
+ process::invoke(bind(&Scheduler::error, sched, driver, code,
+ cref(message)));
}
void stop()