From 12c846b00227d016be96e293ce7a4726220b7ccb Mon Sep 17 00:00:00 2001 From: Barthelemy Dagenais Date: Wed, 20 Oct 2010 12:19:02 +0000 Subject: [PATCH] Initial work on py4j update site. --- net.sf.py4j.defaultserver.feature/feature.xml | 8 +++-- .../META-INF/MANIFEST.MF | 7 ++-- net.sf.py4j.defaultserver/build.properties | 4 ++- net.sf.py4j.defaultserver/plugin.xml | 11 ++++++ .../defaultserver/DefaultServerActivator.java | 32 ++++++++++++++++-- .../defaultserver/DefaultServerStartup.java | 13 +++++++ net.sf.py4j.feature/feature.xml | 5 +-- net.sf.py4j.site/artifacts.jar | Bin 614 -> 613 bytes net.sf.py4j.site/content.jar | Bin 2159 -> 2192 bytes net.sf.py4j.site/site.xml | 6 ++-- 10 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 net.sf.py4j.defaultserver/plugin.xml create mode 100644 net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java 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 bade60a7dfb31087e65263054be533ed8155d1ae..24571027a812c10cb0ce6ec9982a5ab4166d31a1 100644 GIT binary patch delta 544 zcmaFH@|1-)z?+#xgnbo>` zgPixo-}wn!oY%iCJCRj!*7){fuaF5B*WZ4b{>gQLQg$#0{}bz~1xNCI8MfXvIH4-V zUe8l^WyKd|W6tcQ5%YU3*Yvc+&EdQ9vdG0FYmJ$}j0YWumrt;@JW{6&4J3m znG@VjSg|}#F`R!^ea?BY&78gGjEZ9=xz9OX4BWf+;mnC{wSw){sy&=;+eCeDb>-+b zPSLQv(G$0qyR}9oe5c5{#7@O!ciC>%uI1vqetk;)i(9jArI+l$GOkei@a)Oqhu7L~ZWd};|90oJz86d9U0PB4 zr661UY04vA2ez*l8dpw9m>9@9Z|9_$Z@(mN@SAg1BAv7Uu&2fR<9}v+z0|jNo9&(_q z3;yK(;M)~ra5kZ=Wmwz%NF3x&XJin;owC^1_oJH g28IA{MkWykcvRaW%keU>FhId%3nmRV0VWU+08V4|9RL6T delta 544 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 PCX+S@GX^~f00000N-!d? delta 2104 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 i6aWYS2mo;`E - + Main update site for Py4J - + - +