Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-06-04 18:24:42 +0000
committerJoakim Erdfelt2014-06-04 18:24:42 +0000
commit7ee2f4e367607a542a87c31c57fb0a680ba15619 (patch)
tree3e7739db480bb8fc9b6ff929ba0857477d8dcfde /jetty-start
parentd31811f067da68c9379b339df5ec1d567e0aebdc (diff)
downloadorg.eclipse.jetty.project-7ee2f4e367607a542a87c31c57fb0a680ba15619.tar.gz
org.eclipse.jetty.project-7ee2f4e367607a542a87c31c57fb0a680ba15619.tar.xz
org.eclipse.jetty.project-7ee2f4e367607a542a87c31c57fb0a680ba15619.zip
Fixing extraneous output and duplicate ${jetty.base}/${jetty.base} references when using --add-to-startd
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Main.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 3831146296..f1482a529d 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -375,15 +375,15 @@ public class Main
// Find any named ini file and check it follows the convention
Path start_ini = baseHome.getBasePath("start.ini");
String short_start_ini = baseHome.toShortForm(start_ini);
- Path ini = start_d.resolve(name + ".ini");
- String short_ini = baseHome.toShortForm(ini);
+ Path startd_ini = start_d.resolve(name + ".ini");
+ String short_startd_ini = baseHome.toShortForm(startd_ini);
StartIni module_ini = null;
- if (FS.exists(ini))
+ if (FS.exists(startd_ini))
{
- module_ini = new StartIni(ini);
+ module_ini = new StartIni(startd_ini);
if (module_ini.getLineMatches(Pattern.compile("--module=(.*, *)*" + name)).size() == 0)
{
- StartLog.warn("ERROR: %s is not enabled in %s!",name,short_ini);
+ StartLog.warn("ERROR: %s is not enabled in %s!",name,short_startd_ini);
return;
}
}
@@ -392,7 +392,7 @@ public class Main
boolean has_ini_lines = module.getInitialise().size() > 0;
// If it is not enabled or is transitive with ini template lines or toplevel and doesn't exist
- if (!module.isEnabled() || (transitive && has_ini_lines) || (topLevel && !FS.exists(ini) && !appendStartIni))
+ if (!module.isEnabled() || (transitive && has_ini_lines) || (topLevel && !FS.exists(startd_ini) && !appendStartIni))
{
// File BufferedWriter
BufferedWriter writer = null;
@@ -412,9 +412,9 @@ public class Main
// Create the directory if needed
FS.ensureDirectoryExists(start_d);
FS.ensureDirectoryWritable(start_d);
- source = short_ini;
+ source = short_startd_ini;
StartLog.info("%-15s initialised in %s (created)",name,source);
- writer = Files.newBufferedWriter(ini,StandardCharsets.UTF_8,StandardOpenOption.CREATE_NEW,StandardOpenOption.WRITE);
+ writer = Files.newBufferedWriter(startd_ini,StandardCharsets.UTF_8,StandardOpenOption.CREATE_NEW,StandardOpenOption.WRITE);
out = new PrintWriter(writer);
}
@@ -463,9 +463,9 @@ public class Main
}
}
}
- else if (FS.exists(ini))
+ else if (FS.exists(startd_ini))
{
- StartLog.info("%-15s initialised in %s",name,short_ini);
+ StartLog.info("%-15s initialised in %s",name,short_startd_ini);
}
else
{
@@ -475,7 +475,7 @@ public class Main
// Also list other places this module is enabled
for (String source : module.getSources())
{
- if (!short_ini.equals(source))
+ if (!short_start_ini.equals(source))
{
StartLog.info("%-15s enabled in %s",name,baseHome.toShortForm(source));
}

Back to the top