Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing enable/disable 

Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
This commit is contained in:
Joakim Erdfelt 2013-08-18 10:22:25 -07:00 committed by Greg Wilkins
parent 4e1a62b5c5
commit aed68112ce
4 changed files with 177 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
jetty-start/src/main/java/org/eclipse/jetty/start/FS.java
View File

@ -26,6 +26,44 @@ import java.util.regex.Pattern;
public class FS
{
public static class AllFilter implements FileFilter
{
public static final AllFilter INSTANCE = new AllFilter();
@Override
public boolean accept(File pathname)
{
return true;
}
}
public static class FileNamesFilter implements FileFilter
{
private final String filenames[];
public FileNamesFilter(String... names)
{
this.filenames = names;
}
@Override
public boolean accept(File path)
{
if (!path.isFile())
{
return false;
}
for (String name : filenames)
{
if (name.equalsIgnoreCase(path.getName()))
{
return true;
}
}
return false;
}
}
public static class FilenameRegexFilter implements FileFilter
{
private final Pattern pattern;
@ -38,7 +76,7 @@ public class FS
@Override
public boolean accept(File path)
{
return pattern.matcher(path.getName()).matches();
return path.isFile() && pattern.matcher(path.getName()).matches();
}
}
@ -58,20 +96,6 @@ public class FS
}
}
public static boolean isXml(String filename)
{
return Pattern.compile(".xml$",Pattern.CASE_INSENSITIVE).matcher(filename).matches();
}
public static boolean isFile(File file)
{
if (file == null)
{
return false;
}
return file.exists() && file.isFile();
}
public static void close(Closeable c)
{
if (c == null)
@ -86,4 +110,35 @@ public class FS
/* ignore */
}
}
public static boolean isFile(File file)
{
if (file == null)
{
return false;
}
return file.exists() && file.isFile();
}
public static boolean isXml(String filename)
{
return Pattern.compile(".xml$",Pattern.CASE_INSENSITIVE).matcher(filename).matches();
}
public static String separators(String path)
{
StringBuilder ret = new StringBuilder();
for (char c : path.toCharArray())
{
if ((c == '/') || (c == '\\'))
{
ret.append(File.separatorChar);
}
else
{
ret.append(c);
}
}
return ret.toString();
}
}

51
jetty-start/src/main/java/org/eclipse/jetty/start/HomeBase.java
View File

