Commit Graph

800 Commits

Author SHA1 Message Date
Joakim Erdfelt 88900593de Fixing 2 typos 2014-11-17 13:56:55 -07:00
Joakim Erdfelt dbf6f2e644 451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
+ Cleaning up entire base buildout into BaseBuilder class
+ The management of the configuration is maintained in
  - StartDirBuilder
  - StartIniBuilder
+ The buildout of the directories from the [files] section is now
  maintained by the BaseBuilder itself.
+ Using new FileInitializer system as well
+ Using new Licensing system as well
2014-11-17 13:21:01 -07:00
Joakim Erdfelt 61e480c2c1 451974 - Combine multiple start license acknowledgement into one
+ Initial work to combine licensing into a single event
  Depends on work from bug #451973
2014-11-17 13:20:12 -07:00
Joakim Erdfelt 453ab6d5c7 Supporting optional use of maven local repository for download content 2014-11-14 12:15:07 -07:00
Joakim Erdfelt ccaddc5d43 Working on utility to update maven refs 2014-11-14 09:53:18 -07:00
Joakim Erdfelt 15bf5b02f8 Updating Main.initFiles() to be extensible 2014-11-13 14:23:26 -07:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Greg Wilkins 50b6391be1 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-11-05 10:36:57 +11:00
Joakim Erdfelt 04fc803b0e 448446 - org.eclipse.jetty.start.Main create classloader duplicate
+ Reuse ClassLoader instead.
2014-11-04 15:04:30 -07:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Joakim Erdfelt 1d88eab518 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2014-11-03 10:19:49 -07:00
Joakim Erdfelt 214246061e 449291 - --create-files downloads without license
+ Adding dist-home replicationa real distribution
  Adding RebuildTestResources.java to help rebuild this dist-home
  occasionally.  There is no need to keep this directory up to date
  as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
2014-11-03 10:18:18 -07:00
Joakim Erdfelt 153dd4023e Removing support for module [ini-template] use of --module=<name>
+ That form of use is not recommended during --add-to-start
+ Should encourage use of [depend] section instead
2014-11-03 09:19:05 -07:00
Joakim Erdfelt 83e3a29fbd 449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-11-03 09:19:05 -07:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Joakim Erdfelt 43b3cd9f46 449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-10-30 15:05:24 -07:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Greg Wilkins a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Joakim Erdfelt 7cbd3c0488 440925 - NPE when using relative paths for --start-log-file 2014-10-29 16:25:55 -07:00
Joakim Erdfelt 8899f6d360 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt 733cc71791 Reworking jetty.home warning to be a module instead.
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Joakim Erdfelt 7c40c0e2be Removing 2 second sleep 2014-10-29 14:33:46 -07:00
Joakim Erdfelt 8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Joakim Erdfelt af5f9382a4 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.
2014-10-28 10:28:17 -07:00
Joakim Erdfelt f4f600ff05 Code cleanup (post-merge) 2014-10-28 09:45:25 -07:00
Joakim Erdfelt 607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -07:00
Joakim Erdfelt 653cb32ede Adjusting start/run warning messages on missing file content.
+ Leaving behavior of missing directories alone.
+ See bug #427204 for old behavior bug
2014-10-28 09:35:11 -07:00
Joakim Erdfelt 9dd0db8eeb 449001 - Remove start.d directory from JETTY_HOME
+ Removed start.d from {jetty.home}
+ Removed most of start.ini content as well
+ DID NOT remove or alter start.d functionality from start.jar
+ DID NOT remove or alter demo-base/start.d/ example
+ Made running jetty from {jetty.home} simply show a warning message
+ DID NOT remove ability to run jetty from {jetty.home}
  Just made it a manual process requiring intention on behalf of the
  user
2014-10-28 09:04:25 -07:00
Simone Bordet 7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell 3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell 4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05:00
Joakim Erdfelt 6ff43a0af1 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-27 13:42:30 -07:00
Simone Bordet 6268421dd0 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 18:05:12 +02:00
Simone Bordet 6f42d21ed5 446063 - ALPN Fail SSL Handshake if no supported Application Protocols. 2014-10-16 15:31:24 +02:00
Simone Bordet 890d7a8d1f Merged branch 'jetty-9.2.x' into 'master'. 2014-10-13 22:01:20 +02:00
Simone Bordet 9796457dfc 446672 - NPN Specification issue in the case no protocols are selected. 2014-10-13 21:27:11 +02:00
Greg Wilkins 758ce66c8d Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-websocket/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt 67db9e67de Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-09 12:42:14 -07:00
Joakim Erdfelt 2f696e87bd 445258 - STOP.WAIT is not really respected
Fixing stupid typo / copy / paste bug
2014-10-08 15:01:05 -07:00
Joakim Erdfelt bf7637a2df Reworking cdi-webapp-it to also use new cdi module 2014-09-26 17:16:35 -07:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Greg Wilkins 5507e267ae Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/config/etc/jetty-https.xml
	jetty-server/src/main/config/modules/ssl.mod
	jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
Greg Wilkins 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
Greg Wilkins b02cdc10c1 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-22 16:11:47 +10:00
Greg Wilkins 589d05afe0 Added 3rd party module licenses 2014-08-22 11:48:55 +10:00
Greg Wilkins 23eba39748 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-21 16:39:45 +10:00
Greg Wilkins af27566d2b fixed JSP issues 2014-08-21 11:42:21 +10:00
Greg Wilkins c1b66a3ea3 Fixed start.jar property as properties issue 2014-08-21 10:45:28 +10:00
Joakim Erdfelt 7700d1ce53 Testcase is sensitive to System Property from other tests.
+ Making the testcase for PathFinderTest not discover jetty.base, as
  this value can be obtained from System Property (set from another
  test case) giving false success/failure based on run order.
