Commit Graph

66 Commits

Author SHA1 Message Date
Joakim Erdfelt 600ae6043b Bug 363415 - Update start.ini DEBUG enable
+ Fixing syntax for DEBUG of eclipse jetty specific classes.
2011-12-08 11:06:06 -07:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jan Bartel ab12d04527 Add commented out System property setting for forcing ecj compiler for jsps 2011-11-15 13:57:47 +11:00
Jesse McConnell 6cd07bfc86 [Bug 362249] update shell scripts to jetty8 2011-11-02 15:02:40 -05:00
Jan Bartel f1b743a114 Enable annotations by default (because they are needed by servlet 3.0) 2011-07-11 18:00:34 +10:00
Greg Wilkins fb477ee1bd 348652 jetty.sh starts two unix processes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3413 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 05:57:38 +00:00
Jesse McConnell 898470696c updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:41:15 +00:00
Greg Wilkins 5223f6f77c 345543 Always close endpoint on SSLException
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3125 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 08:00:29 +00:00
Greg Wilkins 08b19babd2 refine demo for overlays
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3064 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:34:04 +00:00
Michael Gorovoy 09df9f668c 335361 Fixed 'jetty.sh check' to show current PID when JETTY_PID env. variable is set
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2690 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-25 20:36:20 +00:00
Joakim Erdfelt fa60b0605f 328872 - Multi Jetty xml files not loading if directory is referenced in jetty.conf
* Fixed foreach variable name. changed from bad mix of "file" and "FILE"
  to a more consistent "XMLFILE" variable.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2649 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-11 00:36:47 +00:00
Joakim Erdfelt 892bd690e0 Bug 333771 - System properties are not available inside XML configuration
file by using the 'property' tag.

* Made lookups of Properties by the Start Config use Jetty Property then
  System Properties, and lastly default values when requested.
* Made XmlConfiguration use layered property lookup from Start Config,
  benefitting XmlConfiguration of the same logic.
* Made all use of Start Config.getProperty() use static references
  per the method signature.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2646 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 18:10:15 +00:00
Jesse McConnell 4f20646380 clean up distro a bit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2577 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:29:54 +00:00
Greg Wilkins d261713cf4 better doco
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2556 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-25 02:44:35 +00:00
Jesse McConnell d2302aa78e another tactic for src distro
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2351 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 19:51:00 +00:00
Jesse McConnell 8d653102d7 Bug 297154 add source artifact to distro
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2320 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-06 19:20:56 +00:00
Jesse McConnell fd0009f589 add javadoc.xml context to serve out the jetty documentation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2315 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-04 21:43:33 +00:00
Greg Wilkins 16caeeb478 320073 template deployments
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2203 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-03 00:41:57 +00:00
Greg Wilkins 8bc63b4b1e 316976 removed quotes of JAVA_OPTIONS in jetty.sh
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2021 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-17 00:53:35 +00:00
Joakim Erdfelt 9c423e9c54 316970 - jetty.sh fails to find JETTY_HOME in standard directories
Reworked JETTY_HOME lookup to be more clear and resilient.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2018 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 21:25:30 +00:00
Joakim Erdfelt 01a2e3ff1c 316973 - jetty.sh claims java installation is invalid
Reworked jetty.sh to NOT check for JAVA_HOME, but instead
check for java from JAVA environment variable (optional)
or use $(which java) to find java itself.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2017 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 20:52:04 +00:00
Joakim Erdfelt b65e7debb2 316555 jetty.sh throws errors/warnings in older bash version
Fixing syntax of expr to be more resilient.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1990 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 23:15:27 +00:00
Joakim Erdfelt e2c544b375 Fixing --daemon use
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1969 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 23:59:37 +00:00
Joakim Erdfelt 5a6d8a65c3 Cleaning up CH_USER
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1968 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 23:53:31 +00:00
Joakim Erdfelt a518e97491 Moving --daemon out from all actions to just start
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1966 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 23:40:32 +00:00
Joakim Erdfelt 949ccb5598 Making CONFIGS check less strict
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1965 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 23:20:21 +00:00
Joakim Erdfelt a884f721f4 315748 - Remove special case --fromDaemon from start.jar
Implementing change in jetty.conf per new --pre={} logic.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1938 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 22:20:07 +00:00
Joakim Erdfelt 8d82a4a6f1 315687 - included init script broken
Implementing change suggested by Brad Larson.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1937 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 22:17:50 +00:00
Joakim Erdfelt 465e9f91da Adding --daemon back now that work in jetty-start is settled
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1936 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 21:32:12 +00:00
Greg Wilkins cf039140fb 315748 added --pre support in start.jar
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1929 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 00:02:08 +00:00
Greg Wilkins b3c156a988 315748 Removed --fromDaemon from start.jar
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1919 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 11:02:16 +00:00
Joakim Erdfelt b90b7dcc15 314009 'BindException: Address already in use' when explicitly specifying jetty.xml configuration file on command line
Fixing jetty.sh to not include jetty.xml on command line.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1869 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-25 22:19:48 +00:00
Greg Wilkins 0a4ebb3cc6 fixed readme
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1845 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 20:36:28 +00:00
Joakim Erdfelt c23ffe7896 Adding back --fromDaemon accidentally removed in r784
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1772 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-12 22:53:44 +00:00
Greg Wilkins 8cc05dff98 JSP cleanup
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1726 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-05 17:50:07 +00:00
Joakim Erdfelt dda5342db0 Ensuring directories exist for linux-packaging efforts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1665 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 21:17:09 +00:00
Joakim Erdfelt 1b90cea30e JETTY-1030 - Improve jetty.sh script
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1661 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 20:53:52 +00:00
Greg Wilkins 4fe6fa388f 310094 Improved start.jar usage and config files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1548 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 12:59:40 +00:00
Greg Wilkins 62135a39be 309765 Added JSP module
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1529 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-20 08:49:19 +00:00
Greg Wilkins 5c3d1535e9 demo improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1429 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-31 13:49:37 +00:00
Greg Wilkins 3940e66ab3 added ext to default start.ini
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1275 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-18 04:04:20 +00:00
Greg Wilkins f9455c7712 demo websocket implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1087 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-23 08:44:37 +00:00
Jesse McConnell 12f440c894 replace contents.html with README explaining how to access javadocs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@914 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 02:35:39 +00:00
Jesse McConnell 041a469f4f make sure the META-INF is not going into assembly
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@912 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 02:26:08 +00:00
Jesse McConnell 35e905c88c update readme and remove file
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@910 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 02:19:31 +00:00
Greg Wilkins 08ac66ba1f improved start.ini
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@772 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-27 07:38:40 +00:00
Greg Wilkins 2c4db31b34 287496 Use start.ini always and added --exec
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@760 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-25 08:54:14 +00:00
Greg Wilkins 8acd4ab72c readded jetty-distribution
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@669 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-09 23:42:32 +00:00
Jesse McConnell 8ee6a5a858 removing jetty-distribution as it is not allowed for IP reasons
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@607 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-29 20:35:12 +00:00