[jbosstools-commits] JBoss Tools SVN: r11548 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules and 5 other directories.

Author: rob.stryker(a)jboss.com Date: 2008-11-05 19:35:07 -0500 (Wed, 05 Nov 2008) New Revision: 11548 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java Log: JBIDE-3073 - hard coded paths fixed in server editor and creation wizard Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2008-11-06 00:35:07 UTC (rev 11548) @@ -126,7 +126,7 @@ </or></possibleChildren> <actionProvider class="org.jboss.ide.eclipse.archives.webtools.ui.FilesetActionProvider" - id="rg.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets.actions" + id="org.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets.actions" priority="highest"> </actionProvider> </navigatorContent> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -149,7 +149,7 @@ for( int i = 0; i < serverBehaviors.length; i++ ) { sourcePath = topLevelPackage.getArchiveFilePath(); depServer = getDeployableServerFromBehavior(serverBehaviors[i]); - destPath = new Path(depServer.getDeployDirectory()).append(sourcePath.lastSegment()); + destPath = new Path(depServer.getDeployFolder()).append(sourcePath.lastSegment()); FileUtil.safeDelete(destPath.toFile()); FileUtil.fileSafeCopy(sourcePath.toFile(), destPath.toFile()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -104,7 +104,7 @@ // remove all of the deployed items if( pack != null ) { IPath sourcePath = pack.getArchiveFilePath(); - IPath destPath = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment()); + IPath destPath = new Path(server.getDeployFolder()).append(sourcePath.lastSegment()); // remove the entire file or folder PublisherFileUtilListener listener = new PublisherFileUtilListener(eventRoot); FileUtil.safeDelete(destPath.toFile(), listener); @@ -116,7 +116,7 @@ protected void publishModule(IModule module, boolean incremental, IProgressMonitor monitor) { IArchive pack = getPackage(module); IPath sourcePath = pack.getArchiveFilePath(); - IPath destPathRoot = new Path(server.getDeployDirectory()); + IPath destPathRoot = new Path(server.getDeployFolder()); // if destination is deploy directory... no need to re-copy! if( destPathRoot.toOSString().equals(PathUtils.getGlobalLocation(pack).toOSString())) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -185,7 +185,7 @@ } protected IPath getDeployPath(IModule[] moduleTree) { - IPath root = new Path( server.getDeployDirectory() ); + IPath root = new Path( server.getDeployFolder() ); String type, name; for( int i = 0; i < moduleTree.length; i++ ) { type = moduleTree[i].getModuleType().getId(); @@ -275,7 +275,7 @@ * @return returns whether an error was found */ protected boolean localSafeDelete(IPath deployPath, final EventLogTreeItem event) { - String serverDeployFolder = server.getDeployDirectory(); + String serverDeployFolder = server.getDeployFolder(); Assert.isTrue(!deployPath.toFile().equals(new Path(serverDeployFolder).toFile()), "An attempt to delete your entire deploy folder has been prevented. This should never happen"); final Boolean[] errorFound = new Boolean[] { new Boolean(false)}; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -72,7 +72,7 @@ SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); if( delegate != null ) { IPath sourcePath = delegate.getGlobalSourcePath(); - IPath destFolder = new Path(server.getDeployDirectory()); + IPath destFolder = new Path(server.getDeployFolder()); File destFile = destFolder.append(sourcePath.lastSegment()).toFile(); FileUtilListener l = new FileUtilListener(root); FileUtil.fileSafeCopy(sourcePath.toFile(), destFile, l); @@ -96,7 +96,7 @@ SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); if( delegate != null ) { IPath sourcePath = delegate.getGlobalSourcePath(); - IPath destFolder = new Path(server.getDeployDirectory()); + IPath destFolder = new Path(server.getDeployFolder()); FileUtilListener l = new FileUtilListener(root); FileUtil.safeDelete(destFolder.append(sourcePath.lastSegment()).toFile(), l); if( l.errorFound ) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -32,7 +32,11 @@ public static final String DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.deployDirectory"; public static final String TEMP_DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.tempDeployDirectory"; - public String getDeployDirectory(); + public String getDeployFolder(); + public void setDeployFolder(String folder); + public String getTempDeployFolder(); + public void setTempDeployFolder(String folder); + public String getConfigDirectory(); public ServerAttributeHelper getAttributeHelper(); public IServer getServer(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -21,7 +21,6 @@ */ package org.jboss.ide.eclipse.as.core.server; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; /** Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -24,8 +24,11 @@ import java.util.ArrayList; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jst.server.core.IEnterpriseApplication; import org.eclipse.jst.server.core.IWebModule; @@ -38,6 +41,7 @@ import org.eclipse.wst.server.core.model.ServerDelegate; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; public class DeployableServer extends ServerDelegate implements IDeployableServer { @@ -123,14 +127,22 @@ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException { } - - /* (non-Javadoc) - * @see org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer#getDeployDirectory() - */ - public String getDeployDirectory() { - return getAttribute(DEPLOY_DIRECTORY, ""); + + + public String getDeployFolder() { + return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString(); } + public void setDeployFolder(String folder) { + setAttribute(DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString()); + } + public String getTempDeployFolder() { + return makeGlobal(getRuntime(), new Path(getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString(); + } + public void setTempDeployFolder(String folder) { + setAttribute(TEMP_DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString()); + } + /* * (non-Javadoc) * @see org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer#getAttributeHelper() @@ -145,6 +157,28 @@ // only used for xpaths and is a complete crap hack ;) misleading, too public String getConfigDirectory() { - return getDeployDirectory(); + return getDeployFolder(); } + + public IJBossServerRuntime getRuntime() { + IJBossServerRuntime ajbsrt = (IJBossServerRuntime) getServer().getRuntime() + .loadAdapter(IJBossServerRuntime.class, + new NullProgressMonitor()); + return ajbsrt; + } + + public static IPath makeRelative(IJBossServerRuntime rt, IPath p) { + if( p.isAbsolute()) { + if(rt.getRuntime().getLocation().isPrefixOf(p)) + return p.removeFirstSegments(rt.getRuntime().getLocation().segmentCount()).makeRelative(); + } + return p; + } + + public static IPath makeGlobal(IJBossServerRuntime rt, IPath p) { + if( !p.isAbsolute()) { + return rt.getRuntime().getLocation().append(p).makeAbsolute(); + } + return p; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -74,7 +74,7 @@ String config = runtime.getJBossConfiguration(); startArgs = ArgsUtil.setArg(startArgs, "-c", "--configuration", config); - if( startArgs != null && !startArgs.equals(originalArgs)) { + if( startArgs != null && !startArgs.trim().equals(originalArgs)) { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, startArgs); wc.doSave(); @@ -125,12 +125,12 @@ return new Path(configDir).toOSString(); } - public String getDeployDirectory() { - String folder = super.getDeployDirectory(); - return folder != null ? folder : getDeployDirectory(true); + public String getDeployFolder() { + String folder = super.getDeployFolder(); + return folder != null ? folder : getDeployFolder(true); } - protected String getDeployDirectory(boolean checkLaunchConfig) { + protected String getDeployFolder(boolean checkLaunchConfig) { return new Path(getConfigDirectory(checkLaunchConfig) + Path.SEPARATOR + DEPLOY).toOSString(); } @@ -239,18 +239,5 @@ public void setPassword(String pass) { setAttribute(SERVER_PASSWORD, pass); } - - public String getDeployFolder() { - return getAttribute(DEPLOY_DIRECTORY, ""); - } - public void setDeployFolder(String folder) { - setAttribute(DEPLOY_DIRECTORY, folder); - } - - public String getTempDeployFolder() { - return getAttribute(TEMP_DEPLOY_DIRECTORY, ""); - } - public void setTempDeployFolder(String folder) { - setAttribute(TEMP_DEPLOY_DIRECTORY, folder); - } + } \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -21,10 +21,12 @@ */ package org.jboss.ide.eclipse.as.ui.editor; +import java.io.File; import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; @@ -48,12 +50,13 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.internal.ServerPlugin; -import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.eclipse.wst.server.ui.editor.ServerEditorSection; import org.eclipse.wst.server.ui.internal.command.ServerCommand; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.ui.Messages; @@ -107,10 +110,11 @@ } public void widgetSelected(SelectionEvent e) { DirectoryDialog d = new DirectoryDialog(new Shell()); - d.setFilterPath(deployText.getText()); + d.setFilterPath(makeGlobal(deployText.getText())); String x = d.open(); - if( x != null ) - deployText.setText(x); + if( x != null ) { + deployText.setText(makeRelative(x)); + } } }); @@ -130,10 +134,10 @@ } public void widgetSelected(SelectionEvent e) { DirectoryDialog d = new DirectoryDialog(new Shell()); - d.setFilterPath(tempDeployText.getText()); + d.setFilterPath(makeGlobal(tempDeployText.getText())); String x = d.open(); if( x != null ) - tempDeployText.setText(x); + tempDeployText.setText(makeRelative(x)); } }); @@ -196,16 +200,14 @@ public IStatus[] getSaveStatus() { String error = ""; List<Status> status = new ArrayList<Status>(); - if(!new Path(deployText.getText()).toFile().exists()) { + if(!new File(makeGlobal(deployText.getText())).exists()) { String msg = NLS.bind(Messages.EditorDeployDNE, deployText.getText()); -// "The deploy directory \"" + deployText.getText() + "\" does not exist."; status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg)); error = msg + "\n"; } - if(!new Path(tempDeployText.getText()).toFile().exists()) { + if(!new File(makeGlobal(tempDeployText.getText())).exists()) { String msg = NLS.bind(Messages.EditorTempDeployDNE, tempDeployText.getText()); - //"The temporary deploy directory \"" + tempDeployText.getText() + "\" does not exist."; status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg)); error = error + msg + "\n"; } @@ -226,14 +228,14 @@ this.text = deployText; this.newDir = deployText.getText(); this.listener = deployListener; - this.oldDir = helper.getAttribute(DeployableServer.DEPLOY_DIRECTORY, ""); + this.oldDir = helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); } public void execute() { - helper.setAttribute(DeployableServer.DEPLOY_DIRECTORY, newDir); + helper.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, newDir); } public void undo() { text.removeModifyListener(listener); - helper.setAttribute(DeployableServer.DEPLOY_DIRECTORY, oldDir); + helper.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, oldDir); text.setText(oldDir); text.addModifyListener(listener); } @@ -261,8 +263,27 @@ text.addModifyListener(listener); } } - + public void dispose() { // ignore } + + private String makeGlobal(String path) { + return DeployableServer.makeGlobal(getRuntime(), new Path(path)).toString(); + } + + private String makeRelative(String path) { + return DeployableServer.makeRelative(getRuntime(), new Path(path)).toString(); + } + + private IJBossServerRuntime getRuntime() { + IRuntime r = server.getRuntime(); + IJBossServerRuntime ajbsrt = null; + if (r != null) { + ajbsrt = (IJBossServerRuntime) r + .loadAdapter(IJBossServerRuntime.class, + new NullProgressMonitor()); + } + return ajbsrt; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-11-05 23:05:15 UTC (rev 11547) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-11-06 00:35:07 UTC (rev 11548) @@ -24,8 +24,10 @@ import java.io.File; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.resource.ImageDescriptor; @@ -54,6 +56,7 @@ import org.eclipse.wst.server.ui.wizard.IWizardHandle; import org.eclipse.wst.server.ui.wizard.WizardFragment; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; @@ -287,35 +290,30 @@ deployBrowseButton.addSelectionListener(new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) {} public void widgetSelected(SelectionEvent e) { - File file = new File(deployText.getText()); - if (!file.exists()) { - file = null; + String directory = getDirectory(deployText.getText(), deployGroup.getShell()); + if (directory != null) { + deployText.setText(directory); + deployVal = deployText.getText(); } - - File directory = getDirectory(file, deployGroup.getShell()); - if (directory == null) { - return; - } - - deployText.setText(directory.getAbsolutePath()); - deployVal = deployText.getText(); } }); deployText.setEditable(false); } - protected File getDirectory(File startingDirectory, Shell shell) { + protected String getDirectory(String startingDirectory, Shell shell) { DirectoryDialog fileDialog = new DirectoryDialog(shell, SWT.OPEN); - if (startingDirectory != null) { - fileDialog.setFilterPath(startingDirectory.getPath()); - } + if( startingDirectory == null ) + startingDirectory = getRuntime().getRuntime().getLocation().toString(); + IPath sp = DeployableServer.makeGlobal(getRuntime(), new Path(startingDirectory)); + fileDialog.setFilterPath(sp.toString()); + String dir = fileDialog.open(); if (dir != null) { dir = dir.trim(); if (dir.length() > 0) { - return new File(dir); + return DeployableServer.makeRelative(getRuntime(), new Path(dir)).toString(); } } return null; @@ -357,7 +355,7 @@ configValLabel.setText(srt.getJBossConfiguration()); IVMInstall install = srt.getVM(); jreValLabel.setText(install.getInstallLocation().getAbsolutePath() + " (" + install.getName() + ")"); - String deployFolder = srt.getRuntime().getLocation().append( "server").append(configValLabel.getText()).append("deploy").toOSString(); + String deployFolder = new Path("server").append(configValLabel.getText()).append("deploy").toString(); deployTmpFolderVal = srt.getRuntime().getLocation().append( "server").append(configValLabel.getText()).append("tmp").append("jbosstoolsTemp").toOSString(); deployText.setText(deployFolder); deployVal = deployFolder;