Author: rob.stryker(a)jboss.com Date: 2008-04-21 18:03:43 -0400 (Mon, 21 Apr 2008) New Revision: 7669 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java Log: JBIDE-2048 - deploy logic consolidated 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-04-21 21:55:01 UTC (rev 7668) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-21 22:03:43 UTC (rev 7669) @@ -34,7 +34,6 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.model.IURLProvider; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel; @@ -57,14 +56,6 @@ public JBossServer() { } - - public ServerAttributeHelper getAttributeHelper() { - IServerWorkingCopy copy = getServerWorkingCopy(); - if( copy == null ) { - copy = getServer().createWorkingCopy(); - } - return new ServerAttributeHelper(getServer(), copy); - } public String getConfigDirectory() { return getConfigDirectory(true); @@ -86,11 +77,11 @@ } public String getDeployDirectory() { - String folder = getAttributeHelper().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, (String)null); + String folder = super.getDeployDirectory(); return folder != null ? folder : getDeployDirectory(true); } - public String getDeployDirectory(boolean checkLaunchConfig) { + protected String getDeployDirectory(boolean checkLaunchConfig) { return new Path(getConfigDirectory(checkLaunchConfig) + Path.SEPARATOR + DEPLOY).toOSString(); }