Skip to content

Issue #10437 - Refactor Local Deployment Scanning #12583

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

Closed
joakime wants to merge 174 commits into from
Closed

Issue #10437 - Refactor Local Deployment Scanning #12583

Changes from all commits
Commits
Show all changes
174 commits
Select commit Hold shift + click to select a range
8878567
Initial pass at implementation of EnvironmentContextProvider
joakime Nov 22, 2024
3a46e37
Fixing javadoc errors
joakime Nov 22, 2024
c5c07c2
Moving things around
joakime Nov 25, 2024
e0bdeb3
Moving changes back into ContextProvider
joakime Nov 25, 2024
7588d5f
Introducing ContextProvider.configureEnvironment(String name)
joakime Nov 25, 2024
42015b3
Fixing <env>[-zzz].properties sorting
joakime Nov 26, 2024
f9c90ce
Allow an Environment to be removed (needed for testing with Environment)
joakime Nov 26, 2024
83fc5f1
Fixing test cases
joakime Nov 26, 2024
a0c9058
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Nov 27, 2024
249679f
Fix javadoc
joakime Nov 27, 2024
bef04d9
Fix method names
joakime Nov 27, 2024
add337a
Fixing Environment contextClass loading
joakime Nov 27, 2024
2e9660d
Fixing test cases
joakime Nov 27, 2024
9bfab80
Fixing quickstart XML references to provider
joakime Nov 27, 2024
2c651ea
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Dec 2, 2024
0e534f7
Fixing quickstart XML
joakime Dec 2, 2024
43eb679
Fixing deploy containerScanJarPattern for ee9/ee8
joakime Dec 2, 2024
c5a00b8
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Dec 2, 2024
229e358
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Dec 18, 2024
a363189
Changes from reviews. Preparing for BulkListener impl.
joakime Dec 18, 2024
5f6d504
Using BulkListener with sorted paths for alphabetical deployment.
joakime Dec 18, 2024
77c34c2
Changes from review
joakime Dec 18, 2024
5306c3d
More changes from review
joakime Dec 18, 2024
96d5bec
Simplify else
joakime Dec 19, 2024
ee18845
Reworking deploy.createContextHandler to be easier to follow
joakime Dec 20, 2024
e498f2c
Fixing WebAppContext default-context-path mistake
joakime Dec 20, 2024
2b0741b
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Jan 2, 2025
9d9267d
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Jan 14, 2025
cf69f26
Introducing DeploymentUnit to simplify added/changed/removed update b…
joakime Jan 15, 2025
4fd255b
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Jan 15, 2025
1ebdd10
Fix deprecation warnings
joakime Jan 16, 2025
d5def4c
Introduce ChangeSetListener in Scanner
joakime Jan 16, 2025
54960bd
Changes from review
joakime Jan 16, 2025
c16fdf7
Changes from review
joakime Jan 16, 2025
bc1b50f
Adding environment configuration hotreload ability
joakime Jan 17, 2025
24eb791
Correct syntax
joakime Jan 17, 2025
4d286d7
Updating Unit.calcState javadoc and unit tests.
joakime Jan 20, 2025
40052bd
Use new Unit.getLivePaths() impl
joakime Jan 20, 2025
6806b58
Isolate and cleanup deploy test that manipulate the Environment singl…
joakime Jan 21, 2025
8f32176
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Jan 21, 2025
f92901d
Correct XML from merge
joakime Jan 21, 2025
c7fdc92
Debug for failing `JettyWebSocketTest` on CI
joakime Jan 21, 2025
745f4fe
Issue warning for overlap on reserved env configuration names in the …
joakime Jan 22, 2025
456132f
Rollback DEBUG logging
joakime Jan 22, 2025
dfd741b
Use new war filenames properly
joakime Jan 22, 2025
72c7304
Overhaul based on last PR review
joakime Jan 23, 2025
fbedd51
Fixing compilation on OSGI modules
joakime Jan 23, 2025
4bb0850
Fixing deployer XML id
joakime Jan 23, 2025
1e29659
Fixing null OSGiApp.properties
joakime Jan 23, 2025
2acf58e
More work on test stability
joakime Jan 23, 2025
7b5cd4e
Fix directory deployment issue
joakime Jan 23, 2025
318ab9e
Fixing "core" deployments
joakime Jan 24, 2025
e8b6796
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Jan 27, 2025
df5274e
Correct the Deployable.initializeDefaults behavior in DefaultContextH…
joakime Jan 27, 2025
2c65222
Remove dead code
joakime Jan 28, 2025
e045742
Remove references to old Unit class
joakime Jan 28, 2025
ef92632
Delete AppProvider interface, use component beans instead.
joakime Jan 28, 2025
d8a1e24
Reintroduce AppProvider & ContextHandlerFactory
joakime Jan 28, 2025
a36a26e
Removal of App interface, it compiles
joakime Jan 29, 2025
5b3ac27
Replace OSGiApp with OSGiDeployableBundleMetadata
joakime Jan 29, 2025
3b8f36e
Core rearrange
joakime Jan 29, 2025
39639dc
Fixing some naming
joakime Jan 29, 2025
75463bb
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Jan 29, 2025
80dce8e
Rollback incorrect change to setJettyStandardIdsAndProperties
joakime Jan 30, 2025
b41cbd7
Fixing XML declarations
joakime Jan 30, 2025
87c3283
Removing DEBUG
joakime Jan 30, 2025
205e372
Correcting addBean / JMX
joakime Jan 30, 2025
e3c9f02
typo
joakime Jan 30, 2025
d14e5b5
More jetty-osgi fixes
joakime Jan 30, 2025
de22789
Fixing more deploy test setup
joakime Jan 30, 2025
25a1e25
Revert ContextHandler.id work
joakime Jan 31, 2025
dd0a613
The mass renaming of deploy begins.
joakime Jan 31, 2025
95a973a
Functioning jetty-deploy (again)
joakime Jan 31, 2025
266ea98
Fixing compilation issues
joakime Jan 31, 2025
810b655
Better excludes of internals
joakime Jan 31, 2025
5d2f2bb
Fixing accidentally exposed internal package
joakime Jan 31, 2025
33259b9
Fix compilation of DeploymentErrorTest
joakime Jan 31, 2025
d80f118
Correct for missing <Arg> in test XML
joakime Jan 31, 2025
aafcb0b
Changes from review
joakime Feb 3, 2025
d1d5d11
Fix spotless
joakime Feb 3, 2025
5ff6708
Correct OSGi attribute behavior
joakime Feb 3, 2025
ef98179
Updating names of variable in test
joakime Feb 3, 2025
20d2e5f
Add [tags] to deployment modules
joakime Feb 3, 2025
56fdc29
Fix sibling check in WebInfConfiguration.unpack
joakime Feb 3, 2025
a07aafc
Module names in --list-modules should be left justified.
joakime Feb 3, 2025
9f34adc
Doing some debugging on RedispatchPlansTests behaviors
joakime Feb 3, 2025
f980a29
Correcting jetty.webapps property creation from PathsContextHandlerFa…
joakime Feb 3, 2025
0daac61
Dump mainPath in PathsApp.toString
joakime Feb 3, 2025
315f074
core deploy should also have [tags]
joakime Feb 3, 2025
a1233bc
Revert "Fix sibling check in WebInfConfiguration.unpack"
joakime Feb 3, 2025
b0edf97
Sort test args coming from disk, for repeatable results.
joakime Feb 3, 2025
0790cc5
Move ATTRIBUTE_PREFIX from Deployable to PathsContextHandlerFactory
joakime Feb 3, 2025
3d0fc38
Cleanup attribute key names & value
joakime Feb 4, 2025
c3fd737
Adding more Listener testing to Scanner
joakime Feb 4, 2025
b38aa97
Scanner Listener failures propagate
joakime Feb 4, 2025
77a5429
Deployment fixes for throw on start behaviors
joakime Feb 4, 2025
5c93062
Revert Scanner Listener rethrowing
joakime Feb 4, 2025
b2ed720
Adding startup failure tests for jetty-deploy
joakime Feb 4, 2025
88b688b
Use renamed classname in testcase
joakime Feb 5, 2025
0587aac
Fixing attribute prefix stripping bug
joakime Feb 5, 2025
0f6665c
Cleanup java source
joakime Feb 5, 2025
3aed649
Cleaning up module metadata
joakime Feb 6, 2025
e41c9ec
Correcting deploy module deprecation description
joakime Feb 6, 2025
76bb61f
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Feb 6, 2025
9f8b0f8
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Feb 12, 2025
2cdcc05
Updating osgi test for new XML
joakime Feb 12, 2025
23abb35
Fixing osgi testing
joakime Feb 12, 2025
c952380
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Feb 13, 2025
773e267
Util.set/getBundle changes
joakime Feb 13, 2025
21adcc8
Adding tests for <default-context-path> behavior when working with ju…
joakime Feb 14, 2025
da72f15
Don't use deprecated `deploy` module in other modules
joakime Feb 14, 2025
447646c
Improved default-context-path testing and implementation
joakime Feb 14, 2025
67ea7c1
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Feb 14, 2025
3b6ed73
Use new Scanner.BulkListener
joakime Feb 14, 2025
4cf6b7e
Add missing init from XML based deployment
joakime Feb 14, 2025
c8c6ce0
CoreContextHandler is missing some context-path love
joakime Feb 14, 2025
2dfa6f7
Cleanup default-context-path behavior
joakime Feb 14, 2025
d10897f
Cleaning up old class references that no longer exist in javadoc/tests
joakime Feb 18, 2025
7f0711e
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Feb 18, 2025
a209e05
Rename _contextHandlerDeployer
joakime Mar 3, 2025
9a63c41
Fixing NPE from JettyServerFactory
joakime Mar 3, 2025
d3d54cd
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Mar 4, 2025
d7a3b9b
Remove controversial constructor and just use Jetty LifeCycle as desi…
joakime Mar 5, 2025
07767fb
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Mar 5, 2025
e4f7598
Experiment with Unify deploy option 4 (#12863)
gregw Mar 6, 2025
397011f
Renamed SimpleDeployer.java to DirectDeployer.java
gregw Mar 6, 2025
84167bd
More javadoc
gregw Mar 6, 2025
38ded4d
Fix deployer files for osgi
janbartel Mar 6, 2025
8c50c7d
More javadoc
gregw Mar 6, 2025
32743e5
Fixed modules
gregw Mar 6, 2025
6a920f9
minor cleanups
gregw Mar 6, 2025
cdda206
Remove references to DeploymentManager
gregw Mar 6, 2025
b1ac4b9
Expunge references to deployment manager
janbartel Mar 6, 2025
9b26c89
Wind osgi test logging back to INFO
janbartel Mar 7, 2025
78a9814
updates from review
gregw Mar 8, 2025
dbbcdcd
updates from review
gregw Mar 8, 2025
a33d0b2
updates from review
gregw Mar 10, 2025
3ce0be7
Rename bindings to have the word Binding in the classname.
joakime Mar 10, 2025
f6596a6
Add _ATTRIBUTE to ContextHandlerFactory constants that are attribute …
joakime Mar 10, 2025
37ae9a8
Add missing jetty.deploy.environmentsDir to deployment-scanner.mod
joakime Mar 10, 2025
7cea8bf
Fixed XMLs
gregw Mar 10, 2025
a419923
DeploymentNodeBinding.getBindingTargets is now a Collection<String>
joakime Mar 10, 2025
d1d8893
Merge branch 'fix/12.1.x/unify-deploy' of github.com:jetty/jetty.proj…
joakime Mar 10, 2025
469cdab
Add testcase for inner type use of TypeUtil.toShortName
joakime Mar 10, 2025
56c2576
Remove export of internal
joakime Mar 10, 2025
91be75a
Use Blocker.callback() instead
joakime Mar 10, 2025
67025de
Updating javadoc
joakime Mar 10, 2025
59b1108
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
gregw Mar 11, 2025
b911525
Apply suggestions from code review
gregw Mar 11, 2025
287786e
Fix NPE
gregw Mar 11, 2025
47e427d
adoc improvements
gregw Mar 11, 2025
7e319f3
Merge branch 'jetty-12.1.x' into fix/12.1.x/unify-deploy
gregw Mar 11, 2025
9dadecb
Added redeploy API
gregw Mar 11, 2025
c18131c
Added redeploy semantic to the scanner
gregw Mar 11, 2025
c73d0ad
Listener implementation
gregw Mar 12, 2025
b419b21
Tested redeploy events
gregw Mar 12, 2025
695dc63
Added synthetic events
gregw Mar 12, 2025
80d1670
Added synthetic events
gregw Mar 12, 2025
3e48332
Remove "goal" deployer
joakime Mar 12, 2025
b046a4e
Introduce OSGi Deployer.Listener (not yet hooked up)
joakime Mar 12, 2025
704f62d
Updating TODOs
joakime Mar 12, 2025
f1bdd2a
More GoalDeployer -> DirectDeployer changes
joakime Mar 12, 2025
eda46aa
WIP
gregw Mar 12, 2025
19af94f
cleanup modules
joakime Mar 12, 2025
1010583
Fixing build/test
joakime Mar 12, 2025
cee4f64
Fixing test string
joakime Mar 12, 2025
4182a44
renames to standard
gregw Mar 13, 2025
c792124
Added template environment files
gregw Mar 13, 2025
4499beb
Rename constructor/method params to deployer
janbartel Mar 13, 2025
8e37355
Added template environment files and documentation
gregw Mar 13, 2025
dd3bc27
fixing build
joakime Mar 13, 2025
2194b55
Ensure that OSGiDeploymentListener exists once.
joakime Mar 14, 2025
257e1f7
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Mar 14, 2025
db79fd2
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.