[jbosstools-commits] JBoss Tools SVN: r28246 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.

Friday, 14 January 2011


Author: rob.stryker(a)jboss.com
Date: 2011-01-14 13:09:23 -0500 (Fri, 14 Jan 2011)
New Revision: 28246

Added:
  
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java
  
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties
Modified:
  
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
  
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
  
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java
Log:
JBIDE-7753 rse stop failing - commit to trunk

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java	2011-01-14
17:12:33 UTC (rev 28245)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java	2011-01-14
18:09:23 UTC (rev 28246)
@@ -141,18 +141,25 @@
 	}
 	
 	public static void launchStopServerCommand(JBossServerBehavior behaviour) {
-		behaviour.setServerStopping();
-		
 		ILaunchConfiguration config = null;
 		String command2 = "";
 		try {
 			config = behaviour.getServer().getLaunchConfiguration(false, new
NullProgressMonitor());
+			String rseHome = behaviour.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR,
(String)null);
+			if( rseHome == null ) {
+				RSECorePlugin.getDefault().getLog().log(
+						new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, 
+								"Remote Server Home not set."));
+				return;
+			}
 			String defaultCmd = getDefaultStopCommand(behaviour.getServer());
 			command2 = config == null ? defaultCmd :
 				config.getAttribute(RSE_SHUTDOWN_COMMAND, defaultCmd);
 		} catch(CoreException ce) {
 		}
 		
+		behaviour.setServerStopping();
+		
 		final String command = command2;
 		IShellService service = null;
 		try {
@@ -185,6 +192,7 @@
 						 * when the command line comes back, there's an extra space
 						 * "shutdown .sh"
 						 */
+						System.out.println(out[i]);
 						String outNoSpace = out[i].getString().replaceAll(" ", "");
 						String commandNoSpace = command.replaceAll(" ", "");
 						boolean contains = outNoSpace.contains(commandNoSpace);
@@ -261,6 +269,7 @@
 	
 	public static String getDefaultStopCommand(IServer server) {
 		String rseHome = server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+		
 		JBossServer jbs = ServerConverter.getJBossServer(server);
 		// initialize stop command to something reasonable
 		String username = jbs.getUsername();

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java	2011-01-14
17:12:33 UTC (rev 28245)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java	2011-01-14
18:09:23 UTC (rev 28246)
@@ -24,6 +24,7 @@
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.events.ISystemModelChangeEvent;
 import org.eclipse.rse.core.events.ISystemModelChangeListener;
@@ -148,9 +149,7 @@
 			rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5,
 					null, 0, serverHomeLabel, 5, rseBrowse, -5));
 			rseServerHome.setText(callback.getServer().getAttribute(
-					RSEUtils.RSE_SERVER_HOME_DIR,
-					getRuntime() == null ? "" : getRuntime().getRuntime()
-							.getLocation().toString()));
+					RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME));
 			rseServerHome.addModifyListener(new ModifyListener() {
 				public void modifyText(ModifyEvent e) {
 					serverHomeChanged();
@@ -158,7 +157,7 @@
 			});
 
 			Label serverConfigLabel = new Label(this, SWT.NONE);
-			serverConfigLabel.setText("Remote Server Configuration: ");
+			serverConfigLabel.setText(RSEUIMessages.REMOTE_SERVER_CONFIG);
 			rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER);
 			serverConfigLabel.setLayoutData(UIUtil.createFormData2(
 					rseServerHome, 7, null, 0, 0, 10, null, 0));
@@ -174,7 +173,7 @@
 			callback.getServer().addPropertyChangeListener(this);
 
 			rseTest = new Button(this, SWT.NONE);
-			rseTest.setText("Test...");
+			rseTest.setText(RSEUIMessages.TEST);
 			rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5,
 					null, 0, null, 0, 100, -5));
 			rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome,
@@ -277,30 +276,30 @@
 				   s[0] = new Status(IStatus.ERROR,
org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, e.getMessage(), e);
 			   }
 			   rseTest.setEnabled(true);
-			   showMessageDialog("Test of Remote System", s[0]);
+			   showMessageDialog(RSEUIMessages.REMOTE_SERVER_TEST, s[0]);
 		}
 		
 		private void showMessageDialog(String title, IStatus s) {
 			if( s.isOK() ) 
 				s = new Status(IStatus.INFO,
org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, 
-						"The remote server is properly configured.");
+						RSEUIMessages.REMOTE_SERVER_TEST_SUCCESS);
 			ErrorDialog d = new ErrorDialog(rseServerHome.getShell(), title, null, s, IStatus.INFO
| IStatus.ERROR);
 			d.open();
 		}
 		
 		private IStatus testPressed(String home, String config, IProgressMonitor pm) {
-			pm.beginTask("Validating Remote Configuration", 1200);
+			pm.beginTask(RSEUIMessages.VALIDATING_REMOTE_CONFIG, 1200);
 			IHost host = combo.getHost();
 			if( host == null ) {
 				pm.done(); 
-				return getTestFailStatus("Host is empty!");
+				return getTestFailStatus(RSEUIMessages.EMPTY_HOST);
 			}
 			pm.worked(100);
 			
 			IFileServiceSubSystem fileSubSystem =
RSEPublishMethod.findFileTransferSubSystem(host);
 			if( fileSubSystem == null ) {
 				pm.done(); 
-				return getTestFailStatus("No File Sub System found on " + host.getName());
+				return getTestFailStatus(NLS.bind(RSEUIMessages.FILE_SUBSYSTEM_NOT_FOUND,
host.getName()));
 			}
 			pm.worked(100);
 
@@ -309,7 +308,7 @@
 			    	fileSubSystem.connect(new NullProgressMonitor(), false);
 			    } catch (Exception e) {
 			    	pm.done(); 
-			    	return getTestFailStatus("Error when connecting to file system: " +
e.getLocalizedMessage()); 
+			    	return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_FILESYSTEM_CONNECT_FAILED,
e.getLocalizedMessage())); 
 			    }
 			}
 			pm.worked(300);
