Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-10-28 17:28:17 +0000
committerJoakim Erdfelt2014-10-28 17:28:17 +0000
commitaf5f9382a4f063f36c0fdc95121bfb597a91a4c9 (patch)
treef671d4bd17f9e634f59aebd0e404b1b8262f71cd /jetty-start/src/main/resources/org/eclipse/jetty
parentf4f600ff056c9808543619d1cc47987ec9cd4a24 (diff)
downloadorg.eclipse.jetty.project-af5f9382a4f063f36c0fdc95121bfb597a91a4c9.tar.gz
org.eclipse.jetty.project-af5f9382a4f063f36c0fdc95121bfb597a91a4c9.tar.xz
org.eclipse.jetty.project-af5f9382a4f063f36c0fdc95121bfb597a91a4c9.zip
449001 - Remove start.d directory from JETTY_HOME
+ Reworking warning to be optional but still start Jetty also. + Leaving start.d out of {jetty.home} still.
Diffstat (limited to 'jetty-start/src/main/resources/org/eclipse/jetty')
-rw-r--r--jetty-start/src/main/resources/org/eclipse/jetty/start/base-home-warning.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/base-home-warning.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/base-home-warning.txt
index c0fa8298ba..a34bfdba7e 100644
--- a/jetty-start/src/main/resources/org/eclipse/jetty/start/base-home-warning.txt
+++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/base-home-warning.txt
@@ -1,15 +1,16 @@
-WARNING
--------
+============================================================================
+WARNING: Jetty is starting using LEGACY behavior.
-While it is possible to run Jetty from within {jetty.home},
-it is not recommended that you run Jetty this way.
+A proper {jetty.base} should be configured with no changes being made to the {jetty.home} directory.
-Please setup a proper {jetty.base}.
+Please see http://www.eclipse.org/jetty/documentation/current/startup.html
-See http://www.eclipse.org/jetty/documentation/current/startup.html
+A demo-base directory has been provided as an example of this setup.
-The demo-base has been provided to you for an example of this kind of setup.
+ $ cd demo-base
+ $ java -jar ../start.jar
- $ cd demo-base
- $ java -jar ../start.jar
+This warning may be disabled by setting the system property
+ -Dorg.eclipse.jetty.start.home.warning=false
+============================================================================

Back to the top