Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-10-29 22:31:14 +0000
committerJoakim Erdfelt2014-10-29 22:31:14 +0000
commit733cc71791eefc3db26b2e40dc09a417177f4c47 (patch)
tree63ae9fb229c8dc0e56ba4852c2805509bc498691 /jetty-start
parent7c40c0e2be904f64cd5556f46db8131a474959dc (diff)
downloadorg.eclipse.jetty.project-733cc71791eefc3db26b2e40dc09a417177f4c47.tar.gz
org.eclipse.jetty.project-733cc71791eefc3db26b2e40dc09a417177f4c47.tar.xz
org.eclipse.jetty.project-733cc71791eefc3db26b2e40dc09a417177f4c47.zip
Reworking jetty.home warning to be a module instead.
+ This will cause it to be logged using the configured logger as well.
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/BaseHomeWarning.java38
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Main.java6
2 files changed, 0 insertions, 44 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHomeWarning.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHomeWarning.java
deleted file mode 100644
index e7dffabc9f..0000000000
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHomeWarning.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// ========================================================================
-// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-//
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
-//
-
-package org.eclipse.jetty.start;
-
-import org.eclipse.jetty.start.Props.Prop;
-
-public class BaseHomeWarning
-{
- public static void show(Props props)
- {
- Prop showWarn = props.getProp("org.eclipse.jetty.start.home.warning",true);
- if (showWarn == null || Boolean.parseBoolean(showWarn.value))
- {
- if (!Main.printTextResource("org/eclipse/jetty/start/base-home-warning.txt"))
- {
- StartLog.warn("It is not recommended to run Jetty from within {jetty.home}");
- StartLog.warn("Use a proper {jetty.base} setup");
- StartLog.warn("See: http://www.eclipse.org/jetty/documentation/current/startup.html");
- }
- }
- }
-}
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 ba0e2aa681..3d70195556 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
@@ -780,12 +780,6 @@ public class Main
return;
}
- // Warning Message
- if (!baseHome.isBaseDifferent() && args.isNormalMainClass())
- {
- BaseHomeWarning.show(args.getProperties());
- }
-
// execute Jetty in another JVM
if (args.isExec())
{

Back to the top