Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,947 Commits 75 Branches 465 Tags 370 MiB
Commit Graph

755 Commits

Author SHA1 Message Date
Jan Bartel 2dd5fec4f4
Issue #2740 Ensure OSGiWebappClassLoader uses bundleloader for all loadClass methods. (#2804) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-09-11 12:04:31 +10:00
olivier lamy 32912b922d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-06 17:39:57 +10:00
olivier lamy 1504b7da93 Revert "Issue #2431 - Upgrade to Junit 5 (#2436)" 
This reverts commit e24fc48539.
 2018-09-06 09:27:11 +10:00
olivier lamy 8a05c651c0 Revert "fix merging" 
This reverts commit a3e4a08903.
 2018-09-06 09:26:57 +10:00
olivier lamy a3e4a08903 fix merging 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-09-05 22:05:18 +10:00
Joakim Erdfelt e24fc48539 Issue #2431 - Upgrade to Junit 5 (#2436) 
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-09-05 21:27:18 +10:00
Joakim Erdfelt a3f1592c50 Issue #2431 - Upgrade to Junit 5 (#2436) 
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-09-05 10:07:17 +10:00
WalkerWatch 90f15f278b 9.4.x->10.0.x 2018-08-27 22:58:01 -04:00
Jan Bartel 09be34e08b
Issue #2844 Clean up webdefault and DefaultServlet documentation (#2851) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-08-28 09:53:06 +10:00
Greg Wilkins 5afe2e215f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-23 17:17:46 +10:00
Joakim Erdfelt a90c28bde8 Issue #2835 - Use original WAR Resource for lastModified 
+ During WebInfConfiguration.unpack()
  If you have WebAppContext declared with .setWar()
  and it points to a file on the filesystem, use that
  original PathResource object to determine lastModified()
  instead of the forced JarFileResource.
  This is done to avoid URLConnection caching that prevents
  the original WAR file from being deleted / replaced on
  MS Windows.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-08-21 16:39:31 -05:00
Greg Wilkins f15bd225b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-21 14:47:19 +10:00
Kazuhiro Sera 96218e8bc4 Fix typos detected by github.com/client9/misspell 
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
 2018-08-10 23:52:16 +09:00
