From bea87fc352883c562a387642e1e07c841d219fe4 Mon Sep 17 00:00:00 2001 From: Baha El Kassaby Date: Sat, 17 Mar 2018 13:54:09 +0100 Subject: [PATCH] Update defaultserver to new py4j namespace *change net.sf.py4j.* to org.py4j.* *change dependency of defaultserver bundle from net.sf.py4j to org.py4j --- net.sf.py4j.defaultserver/META-INF/MANIFEST.MF | 14 -------------- net.sf.py4j/py4j | 1 - .../.project | 2 +- .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.jboss.ide.eclipse.as.core.prefs | 2 ++ .../build.properties | 0 .../feature.xml | 8 ++++---- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.jboss.ide.eclipse.as.core.prefs | 2 ++ org.py4j.defaultserver/META-INF/MANIFEST.MF | 14 ++++++++++++++ .../build.properties | 0 .../plugin.xml | 10 +++++----- .../py4j/defaultserver/DefaultServerActivator.java | 5 ++--- .../py4j/defaultserver/DefaultServerStartup.java | 2 +- .../py4j/defaultserver/HeadlessApplication.java | 14 +++++++------- .../src/org}/py4j/defaultserver/SWTCommand.java | 4 ++-- .../py4j/defaultserver/SWTGatewayConnection.java | 4 ++-- .../org}/py4j/defaultserver/SWTGatewayServer.java | 2 +- .../preferences/DefaultServerPreferencePage.java | 7 +++---- .../preferences/LabelFieldEditor.java | 2 +- .../preferences/PreferenceConstants.java | 2 +- .../preferences/PreferenceInitializer.java | 5 ++--- 26 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 net.sf.py4j.defaultserver/META-INF/MANIFEST.MF delete mode 160000 net.sf.py4j/py4j rename {net.sf.py4j.defaultserver.feature => org.py4j.defaultserver.feature}/.project (87%) rename {net.sf.py4j.defaultserver.feature => org.py4j.defaultserver.feature}/.settings/org.eclipse.core.resources.prefs (100%) create mode 100644 org.py4j.defaultserver.feature/.settings/org.jboss.ide.eclipse.as.core.prefs rename {net.sf.py4j.defaultserver.feature => org.py4j.defaultserver.feature}/build.properties (100%) rename {net.sf.py4j.defaultserver.feature => org.py4j.defaultserver.feature}/feature.xml (93%) rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/.classpath (100%) rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/.gitignore (100%) rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/.project (93%) rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/.settings/org.eclipse.core.resources.prefs (100%) rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/.settings/org.eclipse.jdt.core.prefs (100%) create mode 100644 org.py4j.defaultserver/.settings/org.jboss.ide.eclipse.as.core.prefs create mode 100644 org.py4j.defaultserver/META-INF/MANIFEST.MF rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/build.properties (100%) rename {net.sf.py4j.defaultserver => org.py4j.defaultserver}/plugin.xml (67%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/DefaultServerActivator.java (96%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/DefaultServerStartup.java (82%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/HeadlessApplication.java (81%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/SWTCommand.java (97%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/SWTGatewayConnection.java (96%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/SWTGatewayServer.java (97%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/preferences/DefaultServerPreferencePage.java (96%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/preferences/LabelFieldEditor.java (93%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/preferences/PreferenceConstants.java (89%) rename {net.sf.py4j.defaultserver/src/net/sf => org.py4j.defaultserver/src/org}/py4j/defaultserver/preferences/PreferenceInitializer.java (90%) diff --git a/net.sf.py4j.defaultserver/META-INF/MANIFEST.MF b/net.sf.py4j.defaultserver/META-INF/MANIFEST.MF deleted file mode 100644 index bfb3987..0000000 --- a/net.sf.py4j.defaultserver/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Py4J Default Server -Bundle-SymbolicName: net.sf.py4j.defaultserver;singleton:=true -Bundle-Version: 0.9.0.qualifier -Bundle-Activator: net.sf.py4j.defaultserver.DefaultServerActivator -Bundle-Vendor: Py4J -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - net.sf.py4j;bundle-version="0.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Export-Package: net.sf.py4j.defaultserver, - net.sf.py4j.defaultserver.preferences diff --git a/net.sf.py4j/py4j b/net.sf.py4j/py4j deleted file mode 160000 index 8be614c..0000000 --- a/net.sf.py4j/py4j +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8be614c14ffdb41a14d6f9aa525910a122c6f7b6 diff --git a/net.sf.py4j.defaultserver.feature/.project b/org.py4j.defaultserver.feature/.project similarity index 87% rename from net.sf.py4j.defaultserver.feature/.project rename to org.py4j.defaultserver.feature/.project index 976ec6c..ebf4b60 100644 --- a/net.sf.py4j.defaultserver.feature/.project +++ b/org.py4j.defaultserver.feature/.project @@ -1,6 +1,6 @@ - net.sf.py4j.defaultserver.feature + org.py4j.defaultserver.feature diff --git a/net.sf.py4j.defaultserver.feature/.settings/org.eclipse.core.resources.prefs b/org.py4j.defaultserver.feature/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from net.sf.py4j.defaultserver.feature/.settings/org.eclipse.core.resources.prefs rename to org.py4j.defaultserver.feature/.settings/org.eclipse.core.resources.prefs diff --git a/org.py4j.defaultserver.feature/.settings/org.jboss.ide.eclipse.as.core.prefs b/org.py4j.defaultserver.feature/.settings/org.jboss.ide.eclipse.as.core.prefs new file mode 100644 index 0000000..cf3aa3a --- /dev/null +++ b/org.py4j.defaultserver.feature/.settings/org.jboss.ide.eclipse.as.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.jboss.ide.eclipse.as.core.singledeployable.deployableList= diff --git a/net.sf.py4j.defaultserver.feature/build.properties b/org.py4j.defaultserver.feature/build.properties similarity index 100% rename from net.sf.py4j.defaultserver.feature/build.properties rename to org.py4j.defaultserver.feature/build.properties diff --git a/net.sf.py4j.defaultserver.feature/feature.xml b/org.py4j.defaultserver.feature/feature.xml similarity index 93% rename from net.sf.py4j.defaultserver.feature/feature.xml rename to org.py4j.defaultserver.feature/feature.xml index 74c1c5a..64b5f1e 100644 --- a/net.sf.py4j.defaultserver.feature/feature.xml +++ b/org.py4j.defaultserver.feature/feature.xml @@ -1,8 +1,8 @@ @@ -55,11 +55,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + - net.sf.py4j.defaultserver + org.py4j.defaultserver diff --git a/net.sf.py4j.defaultserver/.settings/org.eclipse.core.resources.prefs b/org.py4j.defaultserver/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from net.sf.py4j.defaultserver/.settings/org.eclipse.core.resources.prefs rename to org.py4j.defaultserver/.settings/org.eclipse.core.resources.prefs diff --git a/net.sf.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs b/org.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from net.sf.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs rename to org.py4j.defaultserver/.settings/org.eclipse.jdt.core.prefs diff --git a/org.py4j.defaultserver/.settings/org.jboss.ide.eclipse.as.core.prefs b/org.py4j.defaultserver/.settings/org.jboss.ide.eclipse.as.core.prefs new file mode 100644 index 0000000..cf3aa3a --- /dev/null +++ b/org.py4j.defaultserver/.settings/org.jboss.ide.eclipse.as.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.jboss.ide.eclipse.as.core.singledeployable.deployableList= diff --git a/org.py4j.defaultserver/META-INF/MANIFEST.MF b/org.py4j.defaultserver/META-INF/MANIFEST.MF new file mode 100644 index 0000000..7c32525 --- /dev/null +++ b/org.py4j.defaultserver/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Py4J Default Server +Bundle-SymbolicName: org.py4j.defaultserver;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.py4j.defaultserver.DefaultServerActivator +Bundle-Vendor: Py4J +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.ui, + py4j-java +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy +Export-Package: org.py4j.defaultserver, + org.py4j.defaultserver.preferences diff --git a/net.sf.py4j.defaultserver/build.properties b/org.py4j.defaultserver/build.properties similarity index 100% rename from net.sf.py4j.defaultserver/build.properties rename to org.py4j.defaultserver/build.properties diff --git a/net.sf.py4j.defaultserver/plugin.xml b/org.py4j.defaultserver/plugin.xml similarity index 67% rename from net.sf.py4j.defaultserver/plugin.xml rename to org.py4j.defaultserver/plugin.xml index a5d2a94..4140d6c 100644 --- a/net.sf.py4j.defaultserver/plugin.xml +++ b/org.py4j.defaultserver/plugin.xml @@ -4,21 +4,21 @@ + class="org.py4j.defaultserver.DefaultServerStartup"> + class="org.py4j.defaultserver.preferences.PreferenceInitializer"> + class="org.py4j.defaultserver.HeadlessApplication"> diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/DefaultServerActivator.java similarity index 96% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/DefaultServerActivator.java index fa1cacf..848d67b 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerActivator.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/DefaultServerActivator.java @@ -1,15 +1,14 @@ -package net.sf.py4j.defaultserver; +package org.py4j.defaultserver; import java.io.IOException; import java.net.DatagramSocket; import java.net.ServerSocket; -import net.sf.py4j.defaultserver.preferences.PreferenceConstants; - import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.py4j.defaultserver.preferences.PreferenceConstants; import py4j.GatewayServer; diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/DefaultServerStartup.java similarity index 82% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/DefaultServerStartup.java index f292c6d..a5f6be5 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/DefaultServerStartup.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/DefaultServerStartup.java @@ -1,4 +1,4 @@ -package net.sf.py4j.defaultserver; +package org.py4j.defaultserver; import org.eclipse.ui.IStartup; diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/HeadlessApplication.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/HeadlessApplication.java similarity index 81% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/HeadlessApplication.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/HeadlessApplication.java index 5508e3f..ccf233c 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/HeadlessApplication.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/HeadlessApplication.java @@ -1,13 +1,13 @@ -package net.sf.py4j.defaultserver; +package org.py4j.defaultserver; import java.util.concurrent.CountDownLatch; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; -import py4j.GatewayConnection; import py4j.GatewayServer; import py4j.GatewayServerListener; +import py4j.Py4JServerConnection; public class HeadlessApplication implements IApplication, GatewayServerListener { @@ -60,20 +60,20 @@ public void serverPostShutdown() { } @Override - public void connectionStarted(GatewayConnection gatewayConnection) { + public void connectionError(Exception e) { } @Override - public void connectionStopped(GatewayConnection gatewayConnection) { + public void connectionStarted(Py4JServerConnection gatewayConnection) { + // TODO Auto-generated method stub } @Override - public void connectionError(Exception e) { + public void connectionStopped(Py4JServerConnection gatewayConnection) { + // TODO Auto-generated method stub } - - } diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTCommand.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/SWTCommand.java similarity index 97% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTCommand.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/SWTCommand.java index 79edfac..2cb1467 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTCommand.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/SWTCommand.java @@ -1,4 +1,4 @@ -package net.sf.py4j.defaultserver; +package org.py4j.defaultserver; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -70,7 +70,7 @@ public void execute(final String commandName, final BufferedReader reader, // We wait for 5s by default for the method to get to the top of the // stack and return. final int waitTime = Integer.getInteger( - "net.sf.py4j.defaultserver.waitTime", 5000); + "org.py4j.defaultserver.waitTime", 5000); while (runner.isActive()) { try { Thread.sleep(100); diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTGatewayConnection.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/SWTGatewayConnection.java similarity index 96% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTGatewayConnection.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/SWTGatewayConnection.java index 8604760..6a55395 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTGatewayConnection.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/SWTGatewayConnection.java @@ -1,4 +1,4 @@ -package net.sf.py4j.defaultserver; +package org.py4j.defaultserver; import java.io.IOException; import java.net.Socket; @@ -57,7 +57,7 @@ public void run() { logger.log(Level.WARNING, "Error occurred while waiting for a command.", e); if (executing && writer != null) { - quietSendError(writer, e); + quietSendFatalError(writer, e); } } finally { NetworkUtil.quietlyClose(socket); diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTGatewayServer.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/SWTGatewayServer.java similarity index 97% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTGatewayServer.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/SWTGatewayServer.java index a6f752c..e52917d 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/SWTGatewayServer.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/SWTGatewayServer.java @@ -1,4 +1,4 @@ -package net.sf.py4j.defaultserver; +package org.py4j.defaultserver; import java.io.IOException; import java.net.Socket; diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/DefaultServerPreferencePage.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/DefaultServerPreferencePage.java similarity index 96% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/DefaultServerPreferencePage.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/DefaultServerPreferencePage.java index 2499487..a06c059 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/DefaultServerPreferencePage.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/DefaultServerPreferencePage.java @@ -1,6 +1,4 @@ -package net.sf.py4j.defaultserver.preferences; - -import net.sf.py4j.defaultserver.DefaultServerActivator; +package org.py4j.defaultserver.preferences; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.runtime.IStatus; @@ -21,6 +19,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; +import org.py4j.defaultserver.DefaultServerActivator; /** * This class represents a preference page that is contributed to the @@ -105,7 +104,7 @@ public void widgetSelected(SelectionEvent e) { .executeWithChecks(new ExecutionEvent()); } catch (Throwable t) { Status status = new Status(IStatus.ERROR, - "net.sf.py4j.defaultserver", "Unable to restart", t); + "org.py4j.defaultserver", "Unable to restart", t); ErrorDialog.openError( Display.getDefault().getActiveShell(), "Unable to restart", diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/LabelFieldEditor.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/LabelFieldEditor.java similarity index 93% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/LabelFieldEditor.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/LabelFieldEditor.java index e1dd7f2..4fe68cb 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/LabelFieldEditor.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/LabelFieldEditor.java @@ -1,4 +1,4 @@ -package net.sf.py4j.defaultserver.preferences; +package org.py4j.defaultserver.preferences; import org.eclipse.jface.preference.FieldEditor; import org.eclipse.swt.layout.GridData; diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/PreferenceConstants.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/PreferenceConstants.java similarity index 89% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/PreferenceConstants.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/PreferenceConstants.java index c515926..7a77520 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/PreferenceConstants.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/PreferenceConstants.java @@ -1,4 +1,4 @@ -package net.sf.py4j.defaultserver.preferences; +package org.py4j.defaultserver.preferences; /** * Constant definitions for plug-in preferences diff --git a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/PreferenceInitializer.java b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/PreferenceInitializer.java similarity index 90% rename from net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/PreferenceInitializer.java rename to org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/PreferenceInitializer.java index f712b1d..536b3f7 100644 --- a/net.sf.py4j.defaultserver/src/net/sf/py4j/defaultserver/preferences/PreferenceInitializer.java +++ b/org.py4j.defaultserver/src/org/py4j/defaultserver/preferences/PreferenceInitializer.java @@ -1,12 +1,11 @@ -package net.sf.py4j.defaultserver.preferences; +package org.py4j.defaultserver.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; +import org.py4j.defaultserver.DefaultServerActivator; import py4j.GatewayServer; -import net.sf.py4j.defaultserver.DefaultServerActivator; - /** * Class used to initialize default preference values. */