@ -43,23 +43,6 @@ public class HomeBase
}
}
public static String separators(String path)
{
StringBuilder ret = new StringBuilder();
for (char c : path.toCharArray())
{
if ((c == '/') || (c == '\\'))
{
ret.append(File.separatorChar);
}
else
{
ret.append(c);
}
}
return ret.toString();
}
private File homeDir;
private File baseDir;
@ -120,7 +103,7 @@ public class HomeBase
*/
public File getFile(String path)
{
String rpath = separators(path);
String rpath = FS.separators(path);
// Relative to Base Directory First
if (baseDir != null)
@ -189,21 +172,21 @@ public class HomeBase
{
Objects.requireNonNull(filter,"FileFilter cannot be null");
File homePath = new File(homeDir,separators(relPathToDirectory));
File homePath = new File(homeDir,FS.separators(relPathToDirectory));
List<File> homeFiles = new ArrayList<>();
homeFiles.addAll(Arrays.asList(homePath.listFiles(filter)));
if (baseDir != null)
{
// merge
File basePath = new File(baseDir,separators(relPathToDirectory));
File basePath = new File(baseDir,FS.separators(relPathToDirectory));
File baseFiles[] = basePath.listFiles(filter);
List<File> ret = new ArrayList<>();
for (File base : baseFiles)
{
String relpath = toRelativePath(baseDir,base);
File home = new File(homeDir,separators(relpath));
File home = new File(homeDir,FS.separators(relpath));
if (home.exists())
{
homeFiles.remove(home);
@ -225,6 +208,32 @@ public class HomeBase
}
}
/**
* Collect the list of files in both <code>${jetty.base}</code> and <code>${jetty.home}</code>, with
* , even if the same file shows up in both places.
*/
public List<File> rawListFiles(String relPathToDirectory, FileFilter filter)
{
Objects.requireNonNull(filter,"FileFilter cannot be null");
List<File> ret = new ArrayList<>();
// Home Dir
File homePath = new File(homeDir,FS.separators(relPathToDirectory));
ret.addAll(Arrays.asList(homePath.listFiles(filter)));
if (baseDir != null)
{
// Base Dir
File basePath = new File(baseDir,FS.separators(relPathToDirectory));
ret.addAll(Arrays.asList(basePath.listFiles(filter)));
}
// Sort
Collections.sort(ret, new NaturalSort.Files());
return ret;
}
private String toRelativePath(File dir, File path)
{
return dir.toURI().relativize(path.toURI()).toASCIIString();

151
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -24,7 +24,6 @@ import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@ -48,7 +47,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.jetty.start.StartIni.IncludeListener;
@ -85,8 +83,10 @@ public class Main implements IncludeListener
private final List<String> _jvmArgs = new ArrayList<>();
private final List<String> _enable = new ArrayList<>();
private final List<String> _disable = new ArrayList<>();
// Actively being used ini files
private final List<File> _iniFiles = new ArrayList<>();
private final List<File> _iniDirs = new ArrayList<>();
// Actively being referenced ini include paths
private final List<String> _iniIncludePaths = new ArrayList<>();
private String _startConfig = null;
public static void main(String[] args)
@ -122,10 +122,16 @@ public class Main implements IncludeListener
ArrayList<String> arguments = new ArrayList<>(Arrays.asList(args));
boolean ini = false;
for (String arg : arguments)
{
if (arg.startsWith("--ini=") || arg.equals("--ini"))
{
ini = true;
}
}
if (!ini)
{
arguments.add(0,"--ini=start.ini");
}
// The XML Configuration Files to initialize with
List<String> xmls = new ArrayList<String>();
@ -213,6 +219,7 @@ public class Main implements IncludeListener
String name = arg.substring(6);
File file = _config.getHomeBase().getFile(name);
StartIni startini = new StartIni(file,this);
_iniFiles.add(file);
arguments.addAll(i + 1,startini.getLines());
}
@ -372,8 +379,16 @@ public class Main implements IncludeListener
public List<StartIni> onIniInclude(String path) throws IOException
{
List<StartIni> included = new ArrayList<>();
for(File file: _config.getHomeBase().listFiles(path,new FS.IniFilter()))
HomeBase hb = _config.getHomeBase();
// Allow --enable and --disable to work
_iniIncludePaths.add(path);
// Scan for ini files
for (File file : hb.listFiles(path,new FS.IniFilter()))
{
_iniFiles.add(file);
included.add(new StartIni(file));
}
return included;
@ -491,26 +506,20 @@ public class Main implements IncludeListener
{
for (File file : _iniFiles)
{
String path = path(file);
String path = _config.getHomeBase().toShortForm(file);
System.out.printf("%s%s%n",indent,path);
if (Config.isDebug())
{
try (FileReader reader = new FileReader(file); BufferedReader in = new BufferedReader(reader);)
StartIni ini = new StartIni(file);
for (String arg : ini)
{
String arg;
while ((arg = in.readLine()) != null)
{
arg = arg.trim();
if (arg.length() == 0 || arg.startsWith("#"))
continue;
System.out.printf("%s +-- %s%n",indent,arg);
}
}
}
}
}
}
else
{
System.out.println(line);
@ -1181,87 +1190,79 @@ public class Main implements IncludeListener
{
final String mini = module + ".ini";
final String disable = module + ".ini.disabled";
final AtomicBoolean found = new AtomicBoolean(false);
FileFilter filter = new FileFilter()
{
public boolean accept(File path)
{
if (!path.isFile())
return false;
String n = path.getName();
int i = n.indexOf(mini);
if (i < 0)
return false;
if (i > 0 && i != 4 && n.charAt(i - 1) != '-')
return false;
found.set(true);
if (n.endsWith(mini))
FileFilter disabledModuleFilter = new FS.FileNamesFilter(mini, disable);
HomeBase hb = _config.getHomeBase();
// walk all ini include paths that were used
boolean found = false;
for (String includedPath : _iniIncludePaths)
{
System.err.printf("Module %s already enabled in %s as %s%n",module,path(path.getParent()),n);
Config.debug("Searching ${jetty.home}/%s and ${jetty.base}/% for %s",includedPath,includedPath,mini);
for (File file : hb.rawListFiles(includedPath,disabledModuleFilter))
{
String n = file.getName();
if (n.equalsIgnoreCase(mini))
{
System.err.printf("Module %s already enabled in %s%n",module,hb.toShortForm(file.getParent()));
found = true;
}
else if (n.endsWith(disable))
else if (n.equals(disable))
{
String enabled = n.substring(0,n.length() - 9);
System.err.printf("Enable %s in %s as %s%n",module,path(path.getParent()),enabled);
path.renameTo(new File(path.getParentFile(),enabled));
System.err.printf("Enabling Module %s in %s%n",module,hb.toShortForm(file.getParent()));
file.renameTo(new File(file.getParentFile(),mini));
found = true;
}
}
else
System.err.printf("Bad module %s in %s as %s%n",module,path(path.getParent()),n);
return false;
}
};
for (File dir : _iniDirs)
dir.listFiles(filter);
if (!found.get())
for (File dir : _iniDirs)
System.err.printf("Module %s not found in %s%n",module,path(dir));
if (!found)
{
for (String includedPath : _iniIncludePaths)
{
System.err.printf("Module %s not found in %s%n",module,includedPath);
}
}
}
private void disable(final String module)
{
final String mini = module + ".ini";
final String disable = module + ".ini.disabled";
final AtomicBoolean found = new AtomicBoolean(false);
FileFilter filter = new FileFilter()
{
public boolean accept(File path)
{
if (!path.isFile())
return false;
String n = path.getName();
int i = n.indexOf(mini);
if (i < 0)
return false;
if (i > 0 && i != 4 && n.charAt(i - 1) != '-')
return false;
found.set(true);
if (n.endsWith(disable))
FileFilter disabledModuleFilter = new FS.FileNamesFilter(mini, disable);
HomeBase hb = _config.getHomeBase();
// walk all ini include paths that were used
boolean found = false;
for (String includedPath : _iniIncludePaths)
{
System.err.printf("Module %s already disabled in %s as %s%n",module,path(path.getParent()),n);
Config.debug("Searching ${jetty.home}/%s and ${jetty.base}/% for %s",includedPath,includedPath,mini);
for (File file : hb.rawListFiles(includedPath,disabledModuleFilter))
{
String n = file.getName();
if (n.equalsIgnoreCase(disable))
{
System.err.printf("Module %s already disabled in %s%n",module,hb.toShortForm(file.getParent()));
found = true;
}
else if (n.endsWith(mini))
else if (n.equals(mini))
{
String disabled = n + ".disabled";
System.err.printf("Disable %s in %s as %s%n",module,path(path.getParent()),disabled);
path.renameTo(new File(path.getParentFile(),disabled));
System.err.printf("Disabling Module %s in %s%n",module,hb.toShortForm(file.getParent()));
file.renameTo(new File(file.getParentFile(),disable));
found = true;
}
}
else
System.err.printf("Bad module %s in %s as %s%n",module,path(path.getParent()),n);
return false;
}
};
for (File dir : _iniDirs)
dir.listFiles(filter);
if (!found.get())
for (File dir : _iniDirs)
System.err.printf("Module %s not found in %s%n",module,path(dir));
if (!found)
{
for (String includedPath : _iniIncludePaths)
{
System.err.printf("Module %s not found in %s%n",module,includedPath);
}
}
}
}

2
jetty-start/src/main/java/org/eclipse/jetty/start/StartIni.java
View File

@ -86,7 +86,7 @@ public class StartIni implements Iterable<String>
{
if (listener == null)
{
System.err.printf("Nested includes not supported: %s (found in %s)%n",line,file.getAbsolutePath());
Config.debug("Nested include ignored: %s (found in %s)",line,file.getAbsolutePath());
}
else
{