Joakim Erdfelt 30f6132117 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-07-03 10:55:22 -05:00
Simone Bordet 253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. (#2665) 
* Fixes #2663 - Guard Throwable.addSuppressed() calls.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-14 15:21:44 +02:00
Matthias Perktold f901efc413 Issue #2662 - Unnecessary boxing conversions 
Signed-off-by: Matthias Perktold <tias251@gmail.com>
 2018-06-13 16:20:12 +02:00
Joakim Erdfelt 8763c6065d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-04-20 11:32:46 -05:00
Olivier Lamy f36eba4577
class.newInstance is deprecated #2435 (#2437) 
* Class.newInstance() is deprecated in Java 9+ #2435

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-17 19:07:20 +10:00
Joakim Erdfelt 1c04f9838d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-22 16:42:42 -05:00
Joakim Erdfelt 9c68b141ba Issue #2361 - CachingWebAppClassLoader using cache properly 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-03-20 09:30:31 -05:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Greg Wilkins bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality 
Resolved errorprone ReferenceEquality warnings #2206
 2018-03-07 11:11:40 +11:00
Joakim Erdfelt e3e3f9eb0b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-06 11:16:25 -06:00
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206 
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-03-01 13:59:25 +11:00
Lachlan Roberts 0cfc25d4ed Resolved errorprone ReferenceEquality warnings #2206 
Objects which inherit or implement an `equals()` method should not be compared with == or !=
When the comparison of references is intentional `@SuppressWarnings("ReferenceEquality")` can be used

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-02-28 14:26:02 +11:00
olivier lamy 0b13e6cddd fix error prone error 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-02-19 15:00:59 +10:00
Joakim Erdfelt c9dd17bf9a
Merge pull request #2110 from eclipse/issue-1602-deployer-error 
Issue #1602 - Deployment Error should fail fast
 2018-02-08 08:44:19 -06:00
Joakim Erdfelt f3c36f804a Issue #1602 - Reverting AbstractLifeCycle changes per review 2018-01-11 16:16:26 -06:00
Joakim Erdfelt 4ba0277c37 Issue #1602 - Requested fixes to StandardStarter and AbstractLifeCycle 2018-01-11 10:00:39 -06:00
Joakim Erdfelt ce84ca35fb Issue #1602 - LifeCycle FAILED fixes 
+ AbstractLifeCycle.setFailed(Throwable) is now protected, so
  that the odd usages from WebAppContext.doStart() can be supported
+ The AbstractLifeCycle.doStart() now checks for state == FAILED
 2018-01-11 09:36:05 -06:00
Joakim Erdfelt 1440b2d1fa Issue #1602 - WebAppContext Deployment fail should be on Throwable, not Exception 2018-01-09 11:58:57 -06:00
Joakim Erdfelt 650b804142 Issue #2108 - Updating license headers for year 2018 2018-01-09 10:14:52 -06:00
Joakim Erdfelt d5a0878019 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 10:08:30 -06:00
Joakim Erdfelt 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Greg Wilkins 45e3abbdcf Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 13:17:32 +01:00
olivier lamy e07ba49283 more javadoc fixes #2056 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-12-29 11:07:51 +11:00
Jan Bartel 78a2c8c6d2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-06 15:46:49 +01:00
Jan Bartel b1c80ba231
Issue #1986 ServletContextHandler.Context addListener() methods support session listeners (#2000) 
* Issue #1986 Support session listeners in ServletContextHandler.addEventListener method.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-11-30 15:03:37 +01:00
Jan Bartel 7f6e2e8dd0 Issue #1933 
Cherry-pick of 29373c6 and 44d170e
 2017-11-22 13:53:38 +01:00
Jan Bartel 406ebd9fe4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-16 15:32:41 +01:00
Jan Bartel 98d8c2400d Issue #1933 
Add some comments, changes from code review.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-11-16 10:01:44 +01:00
Jan Bartel 12327b8876 Issue #1933 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-11-15 10:33:51 +01:00
Greg Wilkins bdaeb657f6 Pull Request #1824 Fixed merged into Jetty-10 2017-10-31 18:01:53 +11:00
Jan Bartel 050d593056 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 16:45:31 +11:00
Greg Wilkins 5de895af88 Issue #1797 
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
 2017-10-17 15:06:09 +11:00
Jan Bartel ee4fd24cb1 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-27 15:44:55 +10:00
Jan Bartel d81b835ad0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-27 12:19:54 +10:00
Jan Bartel 49b2823ee9 Merge pull request #1824 from jglick/WebAppClassLoader.addJars-ordering 
Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order
 2017-09-27 11:12:39 +10:00
Jan Bartel e3bec841da Issue #1838 2017-09-26 16:07:18 +10:00
Jesse Glick 7c460c7ea2 Apparently WebAppClassLoaderUrlStreamTest.testResources was already being skipped, so probably it is acceptable to skip .ordering in the same way. 2017-09-25 19:10:24 -04:00
Jesse Glick 1ffbf15fc1 @janbartel guided me to an analogue of WebAppClassLoaderTest.ordering. 2017-09-25 18:36:42 -04:00
Jesse Glick fe0a0ead37 Minimizing diff lines at @janbartel’s request. 2017-09-25 18:21:01 -04:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Jan Bartel d2064599b8 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-21 13:59:17 +10:00
Jesse Glick 8aa954a3c7 @janbartel suggests applying sorting also to WebInfConfiguration.findWebInfLibJars. 2017-09-19 12:29:24 -04:00
Greg Wilkins 219b61f5b4 Issue #1797 
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
 2017-09-19 13:40:59 +10:00
Jesse Glick ac61f0e968 Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order. 
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
 2017-09-18 16:20:53 -04:00
Jan Bartel 16498333a4 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-13 15:36:25 +10:00
Jan Bartel 5aa92552bd Issue #1809 2017-09-13 11:42:17 +10:00
Jan Bartel ec9a881941 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-08-30 11:30:21 +10:00
Greg Wilkins 8e02bfef36 Issue #1499 ClasspathPattern module support 
More efficient implementation that precomputes Path and modules
 2017-08-26 09:50:19 +10:00
Greg Wilkins 1d1ba56c88 Issue #1499 ClasspathPattern module support 
Added simple but inefficient implementation for jrt matching
 2017-08-26 09:50:08 +10:00
Greg Wilkins e462fb2648 Issue #1499 ClasspathPattern module support 
More efficient implementation that precomputes Path and modules
 2017-08-24 10:11:55 +10:00
Greg Wilkins 578afa0f5e Issue #1499 ClasspathPattern module support 
Added simple but inefficient implementation for jrt matching
 2017-08-24 09:58:50 +10:00
Jan Bartel b7abc465e4 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-08-17 13:18:46 +10:00
Simone Bordet c53f4cdd63 Merged branch 'jetty-9.4.x' into 'master'. 2017-08-16 12:54:03 +02:00
Simone Bordet aea4b784b5 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-16 12:53:35 +02:00
Jan Bartel 9e46353988 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-08-15 16:36:24 +10:00
Greg Wilkins 8e7cdd8371 Updated for servlet 4.0 schemas 2017-08-15 15:33:11 +10:00
Greg Wilkins 7af59b8cc2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-15 12:43:07 +10:00
Greg Wilkins 3689f94bd1 cleaned up webapp xsd imports 2017-08-15 12:42:32 +10:00
Jan Bartel 2acb97db2f Issue #1640 
Replay changes after change to jetty-9.4.x base branch.
 2017-08-10 13:56:05 +10:00
Joakim Erdfelt 3ec5f8fa3d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-09 16:21:08 -07:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x 
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
 2017-08-08 09:47:04 -07:00
Greg Wilkins 76981a0a15 Fixed #1715 standardise XML properties and IDs 2017-08-08 09:16:08 -07:00
Greg Wilkins f297096716 Fix #1653 2017-08-08 09:14:09 -07:00
olivier lamy 8095da3848 try to fix web fragment for directory classes #1623 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-08-08 09:13:52 -07:00
Greg Wilkins 2443ca34f3 Issue #1676 remove deprecated methods from WebAppContext 2017-07-19 11:49:27 +02:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 5b6b80ef81 Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11 2017-07-12 11:18:20 -07:00
Joakim Erdfelt 7129fa7b9b Merge pull request #1644 from olamy/feature/maven_plugin_its 
add maven plugin its tests
 2017-07-10 16:37:09 -07:00
Joakim Erdfelt ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
Greg Wilkins 7e46285149 Fix #1653 2017-06-29 08:12:11 +02:00
olivier lamy 52fa23b968 try to fix web fragment for directory classes #1623 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-06-23 20:35:59 +10:00
Greg Wilkins 32bc9292a2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-31 11:56:47 +02:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570) 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2017-05-30 21:46:11 +02:00
Simone Bordet 311b9fbab0 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-17 13:16:45 +02:00
Jan Bartel 4eca47cdf4 Issue #1558 2017-05-17 11:21:18 +02:00
Joakim Erdfelt 1819fed959 Fixing javadoc errors 2017-05-15 08:58:12 -07:00
Greg Wilkins b5a3eb1f70 removed Configuration marker classes 2017-05-11 11:32:23 +02:00
Greg Wilkins 1fc046fb3d renamed for clarity 2017-05-09 09:52:20 +02:00
Greg Wilkins 0326af2ce9 renamed for clarity 2017-05-09 09:19:54 +02:00
Simone Bordet cab1ec77ad Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 10:03:30 +02:00
Jan Bartel 84bc74754d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-01 17:53:38 +02:00
Jan Bartel 5f65f2916f Issue #1390 
Remove this.web_url.path
 2017-05-01 17:37:05 +02:00
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Greg Wilkins 9e65d1ebcb Issue #1505 
* minor cleanups of ClasspathPattern
* defined jetty.home.uri and jetty.base.uri in start.jar and webapp configuration properties
* minor cleanup of start.jar property handling (more needed)
* updated location classpathpatterns in modules
 2017-04-26 14:54:37 +02:00