@@ -317,7 +316,7 @@
 			IFileService service = fileSubSystem.getFileService();
 			if( service == null ) {
 				pm.done(); 
-				return getTestFailStatus("No File Service for " + host.getName());
+				return getTestFailStatus(NLS.bind(RSEUIMessages.FILESERVICE_NOT_FOUND,
host.getName()));
 			}
 			pm.worked(100);
 			
@@ -327,7 +326,9 @@
 				IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(),
root2.lastSegment(), new NullProgressMonitor());
 				if( file == null || !file.exists()) {
 					pm.done(); 
-					return getTestFailStatus("Server's Home folder " + root2 + " not
found on " + service.getName() + " for " + host.getName());
+					return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_HOME_NOT_FOUND, 
+							new Object[]{root2, service.getName(), host.getName()}));
+					
 				}
 				pm.worked(300);
 				
@@ -335,12 +336,12 @@
 				file = service.getFile(root2.removeLastSegments(1).toPortableString(),
root2.lastSegment(), new NullProgressMonitor());
 				if( file == null || !file.exists()) {
 					pm.done(); 
-					return getTestFailStatus("Server's config folder " + root2 + "
does not exist");
+					return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_CONFIG_NOT_FOUND, root2));
 				}
 				pm.worked(300);
 			} catch(SystemMessageException sme) {
 				pm.done();
-				return getTestFailStatus("Error while checking remote folders: " +
sme.getLocalizedMessage());
+				return getTestFailStatus(RSEUIMessages.ERROR_CHECKING_REMOTE_SYSTEM +
sme.getLocalizedMessage());
 			}
 			pm.done(); 
 			return Status.OK_STATUS;
@@ -403,7 +404,7 @@
 
 		protected String browseClicked3() {
 			SystemRemoteFileDialog d = new SystemRemoteFileDialog(
-					rseBrowse.getShell(), "Browse remote system", combo.getHost());
+					rseBrowse.getShell(), RSEUIMessages.BROWSE_REMOTE_SYSTEM, combo.getHost());
 			if( d.open() == Dialog.OK) {
 				Object o = d.getOutputObject();
 				if( o instanceof IRemoteFile ) {
@@ -427,10 +428,10 @@
 				if( !hostName.equals(oldVal) && !updatingFromModelChange) {
 					callback.execute(new ChangeServerPropertyCommand(
 							callback.getServer(), RSEUtils.RSE_SERVER_HOST, hostName, "localhost", 
-							"Change RSE Host"));
+							RSEUIMessages.CHANGE_RSE_HOST));
 					callback.execute(new ChangeServerPropertyCommand(
 							callback.getServer(), "hostname", combo.getHost().getHostName(), 
-							"Change Hostname"));
+							RSEUIMessages.CHANGE_HOSTNAME));
 				}
 			}
 		}
@@ -440,7 +441,7 @@
 				callback.execute(new ChangeServerPropertyCommand(
 						callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(), 
 						getRuntime() == null ? "" :
getRuntime().getRuntime().getLocation().toString(),
-						"Change RSE Server's Home Directory"));
+						RSEUIMessages.CHANGE_REMOTE_SERVER_HOME));
 			}
 		}
 
@@ -449,7 +450,7 @@
 				callback.execute(new ChangeServerPropertyCommand(
 						callback.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseServerConfig.getText(), 
 						getRuntime() == null ? "" : getRuntime().getJBossConfiguration(),
-						"Change RSE Server's Configuration"));
+								RSEUIMessages.CHANGE_REMOTE_SERVER_CONFIG));
 			}
 		}
 

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java	2011-01-14
17:12:33 UTC (rev 28245)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java	2011-01-14
18:09:23 UTC (rev 28246)
@@ -56,13 +56,13 @@
 			setControl(comp);
 			comp.setLayout(new FormLayout());
 			Group startGroup = new Group(comp, SWT.NONE);
-			startGroup.setText("Start Command");
+			startGroup.setText(RSEUIMessages.RSE_START_COMMAND);
 			FormData data = UIUtil.createFormData2(0, 5, 0, 150, 0, 5, 100, -5);
 			startGroup.setLayoutData(data);
 			startGroup.setLayout(new FormLayout());
 			
 			autoStartArgs = new Button(startGroup, SWT.CHECK);