2014-08-19 10:33:04 -07:00
Greg Wilkins b47f9ef605 cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
Greg Wilkins 287e86b7aa decomposed https,http2 and spdy modules to share ServerConnector 2014-08-07 12:58:12 +10:00
Joakim Erdfelt cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins a537fefd6b Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-18 15:28:54 +10:00
Joakim Erdfelt e39adb337f 439672 support using Apache commons daemon for managing Jetty
Signed-off-by: marko asplund <marko.asplund@gmail.com>
2014-07-17 08:37:50 -07:00
Greg Wilkins 6eceb6bd99 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-29 08:11:41 +02:00
Joakim Erdfelt 6faf94e4c1 437462 - consistent test failure in jetty-start under windows
+ Fixing up logic to be more lenient for case insensitive nature of
  microsoft windows (it was tripping up over C:\ vs c:\ difference)
2014-06-26 15:29:05 -07:00
Simone Bordet e63ceabafe Merged branch 'origin/master' into 'jetty-http2'. 2014-06-25 17:29:36 +02:00
Joakim Erdfelt bad3165d8a Fixing jdk 8 test failure 2014-06-25 08:24:24 -07:00
Joakim Erdfelt e48cdb519b 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Fixing typo in enableModule()
+ Fixing concurrent modification exception during walk of parents in
  enableModule()
2014-06-23 21:23:17 +02:00
Joakim Erdfelt d92f6c6fd3 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Fixing typo in enableModule()
+ Fixing concurrent modification exception during walk of parents in
  enableModule()
2014-06-19 10:18:51 -07:00
Simone Bordet 59deebeb9c Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-19 16:26:58 +02:00
Joakim Erdfelt 605f32b022 Adding extra tests for bad startup configurations 2014-06-18 10:32:38 -07:00
Joakim Erdfelt 4ba530b5ad 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Adding test cases for jsp-impl usecase that triggered this bug.
2014-06-17 10:42:04 -07:00
Joakim Erdfelt 5fa564efa8 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Initial edits to support loading of Module [INI-TEMPLATE] section
  as default values for the enabled module.
2014-06-17 10:42:04 -07:00
Simone Bordet 334db9fe72 Updated version to 9.3.0-SNAPSHOT. 2014-06-16 21:33:03 +02:00
Simone Bordet 424e421439 Added JDK 7u60 files and configuration for NPN and ALPN. 2014-06-11 18:45:45 +02:00
Simone Bordet 330d8f9ea9 Added JDK 7u60 files for NPN and ALPN. 2014-06-11 18:44:54 +02:00
Greg Wilkins 5883123d07 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-10 09:01:21 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Jesse McConnell 10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Joakim Erdfelt 7790ba9657 432192 - jetty-start / Allow JETTY_LOGS use for start-log-file
+ Internal initialization & validation of start-log-file is
  done via BaseHome.getPath(String) to allow the path to be
  anywhere on the filesystem, not just under ${jetty.base}
2014-06-06 12:33:57 -07:00
Joakim Erdfelt 646d85a68b 436388 - Allow case-insensitive STOP.KEY and STOP.PORT use
+ Internal (to start.jar) use of properties are now case-insensitive
2014-06-06 12:30:00 -07:00
Joakim Erdfelt 11b08b77e6 436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Updating usage.txt to indicate new use of "|"
2014-06-06 12:25:28 -07:00
Joakim Erdfelt 0c54ad2f20 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Updating usage.txt
2014-06-06 08:40:52 -07:00
Joakim Erdfelt 5f8ed9519b Restore Origin/Source information of raw arguments from ConfigSource(s)
+ Change will remember where each raw argument from a DirConfigSource
  comes from (previously only remembered the origin of properties)
2014-06-04 15:48:58 -07:00
Joakim Erdfelt 7ee2f4e367 Fixing extraneous output and duplicate ${jetty.base}/${jetty.base} references when using --add-to-startd 2014-06-04 11:24:42 -07:00
Joakim Erdfelt d31811f067 436520 - Start / Allow https and file urls in jetty-start's module download mechanism
+ Work to enable this mostly performed in Bug #436524
+ Some minor work to add more tests for this new syntax.
2014-06-04 11:14:35 -07:00
Greg Wilkins bb4d42f139 Merge remote-tracking branch 'origin' into jetty-http2 2014-06-04 15:09:19 +02:00
Greg Wilkins 8f4aeeeb8d updated version to 10.0.0-SNAPSHOT 2014-06-04 15:08:54 +02:00
Joakim Erdfelt bbab2e7832 436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Switching out support for ":" to "|"
2014-06-03 17:09:48 -07:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell 8936b160c2 Merge branch 'master' into release-9 2014-05-26 10:46:39 -05:00
Joakim Erdfelt bbd3774e38 Adjusting --exec to [exec] 2014-05-26 07:43:57 -07:00
Greg Wilkins 92ffcfc0f8 expand properties on command line for exec 2014-05-26 16:16:33 +02:00
Greg Wilkins 0d70ae87b2 turn off startlog redirect when starting 2014-05-26 00:46:32 +02:00
Greg Wilkins 5edf15241b started mechanism uses Properties
list Properties in --dry-run
fix start log file
2014-05-25 22:54:15 +02:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00