Greg Wilkins a3ace98a8d Issue #1448 
Optimized excluded by name handling
 2017-04-26 13:50:58 +02:00
Joakim Erdfelt 6ca9bacee6 Issue #1448 - Eliminating Resource creation from TypeUtil.getLoadedFrom() 
+ Replaced with URI TypeUtil.getLocationOfClass(Class clazz)
+ and File TypeUtil.getLocationOfClassAsFile(Class clazz)
+ This is done to eliminate extraneous "new URL" and "URI.toURL" calls
  that can trigger URL Stream Handler creation and initialization
  which is the cause of the StackOverflowError
 2017-04-26 13:43:35 +02:00
Simone Bordet 99e5b118bd Fixes to make code compatible with JDK 9. 2017-04-24 11:04:05 +02:00
Simone Bordet 20ac0dbb76 Code cleanup. 2017-04-24 11:04:05 +02:00
Joakim Erdfelt 2f870b0923 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-04-20 06:13:47 -07:00
Greg Wilkins 6bb8f793a3 Fixed #1487 #1486 2017-04-20 14:32:54 +10:00
Joakim Erdfelt 9e15e01f36 Allowing URLStreamHandler test to exist in codebase, but not run in CI 2017-04-19 18:01:12 -07:00
Jan Bartel 70160c5b3f Issue #1467 2017-04-13 16:49:55 +10:00
Greg Wilkins c4f2be4cfa Issue #1454 convenience methods 2017-04-11 10:09:33 +10:00
Simone Bordet 7f94aacdcd Merged branch 'jetty-9.4.x' into 'master'. 2017-04-06 10:54:18 +02:00
Joakim Erdfelt 59bd12edcf Disabling test that modifies java.net.URL class 2017-04-05 10:48:18 -07:00
Joakim Erdfelt 71892ffa3a Test fix 2017-04-05 09:08:02 -07:00
Joakim Erdfelt 3aeb8dbd78 Merge remote-tracking branch 'origin/jetty-9.4.x' 
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
 2017-04-05 06:47:25 -07:00
