diff --git a/net.sf.py4j.defaultserver.feature/feature.xml b/net.sf.py4j.defaultserver.feature/feature.xml
index ec7a087e..1c5a9f45 100644
--- a/net.sf.py4j.defaultserver.feature/feature.xml
+++ b/net.sf.py4j.defaultserver.feature/feature.xml
@@ -1,7 +1,7 @@
@@ -18,7 +18,7 @@ standard Python collection methods.
- Copyright (c) 2009, Barthelemy Dagenais All rights reserved.
+ Copyright (c) 2009-2010, Barthelemy Dagenais All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -61,6 +61,10 @@ POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+
+
+
+
+
+
+
+
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
index 4a0981cc..cf5c9265 100644
--- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java
+++ b/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java
@@ -3,28 +3,54 @@
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import py4j.GatewayServer;
+
public class DefaultServerActivator implements BundleActivator {
private static BundleContext context;
+ private static DefaultServerActivator activator;
+
+ private GatewayServer server;
+
static BundleContext getContext() {
return context;
}
/*
* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ *
+ * @see
+ * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
+ * )
*/
public void start(BundleContext bundleContext) throws Exception {
DefaultServerActivator.context = bundleContext;
+ activator = this;
+ server = new GatewayServer(this);
+ server.start();
}
/*
* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ *
+ * @see
+ * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext bundleContext) throws Exception {
- DefaultServerActivator.context = null;
+ if (server != null) {
+ server.shutdown();
+ }
+ context = null;
+ activator = null;
+ }
+
+ public GatewayServer getServer() {
+ return server;
+ }
+
+ public static DefaultServerActivator getDefault() {
+ return activator;
}
}
diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java b/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java
new file mode 100644
index 00000000..f292c6d6
--- /dev/null
+++ b/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java
@@ -0,0 +1,13 @@
+package net.sf.py4j.defaultserver;
+
+import org.eclipse.ui.IStartup;
+
+
+public class DefaultServerStartup implements IStartup {
+
+ @Override
+ public void earlyStartup() {
+ // Do nothing for now
+ }
+
+}
diff --git a/net.sf.py4j.feature/feature.xml b/net.sf.py4j.feature/feature.xml
index 88a6d303..48efb3b3 100644
--- a/net.sf.py4j.feature/feature.xml
+++ b/net.sf.py4j.feature/feature.xml
@@ -14,7 +14,7 @@
- Copyright (c) 2009, Barthelemy Dagenais All rights reserved.
+ Copyright (c) 2009-2010, Barthelemy Dagenais All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -52,6 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
id="net.sf.py4j"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
diff --git a/net.sf.py4j.site/artifacts.jar b/net.sf.py4j.site/artifacts.jar
index bade60a7..24571027 100644
Binary files a/net.sf.py4j.site/artifacts.jar and b/net.sf.py4j.site/artifacts.jar differ
diff --git a/net.sf.py4j.site/content.jar b/net.sf.py4j.site/content.jar
index 31cdfb92..f9099c4e 100644
Binary files a/net.sf.py4j.site/content.jar and b/net.sf.py4j.site/content.jar differ
diff --git a/net.sf.py4j.site/site.xml b/net.sf.py4j.site/site.xml
index 826e3951..5f9afd86 100644
--- a/net.sf.py4j.site/site.xml
+++ b/net.sf.py4j.site/site.xml
@@ -1,12 +1,12 @@
-
+
Main update site for Py4J
-
+
-
+