Author: rob.stryker(a)jboss.com Date: 2007-10-17 18:36:38 -0400 (Wed, 17 Oct 2007) New Revision: 4309 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/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java Log: JBIDE-998 Added ability to specify a deploy directory 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 2007-10-17 20:17:13 UTC (rev 4308) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2007-10-17 22:36:38 UTC (rev 4309) @@ -29,6 +29,8 @@ * @author rob.stryker(a)jboss.com */ public interface IDeployableServer { + public static final String DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.deployDirectory"; + public String getDeployDirectory(); public String getConfigDirectory(); public ServerAttributeHelper getAttributeHelper(); 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 2007-10-17 20:17:13 UTC (rev 4308) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2007-10-17 22:36:38 UTC (rev 4309) @@ -12,8 +12,6 @@ public class DeployableServer extends ServerDelegate implements IDeployableServer { - public static final String DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.stripped.deploy_directory"; - public DeployableServer() { } 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 2007-10-17 20:17:13 UTC (rev 4308) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2007-10-17 22:36:38 UTC (rev 4309) @@ -164,9 +164,6 @@ public String getConfigDirectory() { return getConfigDirectory(true); } - public String getDeployDirectory() { - return getDeployDirectory(true); - } public String getConfigDirectory(boolean checkLaunchConfig) { if( !checkLaunchConfig ) @@ -183,6 +180,11 @@ return new Path(configDir).toOSString(); } + public String getDeployDirectory() { + String folder = getAttributeHelper().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, (String)null); + return folder != null ? folder : getDeployDirectory(true); + } + public String getDeployDirectory(boolean checkLaunchConfig) { return new Path(getConfigDirectory(checkLaunchConfig) + Path.SEPARATOR + DEPLOY).toOSString(); }