Author: rob.stryker(a)jboss.com Date: 2009-07-30 17:23:26 -0400 (Thu, 30 Jul 2009) New Revision: 16918 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 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/filesetdata/org.jboss.ide.eclipse.as.32 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2009-07-30 21:23:26 UTC (rev 16918) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="{config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2009-07-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2009-07-30 21:23:26 UTC (rev 16918) @@ -11,8 +11,10 @@ package org.jboss.ide.eclipse.archives.webtools.filesets; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; public class Fileset implements Cloneable { @@ -47,6 +49,17 @@ */ public String getFolder() { String tmp = folder == null ? "" : folder; //$NON-NLS-1$ + + // TODO do the string replacement! perhaps use variables plugin + IJBossServerRuntime ajbsrt = (IJBossServerRuntime) server.getRuntime() + .loadAdapter(IJBossServerRuntime.class, + new NullProgressMonitor()); + String config = null; + if( ajbsrt != null ) + config = ajbsrt.getJBossConfiguration(); + if( config != null ) + tmp = tmp.replace("${config}", config); //$NON-NLS-1$ + IPath p = new Path(tmp); if( !p.isAbsolute() && server != null ) { if( server.getRuntime() != null ) 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-30 20:07:37 UTC (rev 16917) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java 2009-07-30 21:23:26 UTC (rev 16918) @@ -57,22 +57,6 @@ 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); } }