-			autoStartArgs.setText("Automatically calculate");
+			autoStartArgs.setText(RSEUIMessages.RSE_AUTOMATICALLY_CALCULATE);
 			data = UIUtil.createFormData2(null, 0, 100, -5, 0, 5, 100, -5);
 			autoStartArgs.setLayoutData(data);
 
@@ -72,13 +72,13 @@
 			
 			// start stop group
 			Group stopGroup = new Group(comp, SWT.NONE);
-			stopGroup.setText("Stop Command");
+			stopGroup.setText(RSEUIMessages.RSE_STOP_COMMAND);
 			data = UIUtil.createFormData2(startGroup, 5, startGroup, 300, 0, 5, 100, -5);
 			stopGroup.setLayoutData(data);
 			stopGroup.setLayout(new FormLayout());
 			
 			autoStopArgs = new Button(stopGroup, SWT.CHECK);
-			autoStopArgs.setText("Automatically calculate");
+			autoStopArgs.setText(RSEUIMessages.RSE_AUTOMATICALLY_CALCULATE);
 			data = UIUtil.createFormData2(null, 0, 100, -5, 0, 5, 100, -5);
 			autoStopArgs.setLayoutData(data);
 
@@ -146,7 +146,7 @@
 			configuration.setAttribute(RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND,
autoStopArgs.getSelection());
 		}
 		public String getName() {
-			return "RSE Remote Launch";
+			return RSEUIMessages.RSE_REMOTE_LAUNCH;
 		}
 		
 	}

Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java	
                       (rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java	2011-01-14
18:09:23 UTC (rev 28246)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.rse.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class RSEUIMessages {
+	private static final String BUNDLE_NAME =
"org.jboss.ide.eclipse.as.rse.ui.RSEUIMessages"; //$NON-NLS-1$
+	public static String UNSET_REMOTE_SERVER_HOME;
+	public static String REMOTE_SERVER_CONFIG;
+	public static String TEST;
+	public static String REMOTE_SERVER_TEST;
+	public static String REMOTE_SERVER_TEST_SUCCESS;
+	public static String VALIDATING_REMOTE_CONFIG;
+	public static String EMPTY_HOST;
+	public static String FILE_SUBSYSTEM_NOT_FOUND;
+	public static String REMOTE_FILESYSTEM_CONNECT_FAILED;
+	public static String FILESERVICE_NOT_FOUND;
+	public static String REMOTE_HOME_NOT_FOUND;
+	public static String REMOTE_CONFIG_NOT_FOUND;
+	public static String ERROR_CHECKING_REMOTE_SYSTEM;
+	public static String BROWSE_REMOTE_SYSTEM;
+	public static String CHANGE_RSE_HOST;
+	public static String CHANGE_HOSTNAME;
+	public static String CHANGE_REMOTE_SERVER_HOME;
+	public static String CHANGE_REMOTE_SERVER_CONFIG;
+	public static String RSE_REMOTE_LAUNCH;
+	public static String RSE_START_COMMAND;
+	public static String RSE_STOP_COMMAND;
+	public static String RSE_AUTOMATICALLY_CALCULATE;
+	
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, RSEUIMessages.class);
+	}
+	private RSEUIMessages() {
+	}
+
+}

Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties	
                       (rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties	2011-01-14
18:09:23 UTC (rev 28246)
@@ -0,0 +1,22 @@
+UNSET_REMOTE_SERVER_HOME=REMOTE SERVER HOME
+REMOTE_SERVER_CONFIG=Remote Server Configuration\: 
+TEST=Test...
+REMOTE_SERVER_TEST=Test of Remote System
+REMOTE_SERVER_TEST_SUCCESS=The remote server is properly configured.TEST;
+VALIDATING_REMOTE_CONFIG=Validating Remote Configuration
+EMPTY_HOST=Host is empty!
+FILE_SUBSYSTEM_NOT_FOUND=No File Sub System found on RSE system {0}
+REMOTE_FILESYSTEM_CONNECT_FAILED=Error when connecting to file system: {0}
+FILESERVICE_NOT_FOUND=No File Service for {0}
+REMOTE_HOME_NOT_FOUND=Server's Home folder {0} not found on {1} for {2}
+REMOTE_CONFIG_NOT_FOUND=Server's config folder {0} does not exist
+ERROR_CHECKING_REMOTE_SYSTEM=Error while checking remote system\: 
+BROWSE_REMOTE_SYSTEM=Browse remote system
+CHANGE_RSE_HOST=Change RSE Host
+CHANGE_HOSTNAME=Change Hostname
+CHANGE_REMOTE_SERVER_HOME=Change RSE Server's Home Directory
+CHANGE_REMOTE_SERVER_CONFIG=Change RSE Server's Configuration
+RSE_REMOTE_LAUNCH=RSE Remote Launch
+RSE_START_COMMAND=Start Command
+RSE_STOP_COMMAND=Stop Command
+RSE_AUTOMATICALLY_CALCULATE=Automatically Calculate
\ No newline at end of file


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r28246 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.