Author: rob.stryker(a)jboss.com Date: 2009-07-29 15:41:33 -0400 (Wed, 29 Jul 2009) New Revision: 16879 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java Log: JBIDE-4680 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java 2009-07-29 18:42:53 UTC (rev 16878) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java 2009-07-29 19:41:33 UTC (rev 16879) @@ -4,8 +4,11 @@ import java.util.Arrays; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class NewServerFilesetHandler extends UnitedServerListener { private static NewServerFilesetHandler instance; @@ -26,6 +29,23 @@ sets = FilesetUtil.loadFilesets(fileToRead.toFile(), null); list.addAll(Arrays.asList(sets)); Fileset[] finalSets = (Fileset[]) list.toArray(new Fileset[list.size()]); + + + /* + * Replace {config} with server/config if this is a jboss server + */ + IJBossServerRuntime ajbsrt = (IJBossServerRuntime) server.getRuntime() + .loadAdapter(IJBossServerRuntime.class, + new NullProgressMonitor()); + String config = null; + if( ajbsrt != null ) + config = ajbsrt.getJBossConfiguration(); + for( int i = 0; i < finalSets.length; i++ ) { + String folder = finalSets[i].getRawFolder(); + if( config != null ) + folder = folder.replace("{config}", "server/" + config); //$NON-NLS-1$ //$NON-NLS-2$ + finalSets[i].setFolder(folder); + } FilesetUtil.saveFilesets(server, finalSets); } }