Joakim Erdfelt 9cdf8b0468 Issue #1449 - Removing unused / broken __jvmLib reference 2017-04-04 09:18:37 -07:00
Joakim Erdfelt f53776628f Issue #1448 - Reduce unncessary URL creation 2017-04-04 09:08:44 -07:00
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11:00
Jan Bartel 976ffb7ecd Issue #877 
And also #1117
 2017-03-23 11:24:22 +11:00
Greg Wilkins 998788d9fa Issue #1384 Revert change as module modifies the classpath 2017-03-16 10:45:32 +11:00
Joakim Erdfelt 92afe54c1d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-10 13:22:32 -07:00
Joakim Erdfelt e25007cb79 Issue #1390 - Addressing new File(URL) use in Windows 
+ Fixing HashLoginService to track its Config via File reference only
  (dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
 2017-03-10 12:47:06 -07:00
Greg Wilkins c366934d30 Issue #1384 Expose StatisticsServlet 2017-03-09 16:03:43 +11:00
Greg Wilkins 7ef9d7c18d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-08 10:05:26 +11:00
Greg Wilkins 43d0488269 Issue #1384 Expose StatisticsServlet 2017-03-08 10:04:48 +11:00
Greg Wilkins 05f05520eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-07 07:55:36 +11:00
Greg Wilkins 1361b31beb Issue #1353. fixed growable Trie 2017-02-25 11:15:10 +09:00
Joakim Erdfelt 3c29947a0d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-15 11:54:57 -07:00
Joakim Erdfelt 0cd8d21bfd Issue #1331 - replacing with ${jetty.base.uri} form 2017-02-15 11:34:47 -07:00
Jesse McConnell 4543c73052 Merge branch 'jetty-9.4.x' 2017-01-28 16:24:15 -06:00
James Earl Douglas 590838f644
Replace contraction with possesive 2017-01-26 19:26:50 -07:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers" 
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
 2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Jan Bartel 8ea15f4214 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 20:17:20 +11:00
Simone Bordet 44c84ffb09 Fixes #1151 - NPE in ClasspathPattern.match(). 2016-12-07 22:28:01 +01:00
Jan Bartel bc96a8e0e6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-30 15:56:04 +11:00
Jan Bartel f64cdd46b8 Issue #1138 2016-11-30 15:55:40 +11:00
Jan Bartel 79c364368d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-24 15:51:06 +11:00
Jan Bartel 40d9e56d92 Issue #1117 2016-11-24 14:04:37 +11:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Jan Bartel 34f0015aa9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-21 16:37:13 +11:00
Jan Bartel 638045764e Issue #1018 2016-10-21 16:32:45 +11:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Greg Wilkins 02309d3510 Issue #984 Improve module listing 
Updated CSV operator
 2016-10-17 11:39:10 +11:00
Greg Wilkins f55cac9e9d fixed javadoc 2016-10-11 18:35:26 +11:00
Jan Bartel 6489d7fd23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-11 18:00:12 +11:00
Greg Wilkins d8b1c88abc Issue #984 Improve module listing 
Reworked logging modules
added support for ,= and += properties
 2016-10-07 12:48:47 +11:00
Jan Bartel f0c5c0f149 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-07 10:58:58 +11:00
Jan Bartel 97d18665ef Issue #963 
Remove debug and fix NPE
 2016-10-07 10:58:12 +11:00
Greg Wilkins 7310067954 updated global binding test 2016-10-06 12:58:15 +11:00
Greg Wilkins 84f7fc31cb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-06 12:01:50 +11:00
Greg Wilkins afb750515e Issue #963 Location based classpath pattern (#978) 
Issue #963 location based white/black classpath lists
- removed outdated annotations/ClassNameResolver
- implemented loadedFrom in TypeUtil
- created a growable Trie
- reimplemented classpathpattern
- simplified OSGi classloading
 2016-10-06 10:47:09 +11:00
Jan Bartel e0e445a4a2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-09 10:10:55 +10:00
Jan Bartel 7da797e834 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-09 10:10:22 +10:00
Jan Bartel a97665da3e Issue #913 2016-09-09 10:09:46 +10:00
Greg Wilkins 144ac3dcea fix #809 avoid ignored NPE 2016-08-05 11:46:19 +10:00
Greg Wilkins ee3163bad8 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-05 11:24:24 +10:00
Jan Bartel ef52208c71 Open up webappclassloader to SessionData for de-serialization of sessions 2016-08-05 11:16:57 +10:00
Jan Bartel 52f0858485 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-08 13:23:33 +10:00
Jan Bartel 5b5c8c3791 Issue #282 2016-07-08 13:23:00 +10:00
Joakim Erdfelt 6f88e74514 Merge branch 'jetty-9.4.x' 2016-06-29 15:12:53 -07:00
Joakim Erdfelt 2aa2f12eca Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:12:37 -07:00
Greg Wilkins 2b8416eb8a Fixes #673 match all classpath pattern 2016-06-29 14:06:27 +10:00
Greg Wilkins 8dd61c6d1c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:07:01 +10:00
Greg Wilkins e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
Greg Wilkins a8e315a3f5 Fix #663 NPE during context stop 
Avoid adding null beans
protect against null beans.
 2016-06-15 18:04:33 +10:00
Jan Bartel 11b85446e7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-10 12:32:08 +10:00
Jan Bartel e93f98951b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-10 12:18:33 +10:00
Robin Bygrave 95d6b9f39e Issue #628 resolve by checking for existing jar: prefix on uri - additional fix for scanForResources and scanForWebFragments 
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
 2016-06-09 23:03:52 +12:00
Robin Bygrave 3923b9bbf5 Issue #628 resolve by checking for existing jar: prefix on uri - format 
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
 2016-06-09 20:19:08 +12:00
Robin Bygrave 1494906b9d Issue #628 resolve by checking for existing jar: prefix on uri 
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
 2016-06-09 20:12:32 +12:00
Greg Wilkins bd2ac6a048 improve javadoc 2016-05-05 08:32:02 +10:00
Joakim Erdfelt 43ba169b43 Fixing broken javadoc 2016-05-04 13:35:15 -07:00
Greg Wilkins a5ad291add Squashed commit of the following: (#528) 
commit 4bf6b7c951
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 27 12:12:08 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 23 09:38:00 2016 +1000

    work in progress

commit 4e286266c0
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 16:34:12 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 12:12:24 2016 +1000

    Work in progress on Features

commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 22:05:55 2016 +1000

    Refactor Configurations.isEnabledByDefault, enable all configurations by default.

commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 17:32:22 2016 +1000

    Fix features for jsp with osgi

commit 22d2b251e9
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 14 16:19:43 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 13 15:36:36 2016 +1000

    code comment

commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 9 21:24:22 2016 +1000

    fixed quickstart validation

commit 154d58bf62
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:25:17 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:21:30 2016 +1000

    general cleanup of Configuration and ClasspathPattern usage

commit 65f8e5dbd0
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 09:15:28 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit ea1deda4f9
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 18:21:56 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 17:57:23 2016 +1100

    work in progress

commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 10:11:49 2016 +1100

    work in progress

commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 14:01:00 2016 +1100

    progress on OSGi

commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:52:33 2016 +1100

    Fixed plugin

commit f08b84ba0e
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:55 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:06 2016 +1100

    work in progress... all but OSGi

commit 2f15c3e4f9
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 16:52:43 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 36b5687329
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 07:20:05 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 04:41:30 2016 +1100

    Work in progress on Features

    Moved jar discovery to META-INF

commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 17:48:15 2016 +0100

    Work in progress towards new quickstart arch

commit c5c23698c4
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:29:18 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:04:35 2016 +0100

    Work in progress on Features for QuickStart

commit c5f0c80cd2
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 4 16:05:23 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 0e6d886b01
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 17:32:36 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit d1504055de
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 15:21:20 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 20:53:17 2016 +0100

    Features work in progress

    convert more server/system classes to Configurations

commit 037e04bfe5
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 17:11:04 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit add9876f83
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Feb 25 10:11:08 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5263f15acd
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 23 14:35:31 2016 +0100

    Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature

commit 89803aec95
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 16:09:38 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 11:21:13 2016 +0100

    fixed merge

commit ec22a1ba0b
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 10:53:16 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 17 09:34:28 2015 +1100

    Do not default quickstart

commit 57ce87770a
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 16 17:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 16:26:58 2015 +1100

    work in progress on Configurations as services

commit 46ce2aef3a
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 10:11:09 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 08:52:37 2015 +1100

    work in progress to Configurations as ServiceLoader

commit 6e11f22de4
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 18:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 120e33034f
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 14:20:52 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 6c5b95d6b8
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 2 11:16:37 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 13:58:16 2015 +1100

    Configurations can add server/system classes

commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 11:47:03 2015 +1100

    Self ordering WebApp Configurations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-05-02 17:55:54 +10:00
Jan Bartel d28dffb16e Remove SessionManager; refactor names of session classes; add start modules for new session arch 2016-04-15 11:08:46 +10:00
Greg Wilkins ef92338dd6 Merge branch 'master' of github.com:eclipse/jetty.project 2016-04-08 18:20:19 +10:00
Greg Wilkins d2b818c8bb Merge branch 'jetty-9.3.x' 2016-04-08 18:19:53 +10:00
Greg Wilkins d9bfc8b8e0 Issue #490 serverClasses set from jetty-web.xml 
Provided a mode that ignores server classes, but still allows them to be edited.
 2016-04-07 17:35:03 +10:00
Greg Wilkins 2fb9b55da2 Issue #485 Multiple compressed formats from static content 
Renamed ResourceCache as per TODO
Added javadoc and XML comments
 2016-04-07 17:33:47 +10:00
Jan Bartel 8a24798fa4 Issue #411 ensure MongoSessionManager saves maxInactiveInterval and expiry correctly 
Issue #415 ensure setting > MAX_INT session-timeout is detected
 2016-03-11 10:47:34 +11:00
Jan Bartel ead37b1b57 Issue #411 MongoSessionManager does not save maxInactiveInterval and expiry correctly 
Issue #415 Setting big session-timeout can overflow MAXINT
 2016-03-10 18:52:34 +11:00
Greg Wilkins 7b1486b96c Issue #412 Clarify ServletContextListener.contextDestroyed 
remember context listeners called
 2016-03-10 12:46:31 +11:00
Greg Wilkins fa7dec8c08 Issue #412 Clarify ServletContextListener.contextDestroyed 
Suggested ordering
 2016-03-10 12:36:22 +11:00
Greg Wilkins eac3a4a439 Merge branch 'jetty-9.3.x' 2016-03-10 12:35:44 +11:00
Greg Wilkins 53f187571d Added Test for ServletContextListener exceptions 
See https://java.net/jira/browse/SERVLET_SPEC-152
 2016-03-10 11:29:54 +11:00
Mehtab Singh Mann 3e1082e122 Issue #356 (Element error-page/location must start with a '/') 
Signed-off-by: Mehtab Singh Mann <mehtabsinghmann@gmail.com>
 2016-03-04 15:49:48 +01:00
Mehtab Singh Mann 23bbbaf8c1 Issue #356 (Element error-page/location must start with a '/') 
Signed-off-by: Mehtab Singh Mann <mehtabsinghmann@gmail.com>
 2016-03-04 19:12:44 +05:30
Joakim Erdfelt 4032b8579a Happy New Year 2016 (take #2) 2016-01-04 15:14:27 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins cea05f17d9 483119 - CachingWebAppClassLoader breaks JSP 
Cleaned up debugging and impl.  No fix for JSP problem
 2015-11-27 10:39:52 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Greg Wilkins de137abcc7 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-05 18:40:48 +11:00
Greg Wilkins 9e19a95d14 PushSessionCacheFilter 2015-11-05 18:40:18 +11:00
Jan Bartel b74a89bcb9 479865 IllegalStateException: Multiple servlets map to path: *.jsp: jsp,jsp 2015-10-28 16:53:26 +11:00
Jan Bartel 93da91743a 479865 IllegalStateException: Multiple servlets map to path: *.jsp: jsp,jsp 2015-10-28 16:52:45 +11:00