Author: rob.stryker(a)jboss.com Date: 2009-07-29 16:51:28 -0400 (Wed, 29 Jul 2009) New Revision: 16880 Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetUtil.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java Log: JBIDE-4247 - all jbt servers have the log4j xml file as an automatic filter. Any other new ones should be added separately Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetUtil.java 2009-07-29 19:41:33 UTC (rev 16879) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetUtil.java 2009-07-29 20:51:28 UTC (rev 16880) @@ -2,8 +2,10 @@ import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import org.eclipse.core.runtime.IPath; import org.eclipse.wst.server.core.IServer; @@ -20,22 +22,27 @@ } public static Fileset[] loadFilesets(File file, IServer server) { + if( file != null && file.exists()) { + try { + return loadFilesets(new FileInputStream(file), server); + } catch( FileNotFoundException fnfe) {} + } + return new Fileset[]{}; + } + + public static Fileset[] loadFilesets(InputStream is, IServer server) { Fileset[] filesets = null; - try { - XMLMemento memento = XMLMemento.createReadRoot(new FileInputStream(file)); - IMemento[] categoryMementos = memento.getChildren("fileset");//$NON-NLS-1$ - filesets = new Fileset[categoryMementos.length]; - String name, folder, includes, excludes; - for( int i = 0; i < categoryMementos.length; i++ ) { - name = categoryMementos[i].getString("name"); //$NON-NLS-1$ - folder = categoryMementos[i].getString("folder");//$NON-NLS-1$ - includes = categoryMementos[i].getString("includes");//$NON-NLS-1$ - excludes = categoryMementos[i].getString("excludes");//$NON-NLS-1$ - filesets[i] = new Fileset(name, folder, includes, excludes); - filesets[i].setServer(server); - } - } catch( IOException ioe) { - // TODO LOG + XMLMemento memento = XMLMemento.createReadRoot(is); + IMemento[] categoryMementos = memento.getChildren("fileset");//$NON-NLS-1$ + filesets = new Fileset[categoryMementos.length]; + String name, folder, includes, excludes; + for( int i = 0; i < categoryMementos.length; i++ ) { + name = categoryMementos[i].getString("name"); //$NON-NLS-1$ + folder = categoryMementos[i].getString("folder");//$NON-NLS-1$ + includes = categoryMementos[i].getString("includes");//$NON-NLS-1$ + excludes = categoryMementos[i].getString("excludes");//$NON-NLS-1$ + filesets[i] = new Fileset(name, folder, includes, excludes); + filesets[i].setServer(server); } return filesets == null ? new Fileset[] { } : filesets; } 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 19:41:33 UTC (rev 16879) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java 2009-07-29 20:51:28 UTC (rev 16880) @@ -1,14 +1,21 @@ package org.jboss.ide.eclipse.archives.webtools.filesets; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; import java.util.ArrayList; import java.util.Arrays; +import org.eclipse.core.runtime.FileLocator; 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.eclipse.wst.server.core.IServerType; +import org.eclipse.wst.server.core.ServerCore; +import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin; 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; @@ -18,6 +25,26 @@ return instance; } + protected NewServerFilesetHandler() { + IServerType[] types = ServerCore.getServerTypes(); + for( int i = 0; i < types.length; i++ ) { + try { + IPath fileToWrite = FilesetUtil.DEFAULT_FS_ROOT.append(types[i].getId()); + if( !fileToWrite.toFile().exists()) { + IPath p = new Path("filesetdata").append(types[i].getId()); //$NON-NLS-1$ + URL url = FileLocator.find(IntegrationPlugin.getDefault().getBundle(), p, null); + if( url != null ) { + InputStream fis = url.openStream(); + Fileset[] sets = FilesetUtil.loadFilesets(fis, null); + if( sets.length != 0 ) { + FilesetUtil.saveFilesets(fileToWrite.toFile(), sets); + } + } + } + } catch(IOException ioe) {} + } + } + public void serverAdded(IServer server) { IPath fileToRead = FilesetUtil.DEFAULT_FS_ROOT.append(FilesetUtil.DEFAULT_FS_ALL_SERVERS); Fileset[] sets = FilesetUtil.loadFilesets(fileToRead.toFile(), null);