Author: rob.stryker(a)jboss.com Date: 2008-12-15 16:11:42 -0500 (Mon, 15 Dec 2008) New Revision: 12603 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.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-3408 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-12-15 19:13:10 UTC (rev 12602) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-15 21:11:42 UTC (rev 12603) @@ -116,14 +116,13 @@ if( type.equals(DEPLOY_METADATA)) { return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')). append(IJBossServerConstants.DEPLOY).makeAbsolute().toString(); - } else if( type.equals(DEPLOY_SERVER)){ + } else /* if( type.equals(DEPLOY_SERVER)) */ { IJBossServerRuntime jbsrt = getRuntime(); String config = jbsrt.getJBossConfiguration(); - return new Path(IJBossServerConstants.SERVER) - .append(config) - .append(IJBossServerConstants.DEPLOY).makeRelative().toString(); + IPath p = new Path(IJBossServerConstants.SERVER).append(config) + .append(IJBossServerConstants.DEPLOY).makeRelative(); + return makeGlobal(getRuntime(), p).toString(); } - return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString(); } public void setDeployFolder(String folder) { @@ -137,15 +136,14 @@ if( type.equals(DEPLOY_METADATA)) { return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')). append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString(); - } else if( type.equals(DEPLOY_SERVER)){ + } else /* if( type.equals(DEPLOY_SERVER)) */{ IJBossServerRuntime jbsrt = getRuntime(); String config = jbsrt.getJBossConfiguration(); - return new Path(IJBossServerConstants.SERVER) - .append(config) - .append(IJBossServerConstants.TMP) - .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString(); + IPath p = new Path(IJBossServerConstants.SERVER) + .append(config).append(IJBossServerConstants.TMP) + .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative(); + return makeGlobal(getRuntime(), p).toString(); } - 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()); 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-12-15 19:13:10 UTC (rev 12602) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-15 21:11:42 UTC (rev 12603) @@ -61,6 +61,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; 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.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.ui.Messages; @@ -111,6 +112,9 @@ metadataRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_METADATA)); serverRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_SERVER)); customRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_CUSTOM)); + currentSelection = metadataRadio.getSelection() ? metadataRadio : + serverRadio.getSelection() ? serverRadio : + customRadio; radioListener = new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { @@ -232,17 +236,20 @@ } private String getDeployType() { - return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM); + return getServer().getDeployLocationType(); } private String getDeployDir() { - return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); + return makeRelative(getServer().getDeployFolder()); } private String getTempDeployDir() { - String defaultt = ServerPlugin.getInstance().getStateLocation().toFile().getAbsolutePath(); - return helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, defaultt); + return makeRelative(getServer().getTempDeployFolder()); } + private IDeployableServer getServer() { + return (IDeployableServer)server.loadAdapter(IDeployableServer.class, new NullProgressMonitor()); + } + public IStatus[] getSaveStatus() { String error = ""; List<Status> status = new ArrayList<Status>(); 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-12-15 19:13:10 UTC (rev 12602) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-12-15 21:11:42 UTC (rev 12603) @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; @@ -261,13 +262,15 @@ String deployTmpFolderVal = IJBossServerConstants.PLUGIN_LOCATION.append(name). append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString(); - JBossServer jbs = (JBossServer)wc.loadAdapter(JBossServer.class, new NullProgressMonitor()); jbs.setUsername("admin"); jbs.setPassword("admin"); - jbs.setDeployLocationType(IDeployableServer.DEPLOY_METADATA); + + boolean as5 = isAS5(); + String as5TmpDeployFolderVal = new Path(IJBossServerConstants.SERVER).append(getRuntime().getJBossConfiguration()).append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString(); + jbs.setDeployLocationType(as5 ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA); jbs.setDeployFolder(deployVal); - jbs.setTempDeployFolder(deployTmpFolderVal); + jbs.setTempDeployFolder(as5 ? as5TmpDeployFolderVal : deployTmpFolderVal); new File(deployVal).mkdirs(); new File(deployTmpFolderVal).mkdirs(); } @@ -284,6 +287,11 @@ return ajbsrt; } + protected boolean isAS5() { + return getRuntime().getRuntime().getRuntimeType(). + getVersion().equals("5.0"); + } + public boolean isComplete() { return getErrorString() == null ? true : false; }