Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jetty 12 temp directory cleanup #9153

Merged
merged 8 commits into from
Jan 17, 2023
Merged

Jetty 12 temp directory cleanup #9153

merged 8 commits into from
Jan 17, 2023

Conversation

gregw
Copy link
Contributor

@gregw gregw commented Jan 11, 2023

  • Server now has setter/getter for a temp directory
  • Context now has a getter for a temp directory
  • Server root Context temp directory is either whatever is set, else a work directory, else java.io.tmpdir
  • WebInfConfiguration will still create a temp directory name, but defers to ContextHandler for creation/persistence of the temp directory
  • temp directory (and BASE) removed from the deployer, as it is now the server temp directory.

@gregw
Generalize Temp Directory handling
b9d9ded 
 + Server now has setter/getter for a temp directory
 + Context now has a getter for a temp directory
 + Server root Context temp directory is either whatever is set, else a work directory, else java.io.tmpdir
 + WebInfConfiguration will still create a temp directory name, but defers to ContextHandler for creation/persistence of the temp directory
 + temp directory (and BASE) removed from the deployer, as it is now the server temp directory.
@gregw
Generalize Temp Directory handling
b86e992 
 + Server now has setter/getter for a temp directory
 + Context now has a getter for a temp directory
 + Server root Context temp directory is either whatever is set, else a work directory, else java.io.tmpdir
 + WebInfConfiguration will still create a temp directory name, but defers to ContextHandler for creation/persistence of the temp directory
 + temp directory (and BASE) removed from the deployer, as it is now the server temp directory.
@gregw
Generalize Temp Directory handling
b91d599 
 + Server now has setter/getter for a temp directory
 + Context now has a getter for a temp directory
 + Server root Context temp directory is either whatever is set, else a work directory, else java.io.tmpdir
 + WebInfConfiguration will still create a temp directory name, but defers to ContextHandler for creation/persistence of the temp directory
 + temp directory (and BASE) removed from the deployer, as it is now the server temp directory.
@gregw
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-temp…
540cc74 
…Directory
@gregw
Generalize Temp Directory handling
a797df0 
 + Server now has setter/getter for a temp directory
 + Context now has a getter for a temp directory
 + Server root Context temp directory is either whatever is set, else a work directory, else java.io.tmpdir
 + WebInfConfiguration will still create a temp directory name, but defers to ContextHandler for creation/persistence of the temp directory
 + temp directory (and BASE) removed from the deployer, as it is now the server temp directory.
@gregw
Generalize Temp Directory handling
878c75b 
 + Server now has setter/getter for a temp directory
 + Context now has a getter for a temp directory
 + Server root Context temp directory is either whatever is set, else a work directory, else java.io.tmpdir
 + WebInfConfiguration will still create a temp directory name, but defers to ContextHandler for creation/persistence of the temp directory
 + temp directory (and BASE) removed from the deployer, as it is now the server temp directory.
@gregw
disabled test that fails on jenkins
ba84bca
@gregw gregw marked this pull request as ready for review January 13, 2023 02:36
janbartel
janbartel requested changes Jan 16, 2023
View reviewed changes
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java Outdated Show resolved Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java Outdated Show resolved Hide resolved
...0/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java Outdated Show resolved Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java Show resolved Hide resolved
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java Outdated Show resolved Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java Outdated Show resolved Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java Show resolved Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java Show resolved Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java Show resolved Hide resolved
...-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebInfConfiguration.java Show resolved Hide resolved
@gregw gregw requested a review from janbartel January 16, 2023 06:30
@gregw gregw merged commit 94991c6 into jetty-12.0.x Jan 17, 2023
@gregw gregw deleted the jetty-12-tempDirectory branch January 17, 2023 00:44
gregpoulos pushed a commit to gregpoulos/jetty.project that referenced this pull request Jan 17, 2023
Merge remote-tracking branch 'upstream/jetty-12.0.x' into jetty-12.0.…
85cc1e4 
…x-document-modules

* upstream/jetty-12.0.x:
  Documentation: for consistency, convert "JETTY_HOME" attribute to "jetty-home" (jetty#9152)
  suppress test stacks
  Jetty 12 temp directory cleanup (jetty#9153)
  Only use GraalIssue5720PathResourceFactory when truly needed
  Refactor Graal native-image resource: handling
  Move GraalVM Native-Image code to NativeImagePathResource/-Factory
  PathResource: Fix "isAlias" issue with resource: URIs
  PathResource: Work-around false positive CodeQL warning
  PathResourceFactory: Ignore certain RuntimeExceptions upon init
  PathResource: Selectively enable resource: for GraalVM Native Image
  URIUtil: Removed unused code
  URIUtil: Suppress CodeQL false positive error about path injection
  util: Add support for GraalVM Native-Image resource:-URIs and Paths
gregpoulos pushed a commit to gregpoulos/jetty.project that referenced this pull request Jan 17, 2023
Merge branch 'jetty-12.0.x' of https://github.com/gregpoulos/jetty.pr…
38d4249 
…oject into jetty-12.0.x-documentation-operations-logging

* 'jetty-12.0.x' of https://github.com/gregpoulos/jetty.project:
  Documentation: for consistency, convert "JETTY_HOME" attribute to "jetty-home" (jetty#9152)
  suppress test stacks
  Jetty 12 temp directory cleanup (jetty#9153)
  Only use GraalIssue5720PathResourceFactory when truly needed
  Refactor Graal native-image resource: handling
  Move GraalVM Native-Image code to NativeImagePathResource/-Factory
  PathResource: Fix "isAlias" issue with resource: URIs
  PathResource: Work-around false positive CodeQL warning
  PathResourceFactory: Ignore certain RuntimeExceptions upon init
  PathResource: Selectively enable resource: for GraalVM Native Image
  URIUtil: Removed unused code
  URIUtil: Suppress CodeQL false positive error about path injection
  util: Add support for GraalVM Native-Image resource:-URIs and Paths
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janbartel janbartel janbartel approved these changes

@lachlan-roberts lachlan-roberts Awaiting requested review from lachlan-roberts

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gregw @janbartel