Author: rob.stryker(a)jboss.com
Date: 2010-02-09 04:36:52 -0500 (Tue, 09 Feb 2010)
New Revision: 20191
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.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalDeploymentModuleTab.java
Log:
JBIDE-5791
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 2010-02-09
03:39:05 UTC (rev 20190)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-02-09
09:36:52 UTC (rev 20191)
@@ -151,10 +151,11 @@
return JBossServerCorePlugin.getServerStateLocation(server).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
+ String loc = jbsrt.getConfigLocation();
String config = jbsrt.getJBossConfiguration();
- IPath p = new Path(IJBossServerConstants.SERVER).append(config)
+ IPath p = new Path(loc).append(config)
.append(IJBossServerConstants.DEPLOY).makeRelative();
- return ServerUtil.makeGlobal(jbsrt, p).toString();
+ return p.toString();
}
return null;
}
@@ -173,11 +174,12 @@
return JBossServerCorePlugin.getServerStateLocation(getServer()).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
+ String loc = jbsrt.getConfigLocation();
String config = jbsrt.getJBossConfiguration();
- IPath p = new Path(IJBossServerConstants.SERVER)
+ IPath p = new Path(loc)
.append(config).append(IJBossServerConstants.TMP)
.append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative();
- return ServerUtil.makeGlobal(jbsrt, p).toString();
+ return p.toString();
}
return null;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalDeploymentModuleTab.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalDeploymentModuleTab.java 2010-02-09
03:39:05 UTC (rev 20190)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalDeploymentModuleTab.java 2010-02-09
09:36:52 UTC (rev 20191)
@@ -441,13 +441,14 @@
if( rt != null ) {
IJBossServerRuntime jbsrt =
(IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new
NullProgressMonitor());
if( jbsrt != null ) {
+ String loc = jbsrt.getConfigLocation();
String config = jbsrt.getJBossConfiguration();
- newDir = new Path(IJBossServerConstants.SERVER)
+ newDir = new Path(loc)
.append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative().toString();
- newTemp = new Path(IJBossServerConstants.SERVER).append(config)
+ .append(IJBossServerConstants.DEPLOY).toString();
+ newTemp = new Path(loc).append(config)
.append(IJBossServerConstants.TMP)
- .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ .append(IJBossServerConstants.JBOSSTOOLS_TMP).toString();
new File(newTemp).mkdirs();
type = IDeployableServer.DEPLOY_SERVER;
}
@@ -523,12 +524,12 @@
private String getDeployDir() {
return page.getServer().getRuntime() == null ? "" : //$NON-NLS-1$
- page.makeRelative(getServer().getDeployFolder());
+ getServer().getDeployFolder();
}
private String getTempDeployDir() {
return page.getServer().getRuntime() == null ? "" : //$NON-NLS-1$
- page.makeRelative(getServer().getTempDeployFolder());
+ getServer().getTempDeployFolder();
}
private IDeployableServer getServer() {
Show replies by date