diff --git a/net.sf.py4j.defaultserver/.classpath b/net.sf.py4j.defaultserver/.classpath
new file mode 100644
index 00000000..ad32c83a
--- /dev/null
+++ b/net.sf.py4j.defaultserver/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/net.sf.py4j.defaultserver/.project b/net.sf.py4j.defaultserver/.project
new file mode 100644
index 00000000..94cb877a
--- /dev/null
+++ b/net.sf.py4j.defaultserver/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.sf.py4j.defaultserver</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/net.sf.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs b/net.sf.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..f70a20ac
--- /dev/null
+++ b/net.sf.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue Oct 12 17:52:09 EDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/net.sf.py4j.defaultserver/META-INF/MANIFEST.MF b/net.sf.py4j.defaultserver/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..97812c2b
--- /dev/null
+++ b/net.sf.py4j.defaultserver/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Py4J Default Server
+Bundle-SymbolicName: net.sf.py4j.defaultserver
+Bundle-Version: 0.5.0.qualifier
+Bundle-Activator: net.sf.py4j.defaultserver.DefaultServerActivator
+Bundle-Vendor: Py4J
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/net.sf.py4j.defaultserver/build.properties b/net.sf.py4j.defaultserver/build.properties
new file mode 100644
index 00000000..34d2e4d2
--- /dev/null
+++ b/net.sf.py4j.defaultserver/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java b/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java
new file mode 100644
index 00000000..4a0981cc
--- /dev/null
+++ b/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java
@@ -0,0 +1,30 @@
+package net.sf.py4j.defaultserver;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class DefaultServerActivator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		DefaultServerActivator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		DefaultServerActivator.context = null;
+	}
+
+}